diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
index 9c47b5d..733a9d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
@@ -26,6 +26,13 @@
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
     private String certificationTypeName;
 
+    @ApiModelProperty(value = "证书类型", dataType = "String")
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificationClassName;
+
     @ApiModelProperty(value = "证书状态", dataType = "String")
     private String certificateStatus;
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
index 9c47b5d..733a9d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
@@ -26,6 +26,13 @@
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
     private String certificationTypeName;
 
+    @ApiModelProperty(value = "证书类型", dataType = "String")
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificationClassName;
+
     @ApiModelProperty(value = "证书状态", dataType = "String")
     private String certificateStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
index 53184e4..7bf1532 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
@@ -43,6 +43,9 @@
     @ApiModelProperty(value = " 检校类别", dataType = "String")
     private String measureCategory;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    private String certificateReportType;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
index 9c47b5d..733a9d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
@@ -26,6 +26,13 @@
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
     private String certificationTypeName;
 
+    @ApiModelProperty(value = "证书类型", dataType = "String")
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificationClassName;
+
     @ApiModelProperty(value = "证书状态", dataType = "String")
     private String certificateStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
index 53184e4..7bf1532 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
@@ -43,6 +43,9 @@
     @ApiModelProperty(value = " 检校类别", dataType = "String")
     private String measureCategory;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    private String certificateReportType;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index bd3467b..3d7c26c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -105,4 +105,18 @@
     @ApiModelProperty(value = "证书报告附件（前端展示为链接，调用minio获取url接口预览）", dataType = "String")
     private String certificateReportFile;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificateReportType;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
+    @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_TYPE)
+    private String certificateReportCategory;
+
+    @ApiModelProperty(value = "证书类别", dataType = "String")
+    private String certificateReportCategoryName;
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
index 9c47b5d..733a9d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
@@ -26,6 +26,13 @@
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
     private String certificationTypeName;
 
+    @ApiModelProperty(value = "证书类型", dataType = "String")
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificationClassName;
+
     @ApiModelProperty(value = "证书状态", dataType = "String")
     private String certificateStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
index 53184e4..7bf1532 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
@@ -43,6 +43,9 @@
     @ApiModelProperty(value = " 检校类别", dataType = "String")
     private String measureCategory;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    private String certificateReportType;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index bd3467b..3d7c26c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -105,4 +105,18 @@
     @ApiModelProperty(value = "证书报告附件（前端展示为链接，调用minio获取url接口预览）", dataType = "String")
     private String certificateReportFile;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificateReportType;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
+    @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_TYPE)
+    private String certificateReportCategory;
+
+    @ApiModelProperty(value = "证书类别", dataType = "String")
+    private String certificateReportCategoryName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
index 4df9f7a..5f6c3e2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
@@ -45,6 +45,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "样品备注", dataType = "String")
+    private String sampleRemark;
+
     @ApiModelProperty(value = "委托书编号", dataType = "String")
     @ExcelProperty(value = "委托书编号", order = 4)
     private String orderNo;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
index 9c47b5d..733a9d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
@@ -26,6 +26,13 @@
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
     private String certificationTypeName;
 
+    @ApiModelProperty(value = "证书类型", dataType = "String")
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificationClassName;
+
     @ApiModelProperty(value = "证书状态", dataType = "String")
     private String certificateStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
index 53184e4..7bf1532 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
@@ -43,6 +43,9 @@
     @ApiModelProperty(value = " 检校类别", dataType = "String")
     private String measureCategory;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    private String certificateReportType;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index bd3467b..3d7c26c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -105,4 +105,18 @@
     @ApiModelProperty(value = "证书报告附件（前端展示为链接，调用minio获取url接口预览）", dataType = "String")
     private String certificateReportFile;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificateReportType;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
+    @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_TYPE)
+    private String certificateReportCategory;
+
+    @ApiModelProperty(value = "证书类别", dataType = "String")
+    private String certificateReportCategoryName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
index 4df9f7a..5f6c3e2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
@@ -45,6 +45,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "样品备注", dataType = "String")
+    private String sampleRemark;
+
     @ApiModelProperty(value = "委托书编号", dataType = "String")
     @ExcelProperty(value = "委托书编号", order = 4)
     private String orderNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
index ee47738..0b4548c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
@@ -3,7 +3,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:
@@ -12,10 +12,12 @@
  */
 @Data
 public class SettlementPrintDTO {
-    @NotNull(message = "主键ID不能为空")
-    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    @ApiModelProperty(value = "主键id(settlementType=1/2/3时必传)", dataType = "Long", required = true)
     private Long id;
 
-    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单", dataType = "int")
+    @ApiModelProperty(value = "主键ids(settlementType=4时必传)", dataType = "Long", required = true)
+    private List<Long> ids;
+
+    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单 / 4业务统计单", dataType = "int")
     private int settlementType;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
index 9c47b5d..733a9d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
@@ -26,6 +26,13 @@
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
     private String certificationTypeName;
 
+    @ApiModelProperty(value = "证书类型", dataType = "String")
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificationClassName;
+
     @ApiModelProperty(value = "证书状态", dataType = "String")
     private String certificateStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
index 53184e4..7bf1532 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
@@ -43,6 +43,9 @@
     @ApiModelProperty(value = " 检校类别", dataType = "String")
     private String measureCategory;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    private String certificateReportType;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index bd3467b..3d7c26c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -105,4 +105,18 @@
     @ApiModelProperty(value = "证书报告附件（前端展示为链接，调用minio获取url接口预览）", dataType = "String")
     private String certificateReportFile;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificateReportType;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
+    @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_TYPE)
+    private String certificateReportCategory;
+
+    @ApiModelProperty(value = "证书类别", dataType = "String")
+    private String certificateReportCategoryName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
index 4df9f7a..5f6c3e2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
@@ -45,6 +45,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "样品备注", dataType = "String")
+    private String sampleRemark;
+
     @ApiModelProperty(value = "委托书编号", dataType = "String")
     @ExcelProperty(value = "委托书编号", order = 4)
     private String orderNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
index ee47738..0b4548c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
@@ -3,7 +3,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:
@@ -12,10 +12,12 @@
  */
 @Data
 public class SettlementPrintDTO {
-    @NotNull(message = "主键ID不能为空")
-    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    @ApiModelProperty(value = "主键id(settlementType=1/2/3时必传)", dataType = "Long", required = true)
     private Long id;
 
-    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单", dataType = "int")
+    @ApiModelProperty(value = "主键ids(settlementType=4时必传)", dataType = "Long", required = true)
+    private List<Long> ids;
+
+    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单 / 4业务统计单", dataType = "int")
     private int settlementType;
 }
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 cb9fe38..dcaba8d 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
@@ -49,6 +49,9 @@
     @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
     private String signType;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * minio存储文件名
      */

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
index 9c47b5d..733a9d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
@@ -26,6 +26,13 @@
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
     private String certificationTypeName;
 
+    @ApiModelProperty(value = "证书类型", dataType = "String")
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificationClassName;
+
     @ApiModelProperty(value = "证书状态", dataType = "String")
     private String certificateStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
index 53184e4..7bf1532 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
@@ -43,6 +43,9 @@
     @ApiModelProperty(value = " 检校类别", dataType = "String")
     private String measureCategory;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    private String certificateReportType;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index bd3467b..3d7c26c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -105,4 +105,18 @@
     @ApiModelProperty(value = "证书报告附件（前端展示为链接，调用minio获取url接口预览）", dataType = "String")
     private String certificateReportFile;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificateReportType;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
+    @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_TYPE)
+    private String certificateReportCategory;
+
+    @ApiModelProperty(value = "证书类别", dataType = "String")
+    private String certificateReportCategoryName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
index 4df9f7a..5f6c3e2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
@@ -45,6 +45,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "样品备注", dataType = "String")
+    private String sampleRemark;
+
     @ApiModelProperty(value = "委托书编号", dataType = "String")
     @ExcelProperty(value = "委托书编号", order = 4)
     private String orderNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
index ee47738..0b4548c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
@@ -3,7 +3,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:
@@ -12,10 +12,12 @@
  */
 @Data
 public class SettlementPrintDTO {
-    @NotNull(message = "主键ID不能为空")
-    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    @ApiModelProperty(value = "主键id(settlementType=1/2/3时必传)", dataType = "Long", required = true)
     private Long id;
 
-    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单", dataType = "int")
+    @ApiModelProperty(value = "主键ids(settlementType=4时必传)", dataType = "Long", required = true)
+    private List<Long> ids;
+
+    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单 / 4业务统计单", dataType = "int")
     private int settlementType;
 }
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 cb9fe38..dcaba8d 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
@@ -49,6 +49,9 @@
     @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
     private String signType;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * minio存储文件名
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
index 3617658..77de29e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
@@ -36,6 +36,9 @@
     @ApiModelProperty(value = "签章/签名编号", dataType = "String")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
index 9c47b5d..733a9d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
@@ -26,6 +26,13 @@
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
     private String certificationTypeName;
 
+    @ApiModelProperty(value = "证书类型", dataType = "String")
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificationClassName;
+
     @ApiModelProperty(value = "证书状态", dataType = "String")
     private String certificateStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
index 53184e4..7bf1532 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
@@ -43,6 +43,9 @@
     @ApiModelProperty(value = " 检校类别", dataType = "String")
     private String measureCategory;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    private String certificateReportType;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index bd3467b..3d7c26c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -105,4 +105,18 @@
     @ApiModelProperty(value = "证书报告附件（前端展示为链接，调用minio获取url接口预览）", dataType = "String")
     private String certificateReportFile;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificateReportType;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
+    @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_TYPE)
+    private String certificateReportCategory;
+
+    @ApiModelProperty(value = "证书类别", dataType = "String")
+    private String certificateReportCategoryName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
index 4df9f7a..5f6c3e2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
@@ -45,6 +45,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "样品备注", dataType = "String")
+    private String sampleRemark;
+
     @ApiModelProperty(value = "委托书编号", dataType = "String")
     @ExcelProperty(value = "委托书编号", order = 4)
     private String orderNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
index ee47738..0b4548c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
@@ -3,7 +3,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:
@@ -12,10 +12,12 @@
  */
 @Data
 public class SettlementPrintDTO {
-    @NotNull(message = "主键ID不能为空")
-    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    @ApiModelProperty(value = "主键id(settlementType=1/2/3时必传)", dataType = "Long", required = true)
     private Long id;
 
-    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单", dataType = "int")
+    @ApiModelProperty(value = "主键ids(settlementType=4时必传)", dataType = "Long", required = true)
+    private List<Long> ids;
+
+    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单 / 4业务统计单", dataType = "int")
     private int settlementType;
 }
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 cb9fe38..dcaba8d 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
@@ -49,6 +49,9 @@
     @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
     private String signType;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * minio存储文件名
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
index 3617658..77de29e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
@@ -36,6 +36,9 @@
     @ApiModelProperty(value = "签章/签名编号", dataType = "String")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
index 1669c2f..52be19e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
@@ -56,4 +56,7 @@
 
     @ApiModelProperty(value = "筛选ids", dataType = "List")
     private List<Long> ids;
+
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
index 9c47b5d..733a9d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
@@ -26,6 +26,13 @@
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
     private String certificationTypeName;
 
+    @ApiModelProperty(value = "证书类型", dataType = "String")
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificationClassName;
+
     @ApiModelProperty(value = "证书状态", dataType = "String")
     private String certificateStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
index 53184e4..7bf1532 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
@@ -43,6 +43,9 @@
     @ApiModelProperty(value = " 检校类别", dataType = "String")
     private String measureCategory;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    private String certificateReportType;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index bd3467b..3d7c26c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -105,4 +105,18 @@
     @ApiModelProperty(value = "证书报告附件（前端展示为链接，调用minio获取url接口预览）", dataType = "String")
     private String certificateReportFile;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificateReportType;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
+    @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_TYPE)
+    private String certificateReportCategory;
+
+    @ApiModelProperty(value = "证书类别", dataType = "String")
+    private String certificateReportCategoryName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
index 4df9f7a..5f6c3e2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
@@ -45,6 +45,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "样品备注", dataType = "String")
+    private String sampleRemark;
+
     @ApiModelProperty(value = "委托书编号", dataType = "String")
     @ExcelProperty(value = "委托书编号", order = 4)
     private String orderNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
index ee47738..0b4548c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
@@ -3,7 +3,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:
@@ -12,10 +12,12 @@
  */
 @Data
 public class SettlementPrintDTO {
-    @NotNull(message = "主键ID不能为空")
-    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    @ApiModelProperty(value = "主键id(settlementType=1/2/3时必传)", dataType = "Long", required = true)
     private Long id;
 
-    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单", dataType = "int")
+    @ApiModelProperty(value = "主键ids(settlementType=4时必传)", dataType = "Long", required = true)
+    private List<Long> ids;
+
+    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单 / 4业务统计单", dataType = "int")
     private int settlementType;
 }
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 cb9fe38..dcaba8d 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
@@ -49,6 +49,9 @@
     @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
     private String signType;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * minio存储文件名
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
index 3617658..77de29e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
@@ -36,6 +36,9 @@
     @ApiModelProperty(value = "签章/签名编号", dataType = "String")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
index 1669c2f..52be19e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
@@ -56,4 +56,7 @@
 
     @ApiModelProperty(value = "筛选ids", dataType = "List")
     private List<Long> ids;
+
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
index 15c56b4..da31083 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
@@ -79,21 +79,25 @@
     private Integer directReturn;
 
     @TableField("need_accord_declare")
-    @ApiModelProperty(value = "需要符合性声明（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要符合性声明(原检定与校准证书) / 校准委托单中的检定规程（1/0）", dataType = "Integer")
     private Integer needAccordDeclare;
 
     @TableField("need_advice")
-    @ApiModelProperty(value = "需要建议再校准日期（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要建议再校准日期(原检定与校准证书) / 校准委托单中的如需要符合性声明xxx（1/0）", dataType = "Integer")
     private Integer needAdvice;
 
     @TableField("accord_lab")
-    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准(原检定与校准证书)  / 校准委托单中的校准规范（1/0）", dataType = "Integer")
     private Integer accordLab;
 
     @TableField("agree_other")
-    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0） / 校准委托单中的需要建议再校准日期", dataType = "Integer")
     private Integer agreeOther;
 
+    @TableField("time_require")
+    @ApiModelProperty(value = "校准委托单中的时间要求(1常规2加急3特急)", dataType = "Integer")
+    private Integer timeRequire;
+
     @TableField("staff_no")
     @ApiModelProperty(value = "收件人工号（计量人员编号）", dataType = "String")
     private String staffNo;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
index 9c47b5d..733a9d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
@@ -26,6 +26,13 @@
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
     private String certificationTypeName;
 
+    @ApiModelProperty(value = "证书类型", dataType = "String")
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificationClassName;
+
     @ApiModelProperty(value = "证书状态", dataType = "String")
     private String certificateStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
index 53184e4..7bf1532 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
@@ -43,6 +43,9 @@
     @ApiModelProperty(value = " 检校类别", dataType = "String")
     private String measureCategory;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    private String certificateReportType;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index bd3467b..3d7c26c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -105,4 +105,18 @@
     @ApiModelProperty(value = "证书报告附件（前端展示为链接，调用minio获取url接口预览）", dataType = "String")
     private String certificateReportFile;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificateReportType;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
+    @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_TYPE)
+    private String certificateReportCategory;
+
+    @ApiModelProperty(value = "证书类别", dataType = "String")
+    private String certificateReportCategoryName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
index 4df9f7a..5f6c3e2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
@@ -45,6 +45,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "样品备注", dataType = "String")
+    private String sampleRemark;
+
     @ApiModelProperty(value = "委托书编号", dataType = "String")
     @ExcelProperty(value = "委托书编号", order = 4)
     private String orderNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
index ee47738..0b4548c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
@@ -3,7 +3,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:
@@ -12,10 +12,12 @@
  */
 @Data
 public class SettlementPrintDTO {
-    @NotNull(message = "主键ID不能为空")
-    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    @ApiModelProperty(value = "主键id(settlementType=1/2/3时必传)", dataType = "Long", required = true)
     private Long id;
 
-    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单", dataType = "int")
+    @ApiModelProperty(value = "主键ids(settlementType=4时必传)", dataType = "Long", required = true)
+    private List<Long> ids;
+
+    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单 / 4业务统计单", dataType = "int")
     private int settlementType;
 }
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 cb9fe38..dcaba8d 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
@@ -49,6 +49,9 @@
     @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
     private String signType;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * minio存储文件名
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
index 3617658..77de29e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
@@ -36,6 +36,9 @@
     @ApiModelProperty(value = "签章/签名编号", dataType = "String")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
index 1669c2f..52be19e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
@@ -56,4 +56,7 @@
 
     @ApiModelProperty(value = "筛选ids", dataType = "List")
     private List<Long> ids;
+
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
index 15c56b4..da31083 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
@@ -79,21 +79,25 @@
     private Integer directReturn;
 
     @TableField("need_accord_declare")
-    @ApiModelProperty(value = "需要符合性声明（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要符合性声明(原检定与校准证书) / 校准委托单中的检定规程（1/0）", dataType = "Integer")
     private Integer needAccordDeclare;
 
     @TableField("need_advice")
-    @ApiModelProperty(value = "需要建议再校准日期（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要建议再校准日期(原检定与校准证书) / 校准委托单中的如需要符合性声明xxx（1/0）", dataType = "Integer")
     private Integer needAdvice;
 
     @TableField("accord_lab")
-    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准(原检定与校准证书)  / 校准委托单中的校准规范（1/0）", dataType = "Integer")
     private Integer accordLab;
 
     @TableField("agree_other")
-    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0） / 校准委托单中的需要建议再校准日期", dataType = "Integer")
     private Integer agreeOther;
 
+    @TableField("time_require")
+    @ApiModelProperty(value = "校准委托单中的时间要求(1常规2加急3特急)", dataType = "Integer")
+    private Integer timeRequire;
+
     @TableField("staff_no")
     @ApiModelProperty(value = "收件人工号（计量人员编号）", dataType = "String")
     private String staffNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
index 57d7906..44f9a33 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
@@ -145,4 +145,8 @@
 
     @TableField(exist = false)
     private int seq;
+
+    //用于判断业务统计单合计行填充
+    @TableField(exist = false)
+    private int settlementType;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
index 9c47b5d..733a9d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
@@ -26,6 +26,13 @@
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
     private String certificationTypeName;
 
+    @ApiModelProperty(value = "证书类型", dataType = "String")
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificationClassName;
+
     @ApiModelProperty(value = "证书状态", dataType = "String")
     private String certificateStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
index 53184e4..7bf1532 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
@@ -43,6 +43,9 @@
     @ApiModelProperty(value = " 检校类别", dataType = "String")
     private String measureCategory;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    private String certificateReportType;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index bd3467b..3d7c26c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -105,4 +105,18 @@
     @ApiModelProperty(value = "证书报告附件（前端展示为链接，调用minio获取url接口预览）", dataType = "String")
     private String certificateReportFile;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificateReportType;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
+    @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_TYPE)
+    private String certificateReportCategory;
+
+    @ApiModelProperty(value = "证书类别", dataType = "String")
+    private String certificateReportCategoryName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
index 4df9f7a..5f6c3e2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
@@ -45,6 +45,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "样品备注", dataType = "String")
+    private String sampleRemark;
+
     @ApiModelProperty(value = "委托书编号", dataType = "String")
     @ExcelProperty(value = "委托书编号", order = 4)
     private String orderNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
index ee47738..0b4548c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
@@ -3,7 +3,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:
@@ -12,10 +12,12 @@
  */
 @Data
 public class SettlementPrintDTO {
-    @NotNull(message = "主键ID不能为空")
-    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    @ApiModelProperty(value = "主键id(settlementType=1/2/3时必传)", dataType = "Long", required = true)
     private Long id;
 
-    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单", dataType = "int")
+    @ApiModelProperty(value = "主键ids(settlementType=4时必传)", dataType = "Long", required = true)
+    private List<Long> ids;
+
+    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单 / 4业务统计单", dataType = "int")
     private int settlementType;
 }
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 cb9fe38..dcaba8d 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
@@ -49,6 +49,9 @@
     @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
     private String signType;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * minio存储文件名
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
index 3617658..77de29e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
@@ -36,6 +36,9 @@
     @ApiModelProperty(value = "签章/签名编号", dataType = "String")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
index 1669c2f..52be19e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
@@ -56,4 +56,7 @@
 
     @ApiModelProperty(value = "筛选ids", dataType = "List")
     private List<Long> ids;
+
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
index 15c56b4..da31083 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
@@ -79,21 +79,25 @@
     private Integer directReturn;
 
     @TableField("need_accord_declare")
-    @ApiModelProperty(value = "需要符合性声明（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要符合性声明(原检定与校准证书) / 校准委托单中的检定规程（1/0）", dataType = "Integer")
     private Integer needAccordDeclare;
 
     @TableField("need_advice")
-    @ApiModelProperty(value = "需要建议再校准日期（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要建议再校准日期(原检定与校准证书) / 校准委托单中的如需要符合性声明xxx（1/0）", dataType = "Integer")
     private Integer needAdvice;
 
     @TableField("accord_lab")
-    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准(原检定与校准证书)  / 校准委托单中的校准规范（1/0）", dataType = "Integer")
     private Integer accordLab;
 
     @TableField("agree_other")
-    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0） / 校准委托单中的需要建议再校准日期", dataType = "Integer")
     private Integer agreeOther;
 
+    @TableField("time_require")
+    @ApiModelProperty(value = "校准委托单中的时间要求(1常规2加急3特急)", dataType = "Integer")
+    private Integer timeRequire;
+
     @TableField("staff_no")
     @ApiModelProperty(value = "收件人工号（计量人员编号）", dataType = "String")
     private String staffNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
index 57d7906..44f9a33 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
@@ -145,4 +145,8 @@
 
     @TableField(exist = false)
     private int seq;
+
+    //用于判断业务统计单合计行填充
+    @TableField(exist = false)
+    private int settlementType;
 }
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 251adf8..5958534 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
@@ -63,6 +63,10 @@
     @TableField("sign_name")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    @TableField("sign_category")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
index 9c47b5d..733a9d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
@@ -26,6 +26,13 @@
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
     private String certificationTypeName;
 
+    @ApiModelProperty(value = "证书类型", dataType = "String")
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificationClassName;
+
     @ApiModelProperty(value = "证书状态", dataType = "String")
     private String certificateStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
index 53184e4..7bf1532 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
@@ -43,6 +43,9 @@
     @ApiModelProperty(value = " 检校类别", dataType = "String")
     private String measureCategory;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    private String certificateReportType;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index bd3467b..3d7c26c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -105,4 +105,18 @@
     @ApiModelProperty(value = "证书报告附件（前端展示为链接，调用minio获取url接口预览）", dataType = "String")
     private String certificateReportFile;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificateReportType;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
+    @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_TYPE)
+    private String certificateReportCategory;
+
+    @ApiModelProperty(value = "证书类别", dataType = "String")
+    private String certificateReportCategoryName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
index 4df9f7a..5f6c3e2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
@@ -45,6 +45,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "样品备注", dataType = "String")
+    private String sampleRemark;
+
     @ApiModelProperty(value = "委托书编号", dataType = "String")
     @ExcelProperty(value = "委托书编号", order = 4)
     private String orderNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
index ee47738..0b4548c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
@@ -3,7 +3,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:
@@ -12,10 +12,12 @@
  */
 @Data
 public class SettlementPrintDTO {
-    @NotNull(message = "主键ID不能为空")
-    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    @ApiModelProperty(value = "主键id(settlementType=1/2/3时必传)", dataType = "Long", required = true)
     private Long id;
 
-    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单", dataType = "int")
+    @ApiModelProperty(value = "主键ids(settlementType=4时必传)", dataType = "Long", required = true)
+    private List<Long> ids;
+
+    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单 / 4业务统计单", dataType = "int")
     private int settlementType;
 }
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 cb9fe38..dcaba8d 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
@@ -49,6 +49,9 @@
     @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
     private String signType;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * minio存储文件名
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
index 3617658..77de29e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
@@ -36,6 +36,9 @@
     @ApiModelProperty(value = "签章/签名编号", dataType = "String")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
index 1669c2f..52be19e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
@@ -56,4 +56,7 @@
 
     @ApiModelProperty(value = "筛选ids", dataType = "List")
     private List<Long> ids;
+
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
index 15c56b4..da31083 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
@@ -79,21 +79,25 @@
     private Integer directReturn;
 
     @TableField("need_accord_declare")
-    @ApiModelProperty(value = "需要符合性声明（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要符合性声明(原检定与校准证书) / 校准委托单中的检定规程（1/0）", dataType = "Integer")
     private Integer needAccordDeclare;
 
     @TableField("need_advice")
-    @ApiModelProperty(value = "需要建议再校准日期（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要建议再校准日期(原检定与校准证书) / 校准委托单中的如需要符合性声明xxx（1/0）", dataType = "Integer")
     private Integer needAdvice;
 
     @TableField("accord_lab")
-    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准(原检定与校准证书)  / 校准委托单中的校准规范（1/0）", dataType = "Integer")
     private Integer accordLab;
 
     @TableField("agree_other")
-    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0） / 校准委托单中的需要建议再校准日期", dataType = "Integer")
     private Integer agreeOther;
 
+    @TableField("time_require")
+    @ApiModelProperty(value = "校准委托单中的时间要求(1常规2加急3特急)", dataType = "Integer")
+    private Integer timeRequire;
+
     @TableField("staff_no")
     @ApiModelProperty(value = "收件人工号（计量人员编号）", dataType = "String")
     private String staffNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
index 57d7906..44f9a33 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
@@ -145,4 +145,8 @@
 
     @TableField(exist = false)
     private int seq;
+
+    //用于判断业务统计单合计行填充
+    @TableField(exist = false)
+    private int settlementType;
 }
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 251adf8..5958534 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
@@ -63,6 +63,10 @@
     @TableField("sign_name")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    @TableField("sign_category")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index 98f5667..9cb4646 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -247,7 +247,7 @@
 //        recordMapper.insert(originalRecord);
 //    }
 
-    private String againCreateCertificateReport(String certificateReportCode) throws Exception {
+    private String againCreateCertificateReport(String certificateReportCode) {
         if (StringUtils.isEmpty(certificateReportCode)) {
             return null;
         }
@@ -269,7 +269,7 @@
         Long maxNo = certificateReportMapper.selectMaxCode(prefix);
         //生成证书编号
         String certificateReportNo = NumberGeneratorUtil.getCode(
-                MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo);
+                MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo, null);
         certificateReport.setApprovalStatus("");
         certificateReport.setId(null);
         certificateReport.setCertificateReportCode(certificateReportNo);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
index 9c47b5d..733a9d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
@@ -26,6 +26,13 @@
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
     private String certificationTypeName;
 
+    @ApiModelProperty(value = "证书类型", dataType = "String")
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificationClassName;
+
     @ApiModelProperty(value = "证书状态", dataType = "String")
     private String certificateStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
index 53184e4..7bf1532 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
@@ -43,6 +43,9 @@
     @ApiModelProperty(value = " 检校类别", dataType = "String")
     private String measureCategory;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    private String certificateReportType;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index bd3467b..3d7c26c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -105,4 +105,18 @@
     @ApiModelProperty(value = "证书报告附件（前端展示为链接，调用minio获取url接口预览）", dataType = "String")
     private String certificateReportFile;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificateReportType;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
+    @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_TYPE)
+    private String certificateReportCategory;
+
+    @ApiModelProperty(value = "证书类别", dataType = "String")
+    private String certificateReportCategoryName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
index 4df9f7a..5f6c3e2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
@@ -45,6 +45,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "样品备注", dataType = "String")
+    private String sampleRemark;
+
     @ApiModelProperty(value = "委托书编号", dataType = "String")
     @ExcelProperty(value = "委托书编号", order = 4)
     private String orderNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
index ee47738..0b4548c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
@@ -3,7 +3,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:
@@ -12,10 +12,12 @@
  */
 @Data
 public class SettlementPrintDTO {
-    @NotNull(message = "主键ID不能为空")
-    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    @ApiModelProperty(value = "主键id(settlementType=1/2/3时必传)", dataType = "Long", required = true)
     private Long id;
 
-    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单", dataType = "int")
+    @ApiModelProperty(value = "主键ids(settlementType=4时必传)", dataType = "Long", required = true)
+    private List<Long> ids;
+
+    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单 / 4业务统计单", dataType = "int")
     private int settlementType;
 }
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 cb9fe38..dcaba8d 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
@@ -49,6 +49,9 @@
     @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
     private String signType;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * minio存储文件名
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
index 3617658..77de29e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
@@ -36,6 +36,9 @@
     @ApiModelProperty(value = "签章/签名编号", dataType = "String")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
index 1669c2f..52be19e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
@@ -56,4 +56,7 @@
 
     @ApiModelProperty(value = "筛选ids", dataType = "List")
     private List<Long> ids;
+
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
index 15c56b4..da31083 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
@@ -79,21 +79,25 @@
     private Integer directReturn;
 
     @TableField("need_accord_declare")
-    @ApiModelProperty(value = "需要符合性声明（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要符合性声明(原检定与校准证书) / 校准委托单中的检定规程（1/0）", dataType = "Integer")
     private Integer needAccordDeclare;
 
     @TableField("need_advice")
-    @ApiModelProperty(value = "需要建议再校准日期（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要建议再校准日期(原检定与校准证书) / 校准委托单中的如需要符合性声明xxx（1/0）", dataType = "Integer")
     private Integer needAdvice;
 
     @TableField("accord_lab")
-    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准(原检定与校准证书)  / 校准委托单中的校准规范（1/0）", dataType = "Integer")
     private Integer accordLab;
 
     @TableField("agree_other")
-    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0） / 校准委托单中的需要建议再校准日期", dataType = "Integer")
     private Integer agreeOther;
 
+    @TableField("time_require")
+    @ApiModelProperty(value = "校准委托单中的时间要求(1常规2加急3特急)", dataType = "Integer")
+    private Integer timeRequire;
+
     @TableField("staff_no")
     @ApiModelProperty(value = "收件人工号（计量人员编号）", dataType = "String")
     private String staffNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
index 57d7906..44f9a33 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
@@ -145,4 +145,8 @@
 
     @TableField(exist = false)
     private int seq;
+
+    //用于判断业务统计单合计行填充
+    @TableField(exist = false)
+    private int settlementType;
 }
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 251adf8..5958534 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
@@ -63,6 +63,10 @@
     @TableField("sign_name")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    @TableField("sign_category")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index 98f5667..9cb4646 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -247,7 +247,7 @@
 //        recordMapper.insert(originalRecord);
 //    }
 
-    private String againCreateCertificateReport(String certificateReportCode) throws Exception {
+    private String againCreateCertificateReport(String certificateReportCode) {
         if (StringUtils.isEmpty(certificateReportCode)) {
             return null;
         }
@@ -269,7 +269,7 @@
         Long maxNo = certificateReportMapper.selectMaxCode(prefix);
         //生成证书编号
         String certificateReportNo = NumberGeneratorUtil.getCode(
-                MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo);
+                MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo, null);
         certificateReport.setApprovalStatus("");
         certificateReport.setId(null);
         certificateReport.setCertificateReportCode(certificateReportNo);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 0a07474..d5c3baa 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -62,6 +62,7 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -362,12 +363,12 @@
             if (!StringUtils.isEmpty(certificateMonitorResponse.getCertificationType())) {
                 DictCodeUtils.convertDictMultiCodeToName(certificateMonitorResponse);
             }
-            //设置证书状态
-            certificateMonitorResponse.setCertificateStatus(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
-                    CertificatePrintStatusEnum.FINISHED : CertificatePrintStatusEnum.UNFINISHED);
             //设置完成时间
             certificateMonitorResponse.setFinishedTime(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
                     certificateMonitorResponse.getFinishedTime() : "");
+            //设置证书状态
+            certificateMonitorResponse.setCertificateStatus(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
+                    CertificatePrintStatusEnum.FINISHED : CertificatePrintStatusEnum.UNFINISHED);
 
             //设置退回次数
             List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode());
@@ -382,7 +383,7 @@
     }
 
     @Override
-    public void exportCertificateFile(BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception {
+    public void exportCertificateFile(BusinessCertificateReport certificateReport, HttpServletResponse response) {
         if (!ObjectUtils.isEmpty(certificateReport.getTemplateId())) {
             //登录用户
             AuthUser user = ShiroKit.getUser();
@@ -614,12 +615,13 @@
     }
 
     private void initCertificateReport(BusinessCertificateReport certificateReport) throws Exception {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date calibrationDate = dateFormat.parse(certificateReport.getCalibrationTime());
         String prefix = MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue()
-                + DateUtil.format(new Date(), "YYYYMMdd");
-//        String prefix = DateUtil.format(new Date(), "YYYYMM");
+                + DateUtil.format(calibrationDate, "YYYYMMdd");
         Long maxNo = this.baseMapper.selectMaxCode(prefix);
         //生成证书编号
-        String certificateReportNo = NumberGeneratorUtil.getCode(MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo);
+        String certificateReportNo = NumberGeneratorUtil.getCode(MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo, DateUtil.format(calibrationDate, "YYYYMMdd"));
         //生成证书名称：证书报告编号+检校专业+证书类别
         DictCodeUtils.convertDictCodeToName(certificateReport);
         String certificateName = certificateReportNo+certificateReport.getCalibrationMajorName()+certificateReport.getCertificateReportCategoryName();
@@ -633,6 +635,7 @@
         certificateReport.setCertificateReportCode(certificateReportNo);
         certificateReport.setCreateTime(DateUtil.formatDateTime(new Date()));
         certificateReport.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+        certificateReport.setIssuanceDate(DateUtil.now());
     }
 
     private MeterStaff getMeterStaffInfo(AuthUser user) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
index 9c47b5d..733a9d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
@@ -26,6 +26,13 @@
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
     private String certificationTypeName;
 
+    @ApiModelProperty(value = "证书类型", dataType = "String")
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificationClassName;
+
     @ApiModelProperty(value = "证书状态", dataType = "String")
     private String certificateStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
index 53184e4..7bf1532 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
@@ -43,6 +43,9 @@
     @ApiModelProperty(value = " 检校类别", dataType = "String")
     private String measureCategory;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    private String certificateReportType;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index bd3467b..3d7c26c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -105,4 +105,18 @@
     @ApiModelProperty(value = "证书报告附件（前端展示为链接，调用minio获取url接口预览）", dataType = "String")
     private String certificateReportFile;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificateReportType;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
+    @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_TYPE)
+    private String certificateReportCategory;
+
+    @ApiModelProperty(value = "证书类别", dataType = "String")
+    private String certificateReportCategoryName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
index 4df9f7a..5f6c3e2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
@@ -45,6 +45,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "样品备注", dataType = "String")
+    private String sampleRemark;
+
     @ApiModelProperty(value = "委托书编号", dataType = "String")
     @ExcelProperty(value = "委托书编号", order = 4)
     private String orderNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
index ee47738..0b4548c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
@@ -3,7 +3,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:
@@ -12,10 +12,12 @@
  */
 @Data
 public class SettlementPrintDTO {
-    @NotNull(message = "主键ID不能为空")
-    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    @ApiModelProperty(value = "主键id(settlementType=1/2/3时必传)", dataType = "Long", required = true)
     private Long id;
 
-    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单", dataType = "int")
+    @ApiModelProperty(value = "主键ids(settlementType=4时必传)", dataType = "Long", required = true)
+    private List<Long> ids;
+
+    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单 / 4业务统计单", dataType = "int")
     private int settlementType;
 }
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 cb9fe38..dcaba8d 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
@@ -49,6 +49,9 @@
     @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
     private String signType;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * minio存储文件名
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
index 3617658..77de29e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
@@ -36,6 +36,9 @@
     @ApiModelProperty(value = "签章/签名编号", dataType = "String")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
index 1669c2f..52be19e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
@@ -56,4 +56,7 @@
 
     @ApiModelProperty(value = "筛选ids", dataType = "List")
     private List<Long> ids;
+
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
index 15c56b4..da31083 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
@@ -79,21 +79,25 @@
     private Integer directReturn;
 
     @TableField("need_accord_declare")
-    @ApiModelProperty(value = "需要符合性声明（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要符合性声明(原检定与校准证书) / 校准委托单中的检定规程（1/0）", dataType = "Integer")
     private Integer needAccordDeclare;
 
     @TableField("need_advice")
-    @ApiModelProperty(value = "需要建议再校准日期（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要建议再校准日期(原检定与校准证书) / 校准委托单中的如需要符合性声明xxx（1/0）", dataType = "Integer")
     private Integer needAdvice;
 
     @TableField("accord_lab")
-    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准(原检定与校准证书)  / 校准委托单中的校准规范（1/0）", dataType = "Integer")
     private Integer accordLab;
 
     @TableField("agree_other")
-    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0） / 校准委托单中的需要建议再校准日期", dataType = "Integer")
     private Integer agreeOther;
 
+    @TableField("time_require")
+    @ApiModelProperty(value = "校准委托单中的时间要求(1常规2加急3特急)", dataType = "Integer")
+    private Integer timeRequire;
+
     @TableField("staff_no")
     @ApiModelProperty(value = "收件人工号（计量人员编号）", dataType = "String")
     private String staffNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
index 57d7906..44f9a33 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
@@ -145,4 +145,8 @@
 
     @TableField(exist = false)
     private int seq;
+
+    //用于判断业务统计单合计行填充
+    @TableField(exist = false)
+    private int settlementType;
 }
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 251adf8..5958534 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
@@ -63,6 +63,10 @@
     @TableField("sign_name")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    @TableField("sign_category")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index 98f5667..9cb4646 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -247,7 +247,7 @@
 //        recordMapper.insert(originalRecord);
 //    }
 
-    private String againCreateCertificateReport(String certificateReportCode) throws Exception {
+    private String againCreateCertificateReport(String certificateReportCode) {
         if (StringUtils.isEmpty(certificateReportCode)) {
             return null;
         }
@@ -269,7 +269,7 @@
         Long maxNo = certificateReportMapper.selectMaxCode(prefix);
         //生成证书编号
         String certificateReportNo = NumberGeneratorUtil.getCode(
-                MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo);
+                MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo, null);
         certificateReport.setApprovalStatus("");
         certificateReport.setId(null);
         certificateReport.setCertificateReportCode(certificateReportNo);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 0a07474..d5c3baa 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -62,6 +62,7 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -362,12 +363,12 @@
             if (!StringUtils.isEmpty(certificateMonitorResponse.getCertificationType())) {
                 DictCodeUtils.convertDictMultiCodeToName(certificateMonitorResponse);
             }
-            //设置证书状态
-            certificateMonitorResponse.setCertificateStatus(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
-                    CertificatePrintStatusEnum.FINISHED : CertificatePrintStatusEnum.UNFINISHED);
             //设置完成时间
             certificateMonitorResponse.setFinishedTime(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
                     certificateMonitorResponse.getFinishedTime() : "");
+            //设置证书状态
+            certificateMonitorResponse.setCertificateStatus(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
+                    CertificatePrintStatusEnum.FINISHED : CertificatePrintStatusEnum.UNFINISHED);
 
             //设置退回次数
             List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode());
@@ -382,7 +383,7 @@
     }
 
     @Override
-    public void exportCertificateFile(BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception {
+    public void exportCertificateFile(BusinessCertificateReport certificateReport, HttpServletResponse response) {
         if (!ObjectUtils.isEmpty(certificateReport.getTemplateId())) {
             //登录用户
             AuthUser user = ShiroKit.getUser();
@@ -614,12 +615,13 @@
     }
 
     private void initCertificateReport(BusinessCertificateReport certificateReport) throws Exception {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date calibrationDate = dateFormat.parse(certificateReport.getCalibrationTime());
         String prefix = MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue()
-                + DateUtil.format(new Date(), "YYYYMMdd");
-//        String prefix = DateUtil.format(new Date(), "YYYYMM");
+                + DateUtil.format(calibrationDate, "YYYYMMdd");
         Long maxNo = this.baseMapper.selectMaxCode(prefix);
         //生成证书编号
-        String certificateReportNo = NumberGeneratorUtil.getCode(MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo);
+        String certificateReportNo = NumberGeneratorUtil.getCode(MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo, DateUtil.format(calibrationDate, "YYYYMMdd"));
         //生成证书名称：证书报告编号+检校专业+证书类别
         DictCodeUtils.convertDictCodeToName(certificateReport);
         String certificateName = certificateReportNo+certificateReport.getCalibrationMajorName()+certificateReport.getCertificateReportCategoryName();
@@ -633,6 +635,7 @@
         certificateReport.setCertificateReportCode(certificateReportNo);
         certificateReport.setCreateTime(DateUtil.formatDateTime(new Date()));
         certificateReport.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+        certificateReport.setIssuanceDate(DateUtil.now());
     }
 
     private MeterStaff getMeterStaffInfo(AuthUser user) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
index f508b66..6f3fe5d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
@@ -116,7 +116,6 @@
     public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) {
         AuthUser authUser = ShiroKit.getUser();
         customerSampleInfo.setUpdateUser(authUser.getId());
-        initSample(customerSampleInfo);
         int updateFlag = this.baseMapper.updateById(customerSampleInfo);
         if (updateFlag > 0) {
             return ReturnUtil.success();

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
index 9c47b5d..733a9d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
@@ -26,6 +26,13 @@
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
     private String certificationTypeName;
 
+    @ApiModelProperty(value = "证书类型", dataType = "String")
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificationClassName;
+
     @ApiModelProperty(value = "证书状态", dataType = "String")
     private String certificateStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
index 53184e4..7bf1532 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
@@ -43,6 +43,9 @@
     @ApiModelProperty(value = " 检校类别", dataType = "String")
     private String measureCategory;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    private String certificateReportType;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index bd3467b..3d7c26c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -105,4 +105,18 @@
     @ApiModelProperty(value = "证书报告附件（前端展示为链接，调用minio获取url接口预览）", dataType = "String")
     private String certificateReportFile;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificateReportType;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
+    @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_TYPE)
+    private String certificateReportCategory;
+
+    @ApiModelProperty(value = "证书类别", dataType = "String")
+    private String certificateReportCategoryName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
index 4df9f7a..5f6c3e2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
@@ -45,6 +45,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "样品备注", dataType = "String")
+    private String sampleRemark;
+
     @ApiModelProperty(value = "委托书编号", dataType = "String")
     @ExcelProperty(value = "委托书编号", order = 4)
     private String orderNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
index ee47738..0b4548c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
@@ -3,7 +3,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:
@@ -12,10 +12,12 @@
  */
 @Data
 public class SettlementPrintDTO {
-    @NotNull(message = "主键ID不能为空")
-    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    @ApiModelProperty(value = "主键id(settlementType=1/2/3时必传)", dataType = "Long", required = true)
     private Long id;
 
-    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单", dataType = "int")
+    @ApiModelProperty(value = "主键ids(settlementType=4时必传)", dataType = "Long", required = true)
+    private List<Long> ids;
+
+    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单 / 4业务统计单", dataType = "int")
     private int settlementType;
 }
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 cb9fe38..dcaba8d 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
@@ -49,6 +49,9 @@
     @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
     private String signType;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * minio存储文件名
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
index 3617658..77de29e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
@@ -36,6 +36,9 @@
     @ApiModelProperty(value = "签章/签名编号", dataType = "String")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
index 1669c2f..52be19e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
@@ -56,4 +56,7 @@
 
     @ApiModelProperty(value = "筛选ids", dataType = "List")
     private List<Long> ids;
+
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
index 15c56b4..da31083 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
@@ -79,21 +79,25 @@
     private Integer directReturn;
 
     @TableField("need_accord_declare")
-    @ApiModelProperty(value = "需要符合性声明（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要符合性声明(原检定与校准证书) / 校准委托单中的检定规程（1/0）", dataType = "Integer")
     private Integer needAccordDeclare;
 
     @TableField("need_advice")
-    @ApiModelProperty(value = "需要建议再校准日期（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要建议再校准日期(原检定与校准证书) / 校准委托单中的如需要符合性声明xxx（1/0）", dataType = "Integer")
     private Integer needAdvice;
 
     @TableField("accord_lab")
-    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准(原检定与校准证书)  / 校准委托单中的校准规范（1/0）", dataType = "Integer")
     private Integer accordLab;
 
     @TableField("agree_other")
-    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0） / 校准委托单中的需要建议再校准日期", dataType = "Integer")
     private Integer agreeOther;
 
+    @TableField("time_require")
+    @ApiModelProperty(value = "校准委托单中的时间要求(1常规2加急3特急)", dataType = "Integer")
+    private Integer timeRequire;
+
     @TableField("staff_no")
     @ApiModelProperty(value = "收件人工号（计量人员编号）", dataType = "String")
     private String staffNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
index 57d7906..44f9a33 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
@@ -145,4 +145,8 @@
 
     @TableField(exist = false)
     private int seq;
+
+    //用于判断业务统计单合计行填充
+    @TableField(exist = false)
+    private int settlementType;
 }
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 251adf8..5958534 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
@@ -63,6 +63,10 @@
     @TableField("sign_name")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    @TableField("sign_category")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index 98f5667..9cb4646 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -247,7 +247,7 @@
 //        recordMapper.insert(originalRecord);
 //    }
 
-    private String againCreateCertificateReport(String certificateReportCode) throws Exception {
+    private String againCreateCertificateReport(String certificateReportCode) {
         if (StringUtils.isEmpty(certificateReportCode)) {
             return null;
         }
@@ -269,7 +269,7 @@
         Long maxNo = certificateReportMapper.selectMaxCode(prefix);
         //生成证书编号
         String certificateReportNo = NumberGeneratorUtil.getCode(
-                MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo);
+                MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo, null);
         certificateReport.setApprovalStatus("");
         certificateReport.setId(null);
         certificateReport.setCertificateReportCode(certificateReportNo);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 0a07474..d5c3baa 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -62,6 +62,7 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -362,12 +363,12 @@
             if (!StringUtils.isEmpty(certificateMonitorResponse.getCertificationType())) {
                 DictCodeUtils.convertDictMultiCodeToName(certificateMonitorResponse);
             }
-            //设置证书状态
-            certificateMonitorResponse.setCertificateStatus(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
-                    CertificatePrintStatusEnum.FINISHED : CertificatePrintStatusEnum.UNFINISHED);
             //设置完成时间
             certificateMonitorResponse.setFinishedTime(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
                     certificateMonitorResponse.getFinishedTime() : "");
+            //设置证书状态
+            certificateMonitorResponse.setCertificateStatus(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
+                    CertificatePrintStatusEnum.FINISHED : CertificatePrintStatusEnum.UNFINISHED);
 
             //设置退回次数
             List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode());
@@ -382,7 +383,7 @@
     }
 
     @Override
-    public void exportCertificateFile(BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception {
+    public void exportCertificateFile(BusinessCertificateReport certificateReport, HttpServletResponse response) {
         if (!ObjectUtils.isEmpty(certificateReport.getTemplateId())) {
             //登录用户
             AuthUser user = ShiroKit.getUser();
@@ -614,12 +615,13 @@
     }
 
     private void initCertificateReport(BusinessCertificateReport certificateReport) throws Exception {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date calibrationDate = dateFormat.parse(certificateReport.getCalibrationTime());
         String prefix = MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue()
-                + DateUtil.format(new Date(), "YYYYMMdd");
-//        String prefix = DateUtil.format(new Date(), "YYYYMM");
+                + DateUtil.format(calibrationDate, "YYYYMMdd");
         Long maxNo = this.baseMapper.selectMaxCode(prefix);
         //生成证书编号
-        String certificateReportNo = NumberGeneratorUtil.getCode(MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo);
+        String certificateReportNo = NumberGeneratorUtil.getCode(MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo, DateUtil.format(calibrationDate, "YYYYMMdd"));
         //生成证书名称：证书报告编号+检校专业+证书类别
         DictCodeUtils.convertDictCodeToName(certificateReport);
         String certificateName = certificateReportNo+certificateReport.getCalibrationMajorName()+certificateReport.getCertificateReportCategoryName();
@@ -633,6 +635,7 @@
         certificateReport.setCertificateReportCode(certificateReportNo);
         certificateReport.setCreateTime(DateUtil.formatDateTime(new Date()));
         certificateReport.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+        certificateReport.setIssuanceDate(DateUtil.now());
     }
 
     private MeterStaff getMeterStaffInfo(AuthUser user) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
index f508b66..6f3fe5d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
@@ -116,7 +116,6 @@
     public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) {
         AuthUser authUser = ShiroKit.getUser();
         customerSampleInfo.setUpdateUser(authUser.getId());
-        initSample(customerSampleInfo);
         int updateFlag = this.baseMapper.updateById(customerSampleInfo);
         if (updateFlag > 0) {
             return ReturnUtil.success();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
index 640dbb7..1c1f3e0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
@@ -151,16 +151,39 @@
     }
 
     @Override
-    public void formExport(Long id, int settlementType, HttpServletResponse response) {
-        if (Objects.isNull(id)) {
+    public void formExport(Long id, List<Long> ids, int settlementType, HttpServletResponse response) {
+        if ((1 == settlementType || 2 == settlementType || 3 == settlementType) && Objects.isNull(id)) {
             return;
         }
-        SettlementInfoDetailResponse detail = this.settlementDetail(id);
-        if (Objects.isNull(detail) || CollectionUtils.isEmpty(detail.getSampleDetailsList())) {
+        if (4 == settlementType && CollectionUtils.isEmpty(ids)) {
             return;
         }
-        int sum = detail.getSampleDetailsList().stream().mapToInt(FinanceBusinessSettlementDetails::getSets).sum();
-        detail.setSampleCount(sum);
+        SettlementInfoDetailResponse detail;
+        if (1 == settlementType || 2 == settlementType || 3 == settlementType) {
+            detail = this.settlementDetail(id);
+            if (Objects.isNull(detail) || CollectionUtils.isEmpty(detail.getSampleDetailsList())) {
+                return;
+            }
+            int sum = detail.getSampleDetailsList().stream().mapToInt(FinanceBusinessSettlementDetails::getSets).sum();
+            detail.setSampleCount(sum);
+        } else {
+            detail = settlementInfoMapper.selectDetailById(ids.get(0));
+            List<FinanceBusinessSettlementDetails> sampleList = new ArrayList<>();
+            List<FinanceBusinessSettlementAmountDetails> detailsList = new ArrayList<>();
+            ids.forEach(sid -> {
+                //结算明细
+                QueryWrapper<FinanceBusinessSettlementDetails> wrapper = new QueryWrapper<>();
+                wrapper.eq("settlement_id", sid);
+                sampleList.addAll(detailsService.list(wrapper));
+                //到账金额明细&开票金额明细
+                QueryWrapper<FinanceBusinessSettlementAmountDetails> wrapper1 = new QueryWrapper<>();
+                wrapper1.eq("settlement_id", sid);
+                detailsList.addAll(amountDetailsService.list(wrapper1));
+            });
+            sampleList.get(0).setSettlementType(4);
+            detail.setSampleDetailsList(sampleList);
+            detail.setAmountDetailsList(detailsList);
+        }
         Map<String, Object> map = new HashMap<>();
         map.put("settlementType", String.valueOf(settlementType));
         PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
index 9c47b5d..733a9d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
@@ -26,6 +26,13 @@
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
     private String certificationTypeName;
 
+    @ApiModelProperty(value = "证书类型", dataType = "String")
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificationClassName;
+
     @ApiModelProperty(value = "证书状态", dataType = "String")
     private String certificateStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
index 53184e4..7bf1532 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
@@ -43,6 +43,9 @@
     @ApiModelProperty(value = " 检校类别", dataType = "String")
     private String measureCategory;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    private String certificateReportType;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index bd3467b..3d7c26c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -105,4 +105,18 @@
     @ApiModelProperty(value = "证书报告附件（前端展示为链接，调用minio获取url接口预览）", dataType = "String")
     private String certificateReportFile;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificateReportType;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
+    @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_TYPE)
+    private String certificateReportCategory;
+
+    @ApiModelProperty(value = "证书类别", dataType = "String")
+    private String certificateReportCategoryName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
index 4df9f7a..5f6c3e2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
@@ -45,6 +45,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "样品备注", dataType = "String")
+    private String sampleRemark;
+
     @ApiModelProperty(value = "委托书编号", dataType = "String")
     @ExcelProperty(value = "委托书编号", order = 4)
     private String orderNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
index ee47738..0b4548c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
@@ -3,7 +3,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:
@@ -12,10 +12,12 @@
  */
 @Data
 public class SettlementPrintDTO {
-    @NotNull(message = "主键ID不能为空")
-    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    @ApiModelProperty(value = "主键id(settlementType=1/2/3时必传)", dataType = "Long", required = true)
     private Long id;
 
-    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单", dataType = "int")
+    @ApiModelProperty(value = "主键ids(settlementType=4时必传)", dataType = "Long", required = true)
+    private List<Long> ids;
+
+    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单 / 4业务统计单", dataType = "int")
     private int settlementType;
 }
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 cb9fe38..dcaba8d 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
@@ -49,6 +49,9 @@
     @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
     private String signType;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * minio存储文件名
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
index 3617658..77de29e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
@@ -36,6 +36,9 @@
     @ApiModelProperty(value = "签章/签名编号", dataType = "String")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
index 1669c2f..52be19e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
@@ -56,4 +56,7 @@
 
     @ApiModelProperty(value = "筛选ids", dataType = "List")
     private List<Long> ids;
+
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
index 15c56b4..da31083 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
@@ -79,21 +79,25 @@
     private Integer directReturn;
 
     @TableField("need_accord_declare")
-    @ApiModelProperty(value = "需要符合性声明（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要符合性声明(原检定与校准证书) / 校准委托单中的检定规程（1/0）", dataType = "Integer")
     private Integer needAccordDeclare;
 
     @TableField("need_advice")
-    @ApiModelProperty(value = "需要建议再校准日期（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要建议再校准日期(原检定与校准证书) / 校准委托单中的如需要符合性声明xxx（1/0）", dataType = "Integer")
     private Integer needAdvice;
 
     @TableField("accord_lab")
-    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准(原检定与校准证书)  / 校准委托单中的校准规范（1/0）", dataType = "Integer")
     private Integer accordLab;
 
     @TableField("agree_other")
-    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0） / 校准委托单中的需要建议再校准日期", dataType = "Integer")
     private Integer agreeOther;
 
+    @TableField("time_require")
+    @ApiModelProperty(value = "校准委托单中的时间要求(1常规2加急3特急)", dataType = "Integer")
+    private Integer timeRequire;
+
     @TableField("staff_no")
     @ApiModelProperty(value = "收件人工号（计量人员编号）", dataType = "String")
     private String staffNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
index 57d7906..44f9a33 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
@@ -145,4 +145,8 @@
 
     @TableField(exist = false)
     private int seq;
+
+    //用于判断业务统计单合计行填充
+    @TableField(exist = false)
+    private int settlementType;
 }
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 251adf8..5958534 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
@@ -63,6 +63,10 @@
     @TableField("sign_name")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    @TableField("sign_category")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index 98f5667..9cb4646 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -247,7 +247,7 @@
 //        recordMapper.insert(originalRecord);
 //    }
 
-    private String againCreateCertificateReport(String certificateReportCode) throws Exception {
+    private String againCreateCertificateReport(String certificateReportCode) {
         if (StringUtils.isEmpty(certificateReportCode)) {
             return null;
         }
@@ -269,7 +269,7 @@
         Long maxNo = certificateReportMapper.selectMaxCode(prefix);
         //生成证书编号
         String certificateReportNo = NumberGeneratorUtil.getCode(
-                MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo);
+                MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo, null);
         certificateReport.setApprovalStatus("");
         certificateReport.setId(null);
         certificateReport.setCertificateReportCode(certificateReportNo);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 0a07474..d5c3baa 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -62,6 +62,7 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -362,12 +363,12 @@
             if (!StringUtils.isEmpty(certificateMonitorResponse.getCertificationType())) {
                 DictCodeUtils.convertDictMultiCodeToName(certificateMonitorResponse);
             }
-            //设置证书状态
-            certificateMonitorResponse.setCertificateStatus(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
-                    CertificatePrintStatusEnum.FINISHED : CertificatePrintStatusEnum.UNFINISHED);
             //设置完成时间
             certificateMonitorResponse.setFinishedTime(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
                     certificateMonitorResponse.getFinishedTime() : "");
+            //设置证书状态
+            certificateMonitorResponse.setCertificateStatus(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
+                    CertificatePrintStatusEnum.FINISHED : CertificatePrintStatusEnum.UNFINISHED);
 
             //设置退回次数
             List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode());
@@ -382,7 +383,7 @@
     }
 
     @Override
-    public void exportCertificateFile(BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception {
+    public void exportCertificateFile(BusinessCertificateReport certificateReport, HttpServletResponse response) {
         if (!ObjectUtils.isEmpty(certificateReport.getTemplateId())) {
             //登录用户
             AuthUser user = ShiroKit.getUser();
@@ -614,12 +615,13 @@
     }
 
     private void initCertificateReport(BusinessCertificateReport certificateReport) throws Exception {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date calibrationDate = dateFormat.parse(certificateReport.getCalibrationTime());
         String prefix = MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue()
-                + DateUtil.format(new Date(), "YYYYMMdd");
-//        String prefix = DateUtil.format(new Date(), "YYYYMM");
+                + DateUtil.format(calibrationDate, "YYYYMMdd");
         Long maxNo = this.baseMapper.selectMaxCode(prefix);
         //生成证书编号
-        String certificateReportNo = NumberGeneratorUtil.getCode(MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo);
+        String certificateReportNo = NumberGeneratorUtil.getCode(MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo, DateUtil.format(calibrationDate, "YYYYMMdd"));
         //生成证书名称：证书报告编号+检校专业+证书类别
         DictCodeUtils.convertDictCodeToName(certificateReport);
         String certificateName = certificateReportNo+certificateReport.getCalibrationMajorName()+certificateReport.getCertificateReportCategoryName();
@@ -633,6 +635,7 @@
         certificateReport.setCertificateReportCode(certificateReportNo);
         certificateReport.setCreateTime(DateUtil.formatDateTime(new Date()));
         certificateReport.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+        certificateReport.setIssuanceDate(DateUtil.now());
     }
 
     private MeterStaff getMeterStaffInfo(AuthUser user) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
index f508b66..6f3fe5d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
@@ -116,7 +116,6 @@
     public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) {
         AuthUser authUser = ShiroKit.getUser();
         customerSampleInfo.setUpdateUser(authUser.getId());
-        initSample(customerSampleInfo);
         int updateFlag = this.baseMapper.updateById(customerSampleInfo);
         if (updateFlag > 0) {
             return ReturnUtil.success();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
index 640dbb7..1c1f3e0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
@@ -151,16 +151,39 @@
     }
 
     @Override
-    public void formExport(Long id, int settlementType, HttpServletResponse response) {
-        if (Objects.isNull(id)) {
+    public void formExport(Long id, List<Long> ids, int settlementType, HttpServletResponse response) {
+        if ((1 == settlementType || 2 == settlementType || 3 == settlementType) && Objects.isNull(id)) {
             return;
         }
-        SettlementInfoDetailResponse detail = this.settlementDetail(id);
-        if (Objects.isNull(detail) || CollectionUtils.isEmpty(detail.getSampleDetailsList())) {
+        if (4 == settlementType && CollectionUtils.isEmpty(ids)) {
             return;
         }
-        int sum = detail.getSampleDetailsList().stream().mapToInt(FinanceBusinessSettlementDetails::getSets).sum();
-        detail.setSampleCount(sum);
+        SettlementInfoDetailResponse detail;
+        if (1 == settlementType || 2 == settlementType || 3 == settlementType) {
+            detail = this.settlementDetail(id);
+            if (Objects.isNull(detail) || CollectionUtils.isEmpty(detail.getSampleDetailsList())) {
+                return;
+            }
+            int sum = detail.getSampleDetailsList().stream().mapToInt(FinanceBusinessSettlementDetails::getSets).sum();
+            detail.setSampleCount(sum);
+        } else {
+            detail = settlementInfoMapper.selectDetailById(ids.get(0));
+            List<FinanceBusinessSettlementDetails> sampleList = new ArrayList<>();
+            List<FinanceBusinessSettlementAmountDetails> detailsList = new ArrayList<>();
+            ids.forEach(sid -> {
+                //结算明细
+                QueryWrapper<FinanceBusinessSettlementDetails> wrapper = new QueryWrapper<>();
+                wrapper.eq("settlement_id", sid);
+                sampleList.addAll(detailsService.list(wrapper));
+                //到账金额明细&开票金额明细
+                QueryWrapper<FinanceBusinessSettlementAmountDetails> wrapper1 = new QueryWrapper<>();
+                wrapper1.eq("settlement_id", sid);
+                detailsList.addAll(amountDetailsService.list(wrapper1));
+            });
+            sampleList.get(0).setSettlementType(4);
+            detail.setSampleDetailsList(sampleList);
+            detail.setAmountDetailsList(detailsList);
+        }
         Map<String, Object> map = new HashMap<>();
         map.put("settlementType", String.valueOf(settlementType));
         PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
index a347fdd..c4061e7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl.flowable;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
@@ -283,8 +284,9 @@
 //        Task task = taskService.createTaskQuery().taskId(request.getTaskId()).singleResult();
 
         //只有发起者才能撤回
+        String processId = request.getProcessInstanceId();
         HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
-                .processInstanceId(request.getProcessInstanceId())
+                .processInstanceId(processId)
                 .startedBy(String.valueOf(user.getId()))
                 .or()
                 .unfinished() //审批中的流程才能撤回
@@ -295,6 +297,29 @@
             log.error("该用户无审批中的流程，userId:{}，processInstanceId:{}", user.getId(), request.getProcessInstanceId());
             return ReturnUtil.failed("该用户无审批中的流程");
         }
+        //设置取消状态
+        runtimeService.updateBusinessStatus(processId, ApprovalStatusEnum.CANCELED);
+        List<Task> tasks = taskService.createTaskQuery()
+                .processInstanceId(processId)
+                .active().list();
+        if (CollUtil.isNotEmpty(tasks)) {
+
+            tasks.forEach(task -> {
+                taskService.addComment(task.getId(), task.getProcessInstanceId(), "4", "取消申请");
+            });
+
+            String defKey = tasks.get(0).getTaskDefinitionKey();
+            //驳回至指定节点，现驳回到起始节点
+            HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery()
+                    .processInstanceId(processId)
+                    .orderByHistoricTaskInstanceStartTime()
+                    .asc().list().get(0);
+
+            runtimeService.createChangeActivityStateBuilder()
+                    .processInstanceId(processId)
+                    .moveActivityIdTo(defKey, historicTaskInstance.getTaskDefinitionKey())
+                    .changeState();
+        }
 
         //设置取消状态
         runtimeService.updateBusinessStatus(request.getProcessInstanceId(), ApprovalStatusEnum.CANCELED);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
index 9c47b5d..733a9d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
@@ -26,6 +26,13 @@
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
     private String certificationTypeName;
 
+    @ApiModelProperty(value = "证书类型", dataType = "String")
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificationClassName;
+
     @ApiModelProperty(value = "证书状态", dataType = "String")
     private String certificateStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
index 53184e4..7bf1532 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
@@ -43,6 +43,9 @@
     @ApiModelProperty(value = " 检校类别", dataType = "String")
     private String measureCategory;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    private String certificateReportType;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index bd3467b..3d7c26c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -105,4 +105,18 @@
     @ApiModelProperty(value = "证书报告附件（前端展示为链接，调用minio获取url接口预览）", dataType = "String")
     private String certificateReportFile;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificateReportType;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
+    @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_TYPE)
+    private String certificateReportCategory;
+
+    @ApiModelProperty(value = "证书类别", dataType = "String")
+    private String certificateReportCategoryName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
index 4df9f7a..5f6c3e2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
@@ -45,6 +45,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "样品备注", dataType = "String")
+    private String sampleRemark;
+
     @ApiModelProperty(value = "委托书编号", dataType = "String")
     @ExcelProperty(value = "委托书编号", order = 4)
     private String orderNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
index ee47738..0b4548c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
@@ -3,7 +3,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:
@@ -12,10 +12,12 @@
  */
 @Data
 public class SettlementPrintDTO {
-    @NotNull(message = "主键ID不能为空")
-    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    @ApiModelProperty(value = "主键id(settlementType=1/2/3时必传)", dataType = "Long", required = true)
     private Long id;
 
-    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单", dataType = "int")
+    @ApiModelProperty(value = "主键ids(settlementType=4时必传)", dataType = "Long", required = true)
+    private List<Long> ids;
+
+    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单 / 4业务统计单", dataType = "int")
     private int settlementType;
 }
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 cb9fe38..dcaba8d 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
@@ -49,6 +49,9 @@
     @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
     private String signType;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * minio存储文件名
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
index 3617658..77de29e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
@@ -36,6 +36,9 @@
     @ApiModelProperty(value = "签章/签名编号", dataType = "String")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
index 1669c2f..52be19e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
@@ -56,4 +56,7 @@
 
     @ApiModelProperty(value = "筛选ids", dataType = "List")
     private List<Long> ids;
+
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
index 15c56b4..da31083 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
@@ -79,21 +79,25 @@
     private Integer directReturn;
 
     @TableField("need_accord_declare")
-    @ApiModelProperty(value = "需要符合性声明（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要符合性声明(原检定与校准证书) / 校准委托单中的检定规程（1/0）", dataType = "Integer")
     private Integer needAccordDeclare;
 
     @TableField("need_advice")
-    @ApiModelProperty(value = "需要建议再校准日期（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要建议再校准日期(原检定与校准证书) / 校准委托单中的如需要符合性声明xxx（1/0）", dataType = "Integer")
     private Integer needAdvice;
 
     @TableField("accord_lab")
-    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准(原检定与校准证书)  / 校准委托单中的校准规范（1/0）", dataType = "Integer")
     private Integer accordLab;
 
     @TableField("agree_other")
-    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0） / 校准委托单中的需要建议再校准日期", dataType = "Integer")
     private Integer agreeOther;
 
+    @TableField("time_require")
+    @ApiModelProperty(value = "校准委托单中的时间要求(1常规2加急3特急)", dataType = "Integer")
+    private Integer timeRequire;
+
     @TableField("staff_no")
     @ApiModelProperty(value = "收件人工号（计量人员编号）", dataType = "String")
     private String staffNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
index 57d7906..44f9a33 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
@@ -145,4 +145,8 @@
 
     @TableField(exist = false)
     private int seq;
+
+    //用于判断业务统计单合计行填充
+    @TableField(exist = false)
+    private int settlementType;
 }
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 251adf8..5958534 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
@@ -63,6 +63,10 @@
     @TableField("sign_name")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    @TableField("sign_category")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index 98f5667..9cb4646 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -247,7 +247,7 @@
 //        recordMapper.insert(originalRecord);
 //    }
 
-    private String againCreateCertificateReport(String certificateReportCode) throws Exception {
+    private String againCreateCertificateReport(String certificateReportCode) {
         if (StringUtils.isEmpty(certificateReportCode)) {
             return null;
         }
@@ -269,7 +269,7 @@
         Long maxNo = certificateReportMapper.selectMaxCode(prefix);
         //生成证书编号
         String certificateReportNo = NumberGeneratorUtil.getCode(
-                MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo);
+                MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo, null);
         certificateReport.setApprovalStatus("");
         certificateReport.setId(null);
         certificateReport.setCertificateReportCode(certificateReportNo);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 0a07474..d5c3baa 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -62,6 +62,7 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -362,12 +363,12 @@
             if (!StringUtils.isEmpty(certificateMonitorResponse.getCertificationType())) {
                 DictCodeUtils.convertDictMultiCodeToName(certificateMonitorResponse);
             }
-            //设置证书状态
-            certificateMonitorResponse.setCertificateStatus(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
-                    CertificatePrintStatusEnum.FINISHED : CertificatePrintStatusEnum.UNFINISHED);
             //设置完成时间
             certificateMonitorResponse.setFinishedTime(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
                     certificateMonitorResponse.getFinishedTime() : "");
+            //设置证书状态
+            certificateMonitorResponse.setCertificateStatus(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
+                    CertificatePrintStatusEnum.FINISHED : CertificatePrintStatusEnum.UNFINISHED);
 
             //设置退回次数
             List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode());
@@ -382,7 +383,7 @@
     }
 
     @Override
-    public void exportCertificateFile(BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception {
+    public void exportCertificateFile(BusinessCertificateReport certificateReport, HttpServletResponse response) {
         if (!ObjectUtils.isEmpty(certificateReport.getTemplateId())) {
             //登录用户
             AuthUser user = ShiroKit.getUser();
@@ -614,12 +615,13 @@
     }
 
     private void initCertificateReport(BusinessCertificateReport certificateReport) throws Exception {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date calibrationDate = dateFormat.parse(certificateReport.getCalibrationTime());
         String prefix = MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue()
-                + DateUtil.format(new Date(), "YYYYMMdd");
-//        String prefix = DateUtil.format(new Date(), "YYYYMM");
+                + DateUtil.format(calibrationDate, "YYYYMMdd");
         Long maxNo = this.baseMapper.selectMaxCode(prefix);
         //生成证书编号
-        String certificateReportNo = NumberGeneratorUtil.getCode(MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo);
+        String certificateReportNo = NumberGeneratorUtil.getCode(MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo, DateUtil.format(calibrationDate, "YYYYMMdd"));
         //生成证书名称：证书报告编号+检校专业+证书类别
         DictCodeUtils.convertDictCodeToName(certificateReport);
         String certificateName = certificateReportNo+certificateReport.getCalibrationMajorName()+certificateReport.getCertificateReportCategoryName();
@@ -633,6 +635,7 @@
         certificateReport.setCertificateReportCode(certificateReportNo);
         certificateReport.setCreateTime(DateUtil.formatDateTime(new Date()));
         certificateReport.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+        certificateReport.setIssuanceDate(DateUtil.now());
     }
 
     private MeterStaff getMeterStaffInfo(AuthUser user) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
index f508b66..6f3fe5d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
@@ -116,7 +116,6 @@
     public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) {
         AuthUser authUser = ShiroKit.getUser();
         customerSampleInfo.setUpdateUser(authUser.getId());
-        initSample(customerSampleInfo);
         int updateFlag = this.baseMapper.updateById(customerSampleInfo);
         if (updateFlag > 0) {
             return ReturnUtil.success();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
index 640dbb7..1c1f3e0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
@@ -151,16 +151,39 @@
     }
 
     @Override
-    public void formExport(Long id, int settlementType, HttpServletResponse response) {
-        if (Objects.isNull(id)) {
+    public void formExport(Long id, List<Long> ids, int settlementType, HttpServletResponse response) {
+        if ((1 == settlementType || 2 == settlementType || 3 == settlementType) && Objects.isNull(id)) {
             return;
         }
-        SettlementInfoDetailResponse detail = this.settlementDetail(id);
-        if (Objects.isNull(detail) || CollectionUtils.isEmpty(detail.getSampleDetailsList())) {
+        if (4 == settlementType && CollectionUtils.isEmpty(ids)) {
             return;
         }
-        int sum = detail.getSampleDetailsList().stream().mapToInt(FinanceBusinessSettlementDetails::getSets).sum();
-        detail.setSampleCount(sum);
+        SettlementInfoDetailResponse detail;
+        if (1 == settlementType || 2 == settlementType || 3 == settlementType) {
+            detail = this.settlementDetail(id);
+            if (Objects.isNull(detail) || CollectionUtils.isEmpty(detail.getSampleDetailsList())) {
+                return;
+            }
+            int sum = detail.getSampleDetailsList().stream().mapToInt(FinanceBusinessSettlementDetails::getSets).sum();
+            detail.setSampleCount(sum);
+        } else {
+            detail = settlementInfoMapper.selectDetailById(ids.get(0));
+            List<FinanceBusinessSettlementDetails> sampleList = new ArrayList<>();
+            List<FinanceBusinessSettlementAmountDetails> detailsList = new ArrayList<>();
+            ids.forEach(sid -> {
+                //结算明细
+                QueryWrapper<FinanceBusinessSettlementDetails> wrapper = new QueryWrapper<>();
+                wrapper.eq("settlement_id", sid);
+                sampleList.addAll(detailsService.list(wrapper));
+                //到账金额明细&开票金额明细
+                QueryWrapper<FinanceBusinessSettlementAmountDetails> wrapper1 = new QueryWrapper<>();
+                wrapper1.eq("settlement_id", sid);
+                detailsList.addAll(amountDetailsService.list(wrapper1));
+            });
+            sampleList.get(0).setSettlementType(4);
+            detail.setSampleDetailsList(sampleList);
+            detail.setAmountDetailsList(detailsList);
+        }
         Map<String, Object> map = new HashMap<>();
         map.put("settlementType", String.valueOf(settlementType));
         PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
index a347fdd..c4061e7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl.flowable;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
@@ -283,8 +284,9 @@
 //        Task task = taskService.createTaskQuery().taskId(request.getTaskId()).singleResult();
 
         //只有发起者才能撤回
+        String processId = request.getProcessInstanceId();
         HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
-                .processInstanceId(request.getProcessInstanceId())
+                .processInstanceId(processId)
                 .startedBy(String.valueOf(user.getId()))
                 .or()
                 .unfinished() //审批中的流程才能撤回
@@ -295,6 +297,29 @@
             log.error("该用户无审批中的流程，userId:{}，processInstanceId:{}", user.getId(), request.getProcessInstanceId());
             return ReturnUtil.failed("该用户无审批中的流程");
         }
+        //设置取消状态
+        runtimeService.updateBusinessStatus(processId, ApprovalStatusEnum.CANCELED);
+        List<Task> tasks = taskService.createTaskQuery()
+                .processInstanceId(processId)
+                .active().list();
+        if (CollUtil.isNotEmpty(tasks)) {
+
+            tasks.forEach(task -> {
+                taskService.addComment(task.getId(), task.getProcessInstanceId(), "4", "取消申请");
+            });
+
+            String defKey = tasks.get(0).getTaskDefinitionKey();
+            //驳回至指定节点，现驳回到起始节点
+            HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery()
+                    .processInstanceId(processId)
+                    .orderByHistoricTaskInstanceStartTime()
+                    .asc().list().get(0);
+
+            runtimeService.createChangeActivityStateBuilder()
+                    .processInstanceId(processId)
+                    .moveActivityIdTo(defKey, historicTaskInstance.getTaskDefinitionKey())
+                    .changeState();
+        }
 
         //设置取消状态
         runtimeService.updateBusinessStatus(request.getProcessInstanceId(), ApprovalStatusEnum.CANCELED);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/finance/IFinanceBusinessSettlementInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/finance/IFinanceBusinessSettlementInfoService.java
index c4e5232..cd96251 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/finance/IFinanceBusinessSettlementInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/finance/IFinanceBusinessSettlementInfoService.java
@@ -35,5 +35,5 @@
 
     Integer selectCompleteAmount(String year);
 
-    void formExport(Long id, int settlementType, HttpServletResponse response);
+    void formExport(Long id, List<Long> ids, int settlementType, HttpServletResponse response);
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
index 9c47b5d..733a9d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
@@ -26,6 +26,13 @@
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
     private String certificationTypeName;
 
+    @ApiModelProperty(value = "证书类型", dataType = "String")
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificationClassName;
+
     @ApiModelProperty(value = "证书状态", dataType = "String")
     private String certificateStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
index 53184e4..7bf1532 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
@@ -43,6 +43,9 @@
     @ApiModelProperty(value = " 检校类别", dataType = "String")
     private String measureCategory;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    private String certificateReportType;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index bd3467b..3d7c26c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -105,4 +105,18 @@
     @ApiModelProperty(value = "证书报告附件（前端展示为链接，调用minio获取url接口预览）", dataType = "String")
     private String certificateReportFile;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificateReportType;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
+    @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_TYPE)
+    private String certificateReportCategory;
+
+    @ApiModelProperty(value = "证书类别", dataType = "String")
+    private String certificateReportCategoryName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
index 4df9f7a..5f6c3e2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
@@ -45,6 +45,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "样品备注", dataType = "String")
+    private String sampleRemark;
+
     @ApiModelProperty(value = "委托书编号", dataType = "String")
     @ExcelProperty(value = "委托书编号", order = 4)
     private String orderNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
index ee47738..0b4548c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
@@ -3,7 +3,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:
@@ -12,10 +12,12 @@
  */
 @Data
 public class SettlementPrintDTO {
-    @NotNull(message = "主键ID不能为空")
-    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    @ApiModelProperty(value = "主键id(settlementType=1/2/3时必传)", dataType = "Long", required = true)
     private Long id;
 
-    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单", dataType = "int")
+    @ApiModelProperty(value = "主键ids(settlementType=4时必传)", dataType = "Long", required = true)
+    private List<Long> ids;
+
+    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单 / 4业务统计单", dataType = "int")
     private int settlementType;
 }
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 cb9fe38..dcaba8d 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
@@ -49,6 +49,9 @@
     @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
     private String signType;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * minio存储文件名
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
index 3617658..77de29e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
@@ -36,6 +36,9 @@
     @ApiModelProperty(value = "签章/签名编号", dataType = "String")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
index 1669c2f..52be19e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
@@ -56,4 +56,7 @@
 
     @ApiModelProperty(value = "筛选ids", dataType = "List")
     private List<Long> ids;
+
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
index 15c56b4..da31083 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
@@ -79,21 +79,25 @@
     private Integer directReturn;
 
     @TableField("need_accord_declare")
-    @ApiModelProperty(value = "需要符合性声明（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要符合性声明(原检定与校准证书) / 校准委托单中的检定规程（1/0）", dataType = "Integer")
     private Integer needAccordDeclare;
 
     @TableField("need_advice")
-    @ApiModelProperty(value = "需要建议再校准日期（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要建议再校准日期(原检定与校准证书) / 校准委托单中的如需要符合性声明xxx（1/0）", dataType = "Integer")
     private Integer needAdvice;
 
     @TableField("accord_lab")
-    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准(原检定与校准证书)  / 校准委托单中的校准规范（1/0）", dataType = "Integer")
     private Integer accordLab;
 
     @TableField("agree_other")
-    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0） / 校准委托单中的需要建议再校准日期", dataType = "Integer")
     private Integer agreeOther;
 
+    @TableField("time_require")
+    @ApiModelProperty(value = "校准委托单中的时间要求(1常规2加急3特急)", dataType = "Integer")
+    private Integer timeRequire;
+
     @TableField("staff_no")
     @ApiModelProperty(value = "收件人工号（计量人员编号）", dataType = "String")
     private String staffNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
index 57d7906..44f9a33 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
@@ -145,4 +145,8 @@
 
     @TableField(exist = false)
     private int seq;
+
+    //用于判断业务统计单合计行填充
+    @TableField(exist = false)
+    private int settlementType;
 }
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 251adf8..5958534 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
@@ -63,6 +63,10 @@
     @TableField("sign_name")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    @TableField("sign_category")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index 98f5667..9cb4646 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -247,7 +247,7 @@
 //        recordMapper.insert(originalRecord);
 //    }
 
-    private String againCreateCertificateReport(String certificateReportCode) throws Exception {
+    private String againCreateCertificateReport(String certificateReportCode) {
         if (StringUtils.isEmpty(certificateReportCode)) {
             return null;
         }
@@ -269,7 +269,7 @@
         Long maxNo = certificateReportMapper.selectMaxCode(prefix);
         //生成证书编号
         String certificateReportNo = NumberGeneratorUtil.getCode(
-                MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo);
+                MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo, null);
         certificateReport.setApprovalStatus("");
         certificateReport.setId(null);
         certificateReport.setCertificateReportCode(certificateReportNo);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 0a07474..d5c3baa 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -62,6 +62,7 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -362,12 +363,12 @@
             if (!StringUtils.isEmpty(certificateMonitorResponse.getCertificationType())) {
                 DictCodeUtils.convertDictMultiCodeToName(certificateMonitorResponse);
             }
-            //设置证书状态
-            certificateMonitorResponse.setCertificateStatus(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
-                    CertificatePrintStatusEnum.FINISHED : CertificatePrintStatusEnum.UNFINISHED);
             //设置完成时间
             certificateMonitorResponse.setFinishedTime(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
                     certificateMonitorResponse.getFinishedTime() : "");
+            //设置证书状态
+            certificateMonitorResponse.setCertificateStatus(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
+                    CertificatePrintStatusEnum.FINISHED : CertificatePrintStatusEnum.UNFINISHED);
 
             //设置退回次数
             List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode());
@@ -382,7 +383,7 @@
     }
 
     @Override
-    public void exportCertificateFile(BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception {
+    public void exportCertificateFile(BusinessCertificateReport certificateReport, HttpServletResponse response) {
         if (!ObjectUtils.isEmpty(certificateReport.getTemplateId())) {
             //登录用户
             AuthUser user = ShiroKit.getUser();
@@ -614,12 +615,13 @@
     }
 
     private void initCertificateReport(BusinessCertificateReport certificateReport) throws Exception {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date calibrationDate = dateFormat.parse(certificateReport.getCalibrationTime());
         String prefix = MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue()
-                + DateUtil.format(new Date(), "YYYYMMdd");
-//        String prefix = DateUtil.format(new Date(), "YYYYMM");
+                + DateUtil.format(calibrationDate, "YYYYMMdd");
         Long maxNo = this.baseMapper.selectMaxCode(prefix);
         //生成证书编号
-        String certificateReportNo = NumberGeneratorUtil.getCode(MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo);
+        String certificateReportNo = NumberGeneratorUtil.getCode(MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo, DateUtil.format(calibrationDate, "YYYYMMdd"));
         //生成证书名称：证书报告编号+检校专业+证书类别
         DictCodeUtils.convertDictCodeToName(certificateReport);
         String certificateName = certificateReportNo+certificateReport.getCalibrationMajorName()+certificateReport.getCertificateReportCategoryName();
@@ -633,6 +635,7 @@
         certificateReport.setCertificateReportCode(certificateReportNo);
         certificateReport.setCreateTime(DateUtil.formatDateTime(new Date()));
         certificateReport.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+        certificateReport.setIssuanceDate(DateUtil.now());
     }
 
     private MeterStaff getMeterStaffInfo(AuthUser user) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
index f508b66..6f3fe5d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
@@ -116,7 +116,6 @@
     public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) {
         AuthUser authUser = ShiroKit.getUser();
         customerSampleInfo.setUpdateUser(authUser.getId());
-        initSample(customerSampleInfo);
         int updateFlag = this.baseMapper.updateById(customerSampleInfo);
         if (updateFlag > 0) {
             return ReturnUtil.success();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
index 640dbb7..1c1f3e0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
@@ -151,16 +151,39 @@
     }
 
     @Override
-    public void formExport(Long id, int settlementType, HttpServletResponse response) {
-        if (Objects.isNull(id)) {
+    public void formExport(Long id, List<Long> ids, int settlementType, HttpServletResponse response) {
+        if ((1 == settlementType || 2 == settlementType || 3 == settlementType) && Objects.isNull(id)) {
             return;
         }
-        SettlementInfoDetailResponse detail = this.settlementDetail(id);
-        if (Objects.isNull(detail) || CollectionUtils.isEmpty(detail.getSampleDetailsList())) {
+        if (4 == settlementType && CollectionUtils.isEmpty(ids)) {
             return;
         }
-        int sum = detail.getSampleDetailsList().stream().mapToInt(FinanceBusinessSettlementDetails::getSets).sum();
-        detail.setSampleCount(sum);
+        SettlementInfoDetailResponse detail;
+        if (1 == settlementType || 2 == settlementType || 3 == settlementType) {
+            detail = this.settlementDetail(id);
+            if (Objects.isNull(detail) || CollectionUtils.isEmpty(detail.getSampleDetailsList())) {
+                return;
+            }
+            int sum = detail.getSampleDetailsList().stream().mapToInt(FinanceBusinessSettlementDetails::getSets).sum();
+            detail.setSampleCount(sum);
+        } else {
+            detail = settlementInfoMapper.selectDetailById(ids.get(0));
+            List<FinanceBusinessSettlementDetails> sampleList = new ArrayList<>();
+            List<FinanceBusinessSettlementAmountDetails> detailsList = new ArrayList<>();
+            ids.forEach(sid -> {
+                //结算明细
+                QueryWrapper<FinanceBusinessSettlementDetails> wrapper = new QueryWrapper<>();
+                wrapper.eq("settlement_id", sid);
+                sampleList.addAll(detailsService.list(wrapper));
+                //到账金额明细&开票金额明细
+                QueryWrapper<FinanceBusinessSettlementAmountDetails> wrapper1 = new QueryWrapper<>();
+                wrapper1.eq("settlement_id", sid);
+                detailsList.addAll(amountDetailsService.list(wrapper1));
+            });
+            sampleList.get(0).setSettlementType(4);
+            detail.setSampleDetailsList(sampleList);
+            detail.setAmountDetailsList(detailsList);
+        }
         Map<String, Object> map = new HashMap<>();
         map.put("settlementType", String.valueOf(settlementType));
         PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
index a347fdd..c4061e7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl.flowable;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
@@ -283,8 +284,9 @@
 //        Task task = taskService.createTaskQuery().taskId(request.getTaskId()).singleResult();
 
         //只有发起者才能撤回
+        String processId = request.getProcessInstanceId();
         HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
-                .processInstanceId(request.getProcessInstanceId())
+                .processInstanceId(processId)
                 .startedBy(String.valueOf(user.getId()))
                 .or()
                 .unfinished() //审批中的流程才能撤回
@@ -295,6 +297,29 @@
             log.error("该用户无审批中的流程，userId:{}，processInstanceId:{}", user.getId(), request.getProcessInstanceId());
             return ReturnUtil.failed("该用户无审批中的流程");
         }
+        //设置取消状态
+        runtimeService.updateBusinessStatus(processId, ApprovalStatusEnum.CANCELED);
+        List<Task> tasks = taskService.createTaskQuery()
+                .processInstanceId(processId)
+                .active().list();
+        if (CollUtil.isNotEmpty(tasks)) {
+
+            tasks.forEach(task -> {
+                taskService.addComment(task.getId(), task.getProcessInstanceId(), "4", "取消申请");
+            });
+
+            String defKey = tasks.get(0).getTaskDefinitionKey();
+            //驳回至指定节点，现驳回到起始节点
+            HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery()
+                    .processInstanceId(processId)
+                    .orderByHistoricTaskInstanceStartTime()
+                    .asc().list().get(0);
+
+            runtimeService.createChangeActivityStateBuilder()
+                    .processInstanceId(processId)
+                    .moveActivityIdTo(defKey, historicTaskInstance.getTaskDefinitionKey())
+                    .changeState();
+        }
 
         //设置取消状态
         runtimeService.updateBusinessStatus(request.getProcessInstanceId(), ApprovalStatusEnum.CANCELED);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/finance/IFinanceBusinessSettlementInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/finance/IFinanceBusinessSettlementInfoService.java
index c4e5232..cd96251 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/finance/IFinanceBusinessSettlementInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/finance/IFinanceBusinessSettlementInfoService.java
@@ -35,5 +35,5 @@
 
     Integer selectCompleteAmount(String year);
 
-    void formExport(Long id, int settlementType, HttpServletResponse response);
+    void formExport(Long id, List<Long> ids, int settlementType, HttpServletResponse response);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java
index 97660b5..29cf0a4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java
@@ -89,6 +89,14 @@
                 params.put("monthD", calendar.get(Calendar.MONTH) + 1);
                 params.put("dayD", calendar.get(Calendar.DAY_OF_MONTH));
             }
+            if (StringUtils.isNotEmpty(metaData.getExpirationDate())) {
+                params.put("expirationDate", new SimpleDateFormat("yyyy年MM月dd日").format(new SimpleDateFormat("yyyy-MM-dd").parse(metaData.getExpirationDate())));
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(new SimpleDateFormat("yyyy-MM-dd").parse(metaData.getExpirationDate()));
+                params.put("yearE", calendar.get(Calendar.YEAR));
+                params.put("monthE", calendar.get(Calendar.MONTH) + 1);
+                params.put("dayE", calendar.get(Calendar.DAY_OF_MONTH));
+            }
             params.put("calibrationPlace", metaData.getCalibrationPlace());
             params.put("manufacturer", metaData.getManufacturer());
             params.put("measurePerson", metaData.getMeasurePerson());

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
index 9c47b5d..733a9d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
@@ -26,6 +26,13 @@
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
     private String certificationTypeName;
 
+    @ApiModelProperty(value = "证书类型", dataType = "String")
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificationClassName;
+
     @ApiModelProperty(value = "证书状态", dataType = "String")
     private String certificateStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
index 53184e4..7bf1532 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
@@ -43,6 +43,9 @@
     @ApiModelProperty(value = " 检校类别", dataType = "String")
     private String measureCategory;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    private String certificateReportType;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index bd3467b..3d7c26c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -105,4 +105,18 @@
     @ApiModelProperty(value = "证书报告附件（前端展示为链接，调用minio获取url接口预览）", dataType = "String")
     private String certificateReportFile;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificateReportType;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
+    @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_TYPE)
+    private String certificateReportCategory;
+
+    @ApiModelProperty(value = "证书类别", dataType = "String")
+    private String certificateReportCategoryName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
index 4df9f7a..5f6c3e2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
@@ -45,6 +45,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "样品备注", dataType = "String")
+    private String sampleRemark;
+
     @ApiModelProperty(value = "委托书编号", dataType = "String")
     @ExcelProperty(value = "委托书编号", order = 4)
     private String orderNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
index ee47738..0b4548c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
@@ -3,7 +3,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:
@@ -12,10 +12,12 @@
  */
 @Data
 public class SettlementPrintDTO {
-    @NotNull(message = "主键ID不能为空")
-    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    @ApiModelProperty(value = "主键id(settlementType=1/2/3时必传)", dataType = "Long", required = true)
     private Long id;
 
-    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单", dataType = "int")
+    @ApiModelProperty(value = "主键ids(settlementType=4时必传)", dataType = "Long", required = true)
+    private List<Long> ids;
+
+    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单 / 4业务统计单", dataType = "int")
     private int settlementType;
 }
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 cb9fe38..dcaba8d 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
@@ -49,6 +49,9 @@
     @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
     private String signType;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * minio存储文件名
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
index 3617658..77de29e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
@@ -36,6 +36,9 @@
     @ApiModelProperty(value = "签章/签名编号", dataType = "String")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
index 1669c2f..52be19e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
@@ -56,4 +56,7 @@
 
     @ApiModelProperty(value = "筛选ids", dataType = "List")
     private List<Long> ids;
+
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
index 15c56b4..da31083 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
@@ -79,21 +79,25 @@
     private Integer directReturn;
 
     @TableField("need_accord_declare")
-    @ApiModelProperty(value = "需要符合性声明（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要符合性声明(原检定与校准证书) / 校准委托单中的检定规程（1/0）", dataType = "Integer")
     private Integer needAccordDeclare;
 
     @TableField("need_advice")
-    @ApiModelProperty(value = "需要建议再校准日期（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要建议再校准日期(原检定与校准证书) / 校准委托单中的如需要符合性声明xxx（1/0）", dataType = "Integer")
     private Integer needAdvice;
 
     @TableField("accord_lab")
-    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准(原检定与校准证书)  / 校准委托单中的校准规范（1/0）", dataType = "Integer")
     private Integer accordLab;
 
     @TableField("agree_other")
-    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0） / 校准委托单中的需要建议再校准日期", dataType = "Integer")
     private Integer agreeOther;
 
+    @TableField("time_require")
+    @ApiModelProperty(value = "校准委托单中的时间要求(1常规2加急3特急)", dataType = "Integer")
+    private Integer timeRequire;
+
     @TableField("staff_no")
     @ApiModelProperty(value = "收件人工号（计量人员编号）", dataType = "String")
     private String staffNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
index 57d7906..44f9a33 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
@@ -145,4 +145,8 @@
 
     @TableField(exist = false)
     private int seq;
+
+    //用于判断业务统计单合计行填充
+    @TableField(exist = false)
+    private int settlementType;
 }
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 251adf8..5958534 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
@@ -63,6 +63,10 @@
     @TableField("sign_name")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    @TableField("sign_category")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index 98f5667..9cb4646 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -247,7 +247,7 @@
 //        recordMapper.insert(originalRecord);
 //    }
 
-    private String againCreateCertificateReport(String certificateReportCode) throws Exception {
+    private String againCreateCertificateReport(String certificateReportCode) {
         if (StringUtils.isEmpty(certificateReportCode)) {
             return null;
         }
@@ -269,7 +269,7 @@
         Long maxNo = certificateReportMapper.selectMaxCode(prefix);
         //生成证书编号
         String certificateReportNo = NumberGeneratorUtil.getCode(
-                MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo);
+                MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo, null);
         certificateReport.setApprovalStatus("");
         certificateReport.setId(null);
         certificateReport.setCertificateReportCode(certificateReportNo);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 0a07474..d5c3baa 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -62,6 +62,7 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -362,12 +363,12 @@
             if (!StringUtils.isEmpty(certificateMonitorResponse.getCertificationType())) {
                 DictCodeUtils.convertDictMultiCodeToName(certificateMonitorResponse);
             }
-            //设置证书状态
-            certificateMonitorResponse.setCertificateStatus(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
-                    CertificatePrintStatusEnum.FINISHED : CertificatePrintStatusEnum.UNFINISHED);
             //设置完成时间
             certificateMonitorResponse.setFinishedTime(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
                     certificateMonitorResponse.getFinishedTime() : "");
+            //设置证书状态
+            certificateMonitorResponse.setCertificateStatus(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
+                    CertificatePrintStatusEnum.FINISHED : CertificatePrintStatusEnum.UNFINISHED);
 
             //设置退回次数
             List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode());
@@ -382,7 +383,7 @@
     }
 
     @Override
-    public void exportCertificateFile(BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception {
+    public void exportCertificateFile(BusinessCertificateReport certificateReport, HttpServletResponse response) {
         if (!ObjectUtils.isEmpty(certificateReport.getTemplateId())) {
             //登录用户
             AuthUser user = ShiroKit.getUser();
@@ -614,12 +615,13 @@
     }
 
     private void initCertificateReport(BusinessCertificateReport certificateReport) throws Exception {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date calibrationDate = dateFormat.parse(certificateReport.getCalibrationTime());
         String prefix = MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue()
-                + DateUtil.format(new Date(), "YYYYMMdd");
-//        String prefix = DateUtil.format(new Date(), "YYYYMM");
+                + DateUtil.format(calibrationDate, "YYYYMMdd");
         Long maxNo = this.baseMapper.selectMaxCode(prefix);
         //生成证书编号
-        String certificateReportNo = NumberGeneratorUtil.getCode(MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo);
+        String certificateReportNo = NumberGeneratorUtil.getCode(MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo, DateUtil.format(calibrationDate, "YYYYMMdd"));
         //生成证书名称：证书报告编号+检校专业+证书类别
         DictCodeUtils.convertDictCodeToName(certificateReport);
         String certificateName = certificateReportNo+certificateReport.getCalibrationMajorName()+certificateReport.getCertificateReportCategoryName();
@@ -633,6 +635,7 @@
         certificateReport.setCertificateReportCode(certificateReportNo);
         certificateReport.setCreateTime(DateUtil.formatDateTime(new Date()));
         certificateReport.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+        certificateReport.setIssuanceDate(DateUtil.now());
     }
 
     private MeterStaff getMeterStaffInfo(AuthUser user) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
index f508b66..6f3fe5d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
@@ -116,7 +116,6 @@
     public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) {
         AuthUser authUser = ShiroKit.getUser();
         customerSampleInfo.setUpdateUser(authUser.getId());
-        initSample(customerSampleInfo);
         int updateFlag = this.baseMapper.updateById(customerSampleInfo);
         if (updateFlag > 0) {
             return ReturnUtil.success();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
index 640dbb7..1c1f3e0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
@@ -151,16 +151,39 @@
     }
 
     @Override
-    public void formExport(Long id, int settlementType, HttpServletResponse response) {
-        if (Objects.isNull(id)) {
+    public void formExport(Long id, List<Long> ids, int settlementType, HttpServletResponse response) {
+        if ((1 == settlementType || 2 == settlementType || 3 == settlementType) && Objects.isNull(id)) {
             return;
         }
-        SettlementInfoDetailResponse detail = this.settlementDetail(id);
-        if (Objects.isNull(detail) || CollectionUtils.isEmpty(detail.getSampleDetailsList())) {
+        if (4 == settlementType && CollectionUtils.isEmpty(ids)) {
             return;
         }
-        int sum = detail.getSampleDetailsList().stream().mapToInt(FinanceBusinessSettlementDetails::getSets).sum();
-        detail.setSampleCount(sum);
+        SettlementInfoDetailResponse detail;
+        if (1 == settlementType || 2 == settlementType || 3 == settlementType) {
+            detail = this.settlementDetail(id);
+            if (Objects.isNull(detail) || CollectionUtils.isEmpty(detail.getSampleDetailsList())) {
+                return;
+            }
+            int sum = detail.getSampleDetailsList().stream().mapToInt(FinanceBusinessSettlementDetails::getSets).sum();
+            detail.setSampleCount(sum);
+        } else {
+            detail = settlementInfoMapper.selectDetailById(ids.get(0));
+            List<FinanceBusinessSettlementDetails> sampleList = new ArrayList<>();
+            List<FinanceBusinessSettlementAmountDetails> detailsList = new ArrayList<>();
+            ids.forEach(sid -> {
+                //结算明细
+                QueryWrapper<FinanceBusinessSettlementDetails> wrapper = new QueryWrapper<>();
+                wrapper.eq("settlement_id", sid);
+                sampleList.addAll(detailsService.list(wrapper));
+                //到账金额明细&开票金额明细
+                QueryWrapper<FinanceBusinessSettlementAmountDetails> wrapper1 = new QueryWrapper<>();
+                wrapper1.eq("settlement_id", sid);
+                detailsList.addAll(amountDetailsService.list(wrapper1));
+            });
+            sampleList.get(0).setSettlementType(4);
+            detail.setSampleDetailsList(sampleList);
+            detail.setAmountDetailsList(detailsList);
+        }
         Map<String, Object> map = new HashMap<>();
         map.put("settlementType", String.valueOf(settlementType));
         PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
index a347fdd..c4061e7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl.flowable;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
@@ -283,8 +284,9 @@
 //        Task task = taskService.createTaskQuery().taskId(request.getTaskId()).singleResult();
 
         //只有发起者才能撤回
+        String processId = request.getProcessInstanceId();
         HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
-                .processInstanceId(request.getProcessInstanceId())
+                .processInstanceId(processId)
                 .startedBy(String.valueOf(user.getId()))
                 .or()
                 .unfinished() //审批中的流程才能撤回
@@ -295,6 +297,29 @@
             log.error("该用户无审批中的流程，userId:{}，processInstanceId:{}", user.getId(), request.getProcessInstanceId());
             return ReturnUtil.failed("该用户无审批中的流程");
         }
+        //设置取消状态
+        runtimeService.updateBusinessStatus(processId, ApprovalStatusEnum.CANCELED);
+        List<Task> tasks = taskService.createTaskQuery()
+                .processInstanceId(processId)
+                .active().list();
+        if (CollUtil.isNotEmpty(tasks)) {
+
+            tasks.forEach(task -> {
+                taskService.addComment(task.getId(), task.getProcessInstanceId(), "4", "取消申请");
+            });
+
+            String defKey = tasks.get(0).getTaskDefinitionKey();
+            //驳回至指定节点，现驳回到起始节点
+            HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery()
+                    .processInstanceId(processId)
+                    .orderByHistoricTaskInstanceStartTime()
+                    .asc().list().get(0);
+
+            runtimeService.createChangeActivityStateBuilder()
+                    .processInstanceId(processId)
+                    .moveActivityIdTo(defKey, historicTaskInstance.getTaskDefinitionKey())
+                    .changeState();
+        }
 
         //设置取消状态
         runtimeService.updateBusinessStatus(request.getProcessInstanceId(), ApprovalStatusEnum.CANCELED);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/finance/IFinanceBusinessSettlementInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/finance/IFinanceBusinessSettlementInfoService.java
index c4e5232..cd96251 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/finance/IFinanceBusinessSettlementInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/finance/IFinanceBusinessSettlementInfoService.java
@@ -35,5 +35,5 @@
 
     Integer selectCompleteAmount(String year);
 
-    void formExport(Long id, int settlementType, HttpServletResponse response);
+    void formExport(Long id, List<Long> ids, int settlementType, HttpServletResponse response);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java
index 97660b5..29cf0a4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java
@@ -89,6 +89,14 @@
                 params.put("monthD", calendar.get(Calendar.MONTH) + 1);
                 params.put("dayD", calendar.get(Calendar.DAY_OF_MONTH));
             }
+            if (StringUtils.isNotEmpty(metaData.getExpirationDate())) {
+                params.put("expirationDate", new SimpleDateFormat("yyyy年MM月dd日").format(new SimpleDateFormat("yyyy-MM-dd").parse(metaData.getExpirationDate())));
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(new SimpleDateFormat("yyyy-MM-dd").parse(metaData.getExpirationDate()));
+                params.put("yearE", calendar.get(Calendar.YEAR));
+                params.put("monthE", calendar.get(Calendar.MONTH) + 1);
+                params.put("dayE", calendar.get(Calendar.DAY_OF_MONTH));
+            }
             params.put("calibrationPlace", metaData.getCalibrationPlace());
             params.put("manufacturer", metaData.getManufacturer());
             params.put("measurePerson", metaData.getMeasurePerson());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/finance/SettlementPrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/finance/SettlementPrintFileData.java
index 160460c..cf0ae81 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/finance/SettlementPrintFileData.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/finance/SettlementPrintFileData.java
@@ -9,10 +9,12 @@
 import com.casic.missiles.model.finance.FinanceBusinessSettlementDetails;
 import com.casic.missiles.service.listeners.register.data.PrintFileDataGeneric;
 import com.casic.missiles.service.listeners.register.data.PrintFileDataSupport;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -32,6 +34,8 @@
     private String settlementCooperationTemplateName;
     @Value("${casic.template.settlementCalibration}")
     private String settlementCalibrationTemplateName;
+    @Value("${casic.template.businessStatistic}")
+    private String businessStatisticTemplateName;
 
     @Override
     public FilePrintRegister CustomizedPrintFileRegister(RegisterCustomParameters registerParameters, String templateFileDir) {
@@ -43,8 +47,10 @@
             templateName = getTemplateName(settlementTestTemplateName);
         } else if ("2".equals(registerParameters.getCustomParam().get("settlementType"))) {
             templateName = getTemplateName(settlementCooperationTemplateName);
-        } else {
+        } else if ("3".equals(registerParameters.getCustomParam().get("settlementType"))) {
             templateName = getTemplateName(settlementCalibrationTemplateName);
+        } else {
+            templateName = getTemplateName(businessStatisticTemplateName);
         }
         filePrintRegister = initialization(templateFileDir, metaData.getId(), templateName);
         //关联数据
@@ -84,8 +90,12 @@
                 map.put("sampleName", sampleDetailsList.get(i).getSampleName());
                 map.put("sampleModel", sampleDetailsList.get(i).getSampleModel());
                 map.put("manufacturingNo", sampleDetailsList.get(i).getManufacturingNo());
+                map.put("orderCode", detail.getOrderCode());
                 map.put("sets", sampleDetailsList.get(i).getSets());
-                map.put("orderTime", sampleDetailsList.get(i).getOrderTime());
+                String orderTime = sampleDetailsList.get(i).getOrderTime();
+                if (StringUtils.isNotEmpty(orderTime)) {
+                    map.put("orderTime", orderTime.split(" ")[0]);
+                }
                 map.put("measureContent", sampleDetailsList.get(i).getMeasureContent());
                 map.put("accordStandard", sampleDetailsList.get(i).getAccordStandard());
                 map.put("shouldTestFee", "¥" + sampleDetailsList.get(i).getShouldTestFee());
@@ -98,6 +108,17 @@
                 map.put("certificationCompany", detail.getCertificationCompany());
                 sampleList.add(map);
             }
+            //合计行
+            if (4 == sampleDetailsList.get(0).getSettlementType()) {
+                BigDecimal sum = BigDecimal.ZERO;
+                for (FinanceBusinessSettlementDetails sample : sampleDetailsList) {
+                    sum = sum.add(new BigDecimal(sample.getSubtotal()));
+                }
+                Map<String, Object> map = new HashMap<>();
+                map.put("seq", "合计");
+                map.put("subtotal", "¥" + sum.setScale(2, BigDecimal.ROUND_HALF_UP).stripTrailingZeros());
+                sampleList.add(map);
+            }
         }
         filePrintRegister.getParams().put("sampleList", sampleList);
         return this;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
index 9c47b5d..733a9d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
@@ -26,6 +26,13 @@
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
     private String certificationTypeName;
 
+    @ApiModelProperty(value = "证书类型", dataType = "String")
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificationClassName;
+
     @ApiModelProperty(value = "证书状态", dataType = "String")
     private String certificateStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
index 53184e4..7bf1532 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
@@ -43,6 +43,9 @@
     @ApiModelProperty(value = " 检校类别", dataType = "String")
     private String measureCategory;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    private String certificateReportType;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index bd3467b..3d7c26c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -105,4 +105,18 @@
     @ApiModelProperty(value = "证书报告附件（前端展示为链接，调用minio获取url接口预览）", dataType = "String")
     private String certificateReportFile;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificateReportType;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
+    @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_TYPE)
+    private String certificateReportCategory;
+
+    @ApiModelProperty(value = "证书类别", dataType = "String")
+    private String certificateReportCategoryName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
index 4df9f7a..5f6c3e2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
@@ -45,6 +45,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "样品备注", dataType = "String")
+    private String sampleRemark;
+
     @ApiModelProperty(value = "委托书编号", dataType = "String")
     @ExcelProperty(value = "委托书编号", order = 4)
     private String orderNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
index ee47738..0b4548c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
@@ -3,7 +3,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:
@@ -12,10 +12,12 @@
  */
 @Data
 public class SettlementPrintDTO {
-    @NotNull(message = "主键ID不能为空")
-    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    @ApiModelProperty(value = "主键id(settlementType=1/2/3时必传)", dataType = "Long", required = true)
     private Long id;
 
-    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单", dataType = "int")
+    @ApiModelProperty(value = "主键ids(settlementType=4时必传)", dataType = "Long", required = true)
+    private List<Long> ids;
+
+    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单 / 4业务统计单", dataType = "int")
     private int settlementType;
 }
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 cb9fe38..dcaba8d 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
@@ -49,6 +49,9 @@
     @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
     private String signType;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * minio存储文件名
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
index 3617658..77de29e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
@@ -36,6 +36,9 @@
     @ApiModelProperty(value = "签章/签名编号", dataType = "String")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
index 1669c2f..52be19e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
@@ -56,4 +56,7 @@
 
     @ApiModelProperty(value = "筛选ids", dataType = "List")
     private List<Long> ids;
+
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
index 15c56b4..da31083 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
@@ -79,21 +79,25 @@
     private Integer directReturn;
 
     @TableField("need_accord_declare")
-    @ApiModelProperty(value = "需要符合性声明（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要符合性声明(原检定与校准证书) / 校准委托单中的检定规程（1/0）", dataType = "Integer")
     private Integer needAccordDeclare;
 
     @TableField("need_advice")
-    @ApiModelProperty(value = "需要建议再校准日期（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要建议再校准日期(原检定与校准证书) / 校准委托单中的如需要符合性声明xxx（1/0）", dataType = "Integer")
     private Integer needAdvice;
 
     @TableField("accord_lab")
-    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准(原检定与校准证书)  / 校准委托单中的校准规范（1/0）", dataType = "Integer")
     private Integer accordLab;
 
     @TableField("agree_other")
-    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0） / 校准委托单中的需要建议再校准日期", dataType = "Integer")
     private Integer agreeOther;
 
+    @TableField("time_require")
+    @ApiModelProperty(value = "校准委托单中的时间要求(1常规2加急3特急)", dataType = "Integer")
+    private Integer timeRequire;
+
     @TableField("staff_no")
     @ApiModelProperty(value = "收件人工号（计量人员编号）", dataType = "String")
     private String staffNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
index 57d7906..44f9a33 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
@@ -145,4 +145,8 @@
 
     @TableField(exist = false)
     private int seq;
+
+    //用于判断业务统计单合计行填充
+    @TableField(exist = false)
+    private int settlementType;
 }
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 251adf8..5958534 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
@@ -63,6 +63,10 @@
     @TableField("sign_name")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    @TableField("sign_category")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index 98f5667..9cb4646 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -247,7 +247,7 @@
 //        recordMapper.insert(originalRecord);
 //    }
 
-    private String againCreateCertificateReport(String certificateReportCode) throws Exception {
+    private String againCreateCertificateReport(String certificateReportCode) {
         if (StringUtils.isEmpty(certificateReportCode)) {
             return null;
         }
@@ -269,7 +269,7 @@
         Long maxNo = certificateReportMapper.selectMaxCode(prefix);
         //生成证书编号
         String certificateReportNo = NumberGeneratorUtil.getCode(
-                MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo);
+                MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo, null);
         certificateReport.setApprovalStatus("");
         certificateReport.setId(null);
         certificateReport.setCertificateReportCode(certificateReportNo);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 0a07474..d5c3baa 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -62,6 +62,7 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -362,12 +363,12 @@
             if (!StringUtils.isEmpty(certificateMonitorResponse.getCertificationType())) {
                 DictCodeUtils.convertDictMultiCodeToName(certificateMonitorResponse);
             }
-            //设置证书状态
-            certificateMonitorResponse.setCertificateStatus(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
-                    CertificatePrintStatusEnum.FINISHED : CertificatePrintStatusEnum.UNFINISHED);
             //设置完成时间
             certificateMonitorResponse.setFinishedTime(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
                     certificateMonitorResponse.getFinishedTime() : "");
+            //设置证书状态
+            certificateMonitorResponse.setCertificateStatus(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
+                    CertificatePrintStatusEnum.FINISHED : CertificatePrintStatusEnum.UNFINISHED);
 
             //设置退回次数
             List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode());
@@ -382,7 +383,7 @@
     }
 
     @Override
-    public void exportCertificateFile(BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception {
+    public void exportCertificateFile(BusinessCertificateReport certificateReport, HttpServletResponse response) {
         if (!ObjectUtils.isEmpty(certificateReport.getTemplateId())) {
             //登录用户
             AuthUser user = ShiroKit.getUser();
@@ -614,12 +615,13 @@
     }
 
     private void initCertificateReport(BusinessCertificateReport certificateReport) throws Exception {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date calibrationDate = dateFormat.parse(certificateReport.getCalibrationTime());
         String prefix = MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue()
-                + DateUtil.format(new Date(), "YYYYMMdd");
-//        String prefix = DateUtil.format(new Date(), "YYYYMM");
+                + DateUtil.format(calibrationDate, "YYYYMMdd");
         Long maxNo = this.baseMapper.selectMaxCode(prefix);
         //生成证书编号
-        String certificateReportNo = NumberGeneratorUtil.getCode(MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo);
+        String certificateReportNo = NumberGeneratorUtil.getCode(MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo, DateUtil.format(calibrationDate, "YYYYMMdd"));
         //生成证书名称：证书报告编号+检校专业+证书类别
         DictCodeUtils.convertDictCodeToName(certificateReport);
         String certificateName = certificateReportNo+certificateReport.getCalibrationMajorName()+certificateReport.getCertificateReportCategoryName();
@@ -633,6 +635,7 @@
         certificateReport.setCertificateReportCode(certificateReportNo);
         certificateReport.setCreateTime(DateUtil.formatDateTime(new Date()));
         certificateReport.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+        certificateReport.setIssuanceDate(DateUtil.now());
     }
 
     private MeterStaff getMeterStaffInfo(AuthUser user) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
index f508b66..6f3fe5d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
@@ -116,7 +116,6 @@
     public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) {
         AuthUser authUser = ShiroKit.getUser();
         customerSampleInfo.setUpdateUser(authUser.getId());
-        initSample(customerSampleInfo);
         int updateFlag = this.baseMapper.updateById(customerSampleInfo);
         if (updateFlag > 0) {
             return ReturnUtil.success();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
index 640dbb7..1c1f3e0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
@@ -151,16 +151,39 @@
     }
 
     @Override
-    public void formExport(Long id, int settlementType, HttpServletResponse response) {
-        if (Objects.isNull(id)) {
+    public void formExport(Long id, List<Long> ids, int settlementType, HttpServletResponse response) {
+        if ((1 == settlementType || 2 == settlementType || 3 == settlementType) && Objects.isNull(id)) {
             return;
         }
-        SettlementInfoDetailResponse detail = this.settlementDetail(id);
-        if (Objects.isNull(detail) || CollectionUtils.isEmpty(detail.getSampleDetailsList())) {
+        if (4 == settlementType && CollectionUtils.isEmpty(ids)) {
             return;
         }
-        int sum = detail.getSampleDetailsList().stream().mapToInt(FinanceBusinessSettlementDetails::getSets).sum();
-        detail.setSampleCount(sum);
+        SettlementInfoDetailResponse detail;
+        if (1 == settlementType || 2 == settlementType || 3 == settlementType) {
+            detail = this.settlementDetail(id);
+            if (Objects.isNull(detail) || CollectionUtils.isEmpty(detail.getSampleDetailsList())) {
+                return;
+            }
+            int sum = detail.getSampleDetailsList().stream().mapToInt(FinanceBusinessSettlementDetails::getSets).sum();
+            detail.setSampleCount(sum);
+        } else {
+            detail = settlementInfoMapper.selectDetailById(ids.get(0));
+            List<FinanceBusinessSettlementDetails> sampleList = new ArrayList<>();
+            List<FinanceBusinessSettlementAmountDetails> detailsList = new ArrayList<>();
+            ids.forEach(sid -> {
+                //结算明细
+                QueryWrapper<FinanceBusinessSettlementDetails> wrapper = new QueryWrapper<>();
+                wrapper.eq("settlement_id", sid);
+                sampleList.addAll(detailsService.list(wrapper));
+                //到账金额明细&开票金额明细
+                QueryWrapper<FinanceBusinessSettlementAmountDetails> wrapper1 = new QueryWrapper<>();
+                wrapper1.eq("settlement_id", sid);
+                detailsList.addAll(amountDetailsService.list(wrapper1));
+            });
+            sampleList.get(0).setSettlementType(4);
+            detail.setSampleDetailsList(sampleList);
+            detail.setAmountDetailsList(detailsList);
+        }
         Map<String, Object> map = new HashMap<>();
         map.put("settlementType", String.valueOf(settlementType));
         PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
index a347fdd..c4061e7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl.flowable;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
@@ -283,8 +284,9 @@
 //        Task task = taskService.createTaskQuery().taskId(request.getTaskId()).singleResult();
 
         //只有发起者才能撤回
+        String processId = request.getProcessInstanceId();
         HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
-                .processInstanceId(request.getProcessInstanceId())
+                .processInstanceId(processId)
                 .startedBy(String.valueOf(user.getId()))
                 .or()
                 .unfinished() //审批中的流程才能撤回
@@ -295,6 +297,29 @@
             log.error("该用户无审批中的流程，userId:{}，processInstanceId:{}", user.getId(), request.getProcessInstanceId());
             return ReturnUtil.failed("该用户无审批中的流程");
         }
+        //设置取消状态
+        runtimeService.updateBusinessStatus(processId, ApprovalStatusEnum.CANCELED);
+        List<Task> tasks = taskService.createTaskQuery()
+                .processInstanceId(processId)
+                .active().list();
+        if (CollUtil.isNotEmpty(tasks)) {
+
+            tasks.forEach(task -> {
+                taskService.addComment(task.getId(), task.getProcessInstanceId(), "4", "取消申请");
+            });
+
+            String defKey = tasks.get(0).getTaskDefinitionKey();
+            //驳回至指定节点，现驳回到起始节点
+            HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery()
+                    .processInstanceId(processId)
+                    .orderByHistoricTaskInstanceStartTime()
+                    .asc().list().get(0);
+
+            runtimeService.createChangeActivityStateBuilder()
+                    .processInstanceId(processId)
+                    .moveActivityIdTo(defKey, historicTaskInstance.getTaskDefinitionKey())
+                    .changeState();
+        }
 
         //设置取消状态
         runtimeService.updateBusinessStatus(request.getProcessInstanceId(), ApprovalStatusEnum.CANCELED);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/finance/IFinanceBusinessSettlementInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/finance/IFinanceBusinessSettlementInfoService.java
index c4e5232..cd96251 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/finance/IFinanceBusinessSettlementInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/finance/IFinanceBusinessSettlementInfoService.java
@@ -35,5 +35,5 @@
 
     Integer selectCompleteAmount(String year);
 
-    void formExport(Long id, int settlementType, HttpServletResponse response);
+    void formExport(Long id, List<Long> ids, int settlementType, HttpServletResponse response);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java
index 97660b5..29cf0a4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java
@@ -89,6 +89,14 @@
                 params.put("monthD", calendar.get(Calendar.MONTH) + 1);
                 params.put("dayD", calendar.get(Calendar.DAY_OF_MONTH));
             }
+            if (StringUtils.isNotEmpty(metaData.getExpirationDate())) {
+                params.put("expirationDate", new SimpleDateFormat("yyyy年MM月dd日").format(new SimpleDateFormat("yyyy-MM-dd").parse(metaData.getExpirationDate())));
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(new SimpleDateFormat("yyyy-MM-dd").parse(metaData.getExpirationDate()));
+                params.put("yearE", calendar.get(Calendar.YEAR));
+                params.put("monthE", calendar.get(Calendar.MONTH) + 1);
+                params.put("dayE", calendar.get(Calendar.DAY_OF_MONTH));
+            }
             params.put("calibrationPlace", metaData.getCalibrationPlace());
             params.put("manufacturer", metaData.getManufacturer());
             params.put("measurePerson", metaData.getMeasurePerson());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/finance/SettlementPrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/finance/SettlementPrintFileData.java
index 160460c..cf0ae81 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/finance/SettlementPrintFileData.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/finance/SettlementPrintFileData.java
@@ -9,10 +9,12 @@
 import com.casic.missiles.model.finance.FinanceBusinessSettlementDetails;
 import com.casic.missiles.service.listeners.register.data.PrintFileDataGeneric;
 import com.casic.missiles.service.listeners.register.data.PrintFileDataSupport;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -32,6 +34,8 @@
     private String settlementCooperationTemplateName;
     @Value("${casic.template.settlementCalibration}")
     private String settlementCalibrationTemplateName;
+    @Value("${casic.template.businessStatistic}")
+    private String businessStatisticTemplateName;
 
     @Override
     public FilePrintRegister CustomizedPrintFileRegister(RegisterCustomParameters registerParameters, String templateFileDir) {
@@ -43,8 +47,10 @@
             templateName = getTemplateName(settlementTestTemplateName);
         } else if ("2".equals(registerParameters.getCustomParam().get("settlementType"))) {
             templateName = getTemplateName(settlementCooperationTemplateName);
-        } else {
+        } else if ("3".equals(registerParameters.getCustomParam().get("settlementType"))) {
             templateName = getTemplateName(settlementCalibrationTemplateName);
+        } else {
+            templateName = getTemplateName(businessStatisticTemplateName);
         }
         filePrintRegister = initialization(templateFileDir, metaData.getId(), templateName);
         //关联数据
@@ -84,8 +90,12 @@
                 map.put("sampleName", sampleDetailsList.get(i).getSampleName());
                 map.put("sampleModel", sampleDetailsList.get(i).getSampleModel());
                 map.put("manufacturingNo", sampleDetailsList.get(i).getManufacturingNo());
+                map.put("orderCode", detail.getOrderCode());
                 map.put("sets", sampleDetailsList.get(i).getSets());
-                map.put("orderTime", sampleDetailsList.get(i).getOrderTime());
+                String orderTime = sampleDetailsList.get(i).getOrderTime();
+                if (StringUtils.isNotEmpty(orderTime)) {
+                    map.put("orderTime", orderTime.split(" ")[0]);
+                }
                 map.put("measureContent", sampleDetailsList.get(i).getMeasureContent());
                 map.put("accordStandard", sampleDetailsList.get(i).getAccordStandard());
                 map.put("shouldTestFee", "¥" + sampleDetailsList.get(i).getShouldTestFee());
@@ -98,6 +108,17 @@
                 map.put("certificationCompany", detail.getCertificationCompany());
                 sampleList.add(map);
             }
+            //合计行
+            if (4 == sampleDetailsList.get(0).getSettlementType()) {
+                BigDecimal sum = BigDecimal.ZERO;
+                for (FinanceBusinessSettlementDetails sample : sampleDetailsList) {
+                    sum = sum.add(new BigDecimal(sample.getSubtotal()));
+                }
+                Map<String, Object> map = new HashMap<>();
+                map.put("seq", "合计");
+                map.put("subtotal", "¥" + sum.setScale(2, BigDecimal.ROUND_HALF_UP).stripTrailingZeros());
+                sampleList.add(map);
+            }
         }
         filePrintRegister.getParams().put("sampleList", sampleList);
         return this;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/order/CalibrationOrderPrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/order/CalibrationOrderPrintFileData.java
index ed0b350..bc72e36 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/order/CalibrationOrderPrintFileData.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/order/CalibrationOrderPrintFileData.java
@@ -78,13 +78,17 @@
         map.put("email", metaData.getEmail());
         map.put("requireOverTime", metaData.getRequireOverTime());
         map.put("staffNo", metaData.getStaffNo());
+        map.put("staffName", metaData.getStaffName());
         map.put("receiveDate", metaData.getReceiveDate());
         map.put("type1", "\u25CB");
         map.put("type2", "\u25CB");
-        map.put("type3", "\u25CB");
-        map.put("type4", "\u25CB");
-        map.put("type5", "\u25CB");
-        map.put("type6", "\u25CB");
+        map.put("type3", "\uF0A3");
+        map.put("type4", "\uF0A3");
+        map.put("type5", "\uF0A3");
+        map.put("type6", "\uF0A3");
+        map.put("type7", "\u25CB");
+        map.put("type8", "\u25CB");
+        map.put("type9", "\u25CB");
         if(Objects.nonNull(metaData.getContactReturn()) && 1 == metaData.getContactReturn()){
             map.put("type1", "\u2299");
         }
@@ -92,16 +96,25 @@
             map.put("type2", "\u2299");
         }
         if(Objects.nonNull(metaData.getNeedAccordDeclare()) && 1 == metaData.getNeedAccordDeclare()){
-            map.put("type3", "\u2299");
+            map.put("type3", "\uF052");
         }
         if(Objects.nonNull(metaData.getAccordLab()) && 1 == metaData.getAccordLab()){
-            map.put("type4", "\u2299");
+            map.put("type4", "\uF052");
         }
         if(Objects.nonNull(metaData.getNeedAdvice()) && 1 == metaData.getNeedAdvice()){
-            map.put("type5", "\u2299");
+            map.put("type5", "\uF052");
         }
         if(Objects.nonNull(metaData.getAgreeOther()) && 1 == metaData.getAgreeOther()){
-            map.put("type6", "\u2299");
+            map.put("type6", "\uF052");
+        }
+        if(Objects.nonNull(metaData.getTimeRequire())){
+            if (1 == metaData.getTimeRequire()) {
+                map.put("type7", "\u2299");
+            } else if (2 == metaData.getTimeRequire()) {
+                map.put("type8", "\u2299");
+            } else {
+                map.put("type9", "\u2299");
+            }
         }
         Map<String, Object> params = new HashMap<>();
         params.putAll(map);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 5bbe947..9fe9ec1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -8,15 +8,13 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfoImport;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.model.meter.MeterTraceSupplier;
-import com.casic.missiles.model.meter.MeterTraceSupplierImport;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.ConvertUtils;
 import io.swagger.annotations.Api;
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
index 6265b66..165181e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java
@@ -120,6 +120,6 @@
     @ApiOperation("业务结算单打印（检测项目结算单/合作机构结算单/校准费用结算单）,前端勾选多个每个单独调用接口返回流下载")
     @PostMapping("/form/export")
     public void formExport(@RequestBody @Valid SettlementPrintDTO settlementPrintDTO, HttpServletResponse response) {
-        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getSettlementType(), response);
+        settlementInfoService.formExport(settlementPrintDTO.getId(), settlementPrintDTO.getIds(), settlementPrintDTO.getSettlementType(), response);
     }
 }
diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml
index c80d204..269338e 100644
--- a/casic-metering-api/src/main/resources/config/application-dev.yml
+++ b/casic-metering-api/src/main/resources/config/application-dev.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-api/src/main/resources/config/application-prod.yml b/casic-metering-api/src/main/resources/config/application-prod.yml
index b58b0d3..faf29c5 100644
--- a/casic-metering-api/src/main/resources/config/application-prod.yml
+++ b/casic-metering-api/src/main/resources/config/application-prod.yml
@@ -45,6 +45,7 @@
     settlementTest: "检测项目结算单"
     settlementCooperation: "合作机构结算单"
     settlementCalibration: "校准费用结算单"
+    businessStatistic: "业务统计单"
 
 logging:
   level.root: info
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index da10089..d5596e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
@@ -54,18 +56,20 @@
      * @return
      */
 
-    public static synchronized String getCode(String prefix, long nowNum) {
+    public static synchronized String getCode(String prefix, long nowNum, String datePrefix) {
         StringBuilder builder = new StringBuilder();
         StringBuilder num = new StringBuilder();
         AtomicLong count = new AtomicLong(nowNum);
 
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
-        String datePrefix = format.format(new Date());
+        if (StringUtils.isEmpty(datePrefix)) {
+            SimpleDateFormat format = new SimpleDateFormat("YYYYMMdd");
+            datePrefix = format.format(new Date());
+        }
 
         if(nowNum == 0){
             count = new AtomicLong(0);
             num.append(datePrefix).append("00").append(count.incrementAndGet());
-        }else{
+        } else {
             String s = String.valueOf(nowNum);
             String substring = s.substring(0, s.length() - 3);
             //不是当前日期，从0计算后4位
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index f20235d..350ead7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -162,7 +162,9 @@
         bo.order_code AS orderCode,
         bo.customer_name as customerName,
         ms.name AS measurePersonName,
-        bcr.measure_category AS measureCategory
+        bcr.measure_category AS measureCategory,
+        bcr.certificate_report_type AS certificateReportType,
+        bcr.certificate_report_category AS certificateReportCategory
         FROM business_certificate_report bcr
         LEFT JOIN business_order bo
         ON bcr.order_id=bo.id
@@ -192,6 +194,9 @@
         <if test="request.measureCategory != null and request.measureCategory !=''">
             and bcr.measure_category like concat('%',#{request.measureCategory},'%')
         </if>
+        <if test="request.certificateReportType != null and request.certificateReportType !=''">
+            and bcr.certificate_report_type = #{request.certificateReportType}
+        </if>
 
         <choose>
 
@@ -220,13 +225,14 @@
         bcr.certificate_report_code AS certificateReportCode,
         bcr.certificate_report_name AS certificateReportName,
         bcr.certificate_report_type AS certificationType,
+        bcr.certificate_report_category AS certificationClass,
         bcr.submit_date AS submitTime,
         bcr.update_time AS finishedTime,
         bcr.approval_status AS certificateStatus,
-        ms.NAME AS createUser
+        su.NAME AS createUser
         FROM
         business_certificate_report bcr
-        LEFT JOIN meter_staff ms ON bcr.create_user = ms.id
+        LEFT JOIN sys_user su ON bcr.create_user = su.ID
         WHERE
         bcr.is_del =0
         <if test="request.sampleId != null and request.sampleId !=''">
@@ -238,7 +244,7 @@
         SELECT bcr.id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
         "certificationName", certificate_report_category AS "certificationClass",issuance_date AS
         "effectiveDate",expiration_date AS "expirationDate"
-        FROM business_certificate_report  bcr
+        FROM business_certificate_report bcr
         JOIN (
             select id
             from business_order
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 1b433f8..a27c862 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -31,9 +31,10 @@
 
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
-        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
-        blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
+        blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer,
+        csi.remark AS sampleRemark, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name,
+        bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id, blei.remark, csi.label_bind, blei.remark AS remark, bo.bus_person_id, bo.bus_person_name
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index 7222a6c..e336ea1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -20,6 +20,7 @@
         <result column="need_advice" property="needAdvice" />
         <result column="accord_lab" property="accordLab" />
         <result column="agree_other" property="agreeOther" />
+        <result column="time_require" property="timeRequire" />
         <result column="staff_no" property="staffNo" />
         <result column="staff_name" property="staffName" />
         <result column="receive_date" property="receiveDate" />
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 dd65fb9..bd65306 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectSignDetailById" resultMap="SignDetailResultMap">
-        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
+        SELECT ss.id, ss.sign_no, ss.sign_name, ss.sign_category, ss.sign_desc, ss.sign_director, ss.sign_type, ss.sign_user_id,
         ss.minio_file_name, ss.create_time, ss.update_time, su.ID AS USER_ID, su.ACCOUNT AS ACCOUNT,
         su.NAME AS NAME, su.DEPT_ID AS DEPT_ID
         FROM system_sign ss
@@ -78,6 +78,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
@@ -108,6 +111,9 @@
         <if test="request.signName != null and request.signName !=''">
             AND ss.sign_name LIKE concat('%',#{request.signName},'%')
         </if>
+        <if test="request.signCategory != null and request.signCategory !=''">
+            AND ss.sign_category = #{request.signCategory}
+        </if>
         <if test="request.signDirector != null and request.signDirector !=''">
             AND ss.sign_director LIKE concat('%',#{request.signDirector},'%')
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
index 9c47b5d..733a9d0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateMonitorResponse.java
@@ -26,6 +26,13 @@
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
     private String certificationTypeName;
 
+    @ApiModelProperty(value = "证书类型", dataType = "String")
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificationClassName;
+
     @ApiModelProperty(value = "证书状态", dataType = "String")
     private String certificateStatus;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
index 53184e4..7bf1532 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalRequest.java
@@ -43,6 +43,9 @@
     @ApiModelProperty(value = " 检校类别", dataType = "String")
     private String measureCategory;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    private String certificateReportType;
+
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
index bd3467b..3d7c26c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java
@@ -105,4 +105,18 @@
     @ApiModelProperty(value = "证书报告附件（前端展示为链接，调用minio获取url接口预览）", dataType = "String")
     private String certificateReportFile;
 
+    @ApiModelProperty(value = "证书报告类型", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificateReportType;
+
+    @ApiModelProperty(value = "证书类型名称", dataType = "String")
+    private String certificateReportTypeName;
+
+    @ApiModelProperty(value = "证书类别，多个逗号分割（字典code）", dataType = "String")
+    @DictCodeField(message = "证书报告类型不合法", cacheName = MeterDictCode.CERTIFICATE_TYPE)
+    private String certificateReportCategory;
+
+    @ApiModelProperty(value = "证书类别", dataType = "String")
+    private String certificateReportCategoryName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
index 4df9f7a..5f6c3e2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java
@@ -45,6 +45,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "样品备注", dataType = "String")
+    private String sampleRemark;
+
     @ApiModelProperty(value = "委托书编号", dataType = "String")
     @ExcelProperty(value = "委托书编号", order = 4)
     private String orderNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
index ee47738..0b4548c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementPrintDTO.java
@@ -3,7 +3,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:
@@ -12,10 +12,12 @@
  */
 @Data
 public class SettlementPrintDTO {
-    @NotNull(message = "主键ID不能为空")
-    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    @ApiModelProperty(value = "主键id(settlementType=1/2/3时必传)", dataType = "Long", required = true)
     private Long id;
 
-    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单", dataType = "int")
+    @ApiModelProperty(value = "主键ids(settlementType=4时必传)", dataType = "Long", required = true)
+    private List<Long> ids;
+
+    @ApiModelProperty(value = "1检测项目结算单/2合作机构结算单/3校准费用结算单 / 4业务统计单", dataType = "int")
     private int settlementType;
 }
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 cb9fe38..dcaba8d 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
@@ -49,6 +49,9 @@
     @ApiModelProperty(value = "签名/签章-字典code", dataType = "String", required = true)
     private String signType;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * minio存储文件名
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
index 3617658..77de29e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java
@@ -36,6 +36,9 @@
     @ApiModelProperty(value = "签章/签名编号", dataType = "String")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
index 1669c2f..52be19e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java
@@ -56,4 +56,7 @@
 
     @ApiModelProperty(value = "筛选ids", dataType = "List")
     private List<Long> ids;
+
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    private String signCategory;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
index 15c56b4..da31083 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java
@@ -79,21 +79,25 @@
     private Integer directReturn;
 
     @TableField("need_accord_declare")
-    @ApiModelProperty(value = "需要符合性声明（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要符合性声明(原检定与校准证书) / 校准委托单中的检定规程（1/0）", dataType = "Integer")
     private Integer needAccordDeclare;
 
     @TableField("need_advice")
-    @ApiModelProperty(value = "需要建议再校准日期（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "需要建议再校准日期(原检定与校准证书) / 校准委托单中的如需要符合性声明xxx（1/0）", dataType = "Integer")
     private Integer needAdvice;
 
     @TableField("accord_lab")
-    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如无相应检定规程/校准规范，可按本实验室的方法进行校准(原检定与校准证书)  / 校准委托单中的校准规范（1/0）", dataType = "Integer")
     private Integer accordLab;
 
     @TableField("agree_other")
-    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0）", dataType = "Integer")
+    @ApiModelProperty(value = "如不能出具所选证书类型，同意受托方出具其他类型证书（1/0） / 校准委托单中的需要建议再校准日期", dataType = "Integer")
     private Integer agreeOther;
 
+    @TableField("time_require")
+    @ApiModelProperty(value = "校准委托单中的时间要求(1常规2加急3特急)", dataType = "Integer")
+    private Integer timeRequire;
+
     @TableField("staff_no")
     @ApiModelProperty(value = "收件人工号（计量人员编号）", dataType = "String")
     private String staffNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
index 57d7906..44f9a33 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceBusinessSettlementDetails.java
@@ -145,4 +145,8 @@
 
     @TableField(exist = false)
     private int seq;
+
+    //用于判断业务统计单合计行填充
+    @TableField(exist = false)
+    private int settlementType;
 }
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 251adf8..5958534 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
@@ -63,6 +63,10 @@
     @TableField("sign_name")
     private String signName;
 
+    @ApiModelProperty(value = "签章类别(1证书用章2认可专用章3文件用章)", dataType = "String")
+    @TableField("sign_category")
+    private String signCategory;
+
     /**
      * 签章/签名描述
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index 98f5667..9cb4646 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -247,7 +247,7 @@
 //        recordMapper.insert(originalRecord);
 //    }
 
-    private String againCreateCertificateReport(String certificateReportCode) throws Exception {
+    private String againCreateCertificateReport(String certificateReportCode) {
         if (StringUtils.isEmpty(certificateReportCode)) {
             return null;
         }
@@ -269,7 +269,7 @@
         Long maxNo = certificateReportMapper.selectMaxCode(prefix);
         //生成证书编号
         String certificateReportNo = NumberGeneratorUtil.getCode(
-                MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo);
+                MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo, null);
         certificateReport.setApprovalStatus("");
         certificateReport.setId(null);
         certificateReport.setCertificateReportCode(certificateReportNo);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 0a07474..d5c3baa 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -62,6 +62,7 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -362,12 +363,12 @@
             if (!StringUtils.isEmpty(certificateMonitorResponse.getCertificationType())) {
                 DictCodeUtils.convertDictMultiCodeToName(certificateMonitorResponse);
             }
-            //设置证书状态
-            certificateMonitorResponse.setCertificateStatus(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
-                    CertificatePrintStatusEnum.FINISHED : CertificatePrintStatusEnum.UNFINISHED);
             //设置完成时间
             certificateMonitorResponse.setFinishedTime(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
                     certificateMonitorResponse.getFinishedTime() : "");
+            //设置证书状态
+            certificateMonitorResponse.setCertificateStatus(ApprovalStatusEnum.PASSED.equals(certificateMonitorResponse.getCertificateStatus()) ?
+                    CertificatePrintStatusEnum.FINISHED : CertificatePrintStatusEnum.UNFINISHED);
 
             //设置退回次数
             List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode());
@@ -382,7 +383,7 @@
     }
 
     @Override
-    public void exportCertificateFile(BusinessCertificateReport certificateReport, HttpServletResponse response) throws Exception {
+    public void exportCertificateFile(BusinessCertificateReport certificateReport, HttpServletResponse response) {
         if (!ObjectUtils.isEmpty(certificateReport.getTemplateId())) {
             //登录用户
             AuthUser user = ShiroKit.getUser();
@@ -614,12 +615,13 @@
     }
 
     private void initCertificateReport(BusinessCertificateReport certificateReport) throws Exception {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date calibrationDate = dateFormat.parse(certificateReport.getCalibrationTime());
         String prefix = MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue()
-                + DateUtil.format(new Date(), "YYYYMMdd");
-//        String prefix = DateUtil.format(new Date(), "YYYYMM");
+                + DateUtil.format(calibrationDate, "YYYYMMdd");
         Long maxNo = this.baseMapper.selectMaxCode(prefix);
         //生成证书编号
-        String certificateReportNo = NumberGeneratorUtil.getCode(MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo);
+        String certificateReportNo = NumberGeneratorUtil.getCode(MonitorCodeEnum.getByCode(certificateReport.getCalibrationMajor()).getValue(), maxNo, DateUtil.format(calibrationDate, "YYYYMMdd"));
         //生成证书名称：证书报告编号+检校专业+证书类别
         DictCodeUtils.convertDictCodeToName(certificateReport);
         String certificateName = certificateReportNo+certificateReport.getCalibrationMajorName()+certificateReport.getCertificateReportCategoryName();
@@ -633,6 +635,7 @@
         certificateReport.setCertificateReportCode(certificateReportNo);
         certificateReport.setCreateTime(DateUtil.formatDateTime(new Date()));
         certificateReport.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+        certificateReport.setIssuanceDate(DateUtil.now());
     }
 
     private MeterStaff getMeterStaffInfo(AuthUser user) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
index f508b66..6f3fe5d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
@@ -116,7 +116,6 @@
     public ReturnDTO updateSample(CustomerSampleInfo customerSampleInfo) {
         AuthUser authUser = ShiroKit.getUser();
         customerSampleInfo.setUpdateUser(authUser.getId());
-        initSample(customerSampleInfo);
         int updateFlag = this.baseMapper.updateById(customerSampleInfo);
         if (updateFlag > 0) {
             return ReturnUtil.success();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
index 640dbb7..1c1f3e0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/finance/FinanceBusinessSettlementInfoServiceImpl.java
@@ -151,16 +151,39 @@
     }
 
     @Override
-    public void formExport(Long id, int settlementType, HttpServletResponse response) {
-        if (Objects.isNull(id)) {
+    public void formExport(Long id, List<Long> ids, int settlementType, HttpServletResponse response) {
+        if ((1 == settlementType || 2 == settlementType || 3 == settlementType) && Objects.isNull(id)) {
             return;
         }
-        SettlementInfoDetailResponse detail = this.settlementDetail(id);
-        if (Objects.isNull(detail) || CollectionUtils.isEmpty(detail.getSampleDetailsList())) {
+        if (4 == settlementType && CollectionUtils.isEmpty(ids)) {
             return;
         }
-        int sum = detail.getSampleDetailsList().stream().mapToInt(FinanceBusinessSettlementDetails::getSets).sum();
-        detail.setSampleCount(sum);
+        SettlementInfoDetailResponse detail;
+        if (1 == settlementType || 2 == settlementType || 3 == settlementType) {
+            detail = this.settlementDetail(id);
+            if (Objects.isNull(detail) || CollectionUtils.isEmpty(detail.getSampleDetailsList())) {
+                return;
+            }
+            int sum = detail.getSampleDetailsList().stream().mapToInt(FinanceBusinessSettlementDetails::getSets).sum();
+            detail.setSampleCount(sum);
+        } else {
+            detail = settlementInfoMapper.selectDetailById(ids.get(0));
+            List<FinanceBusinessSettlementDetails> sampleList = new ArrayList<>();
+            List<FinanceBusinessSettlementAmountDetails> detailsList = new ArrayList<>();
+            ids.forEach(sid -> {
+                //结算明细
+                QueryWrapper<FinanceBusinessSettlementDetails> wrapper = new QueryWrapper<>();
+                wrapper.eq("settlement_id", sid);
+                sampleList.addAll(detailsService.list(wrapper));
+                //到账金额明细&开票金额明细
+                QueryWrapper<FinanceBusinessSettlementAmountDetails> wrapper1 = new QueryWrapper<>();
+                wrapper1.eq("settlement_id", sid);
+                detailsList.addAll(amountDetailsService.list(wrapper1));
+            });
+            sampleList.get(0).setSettlementType(4);
+            detail.setSampleDetailsList(sampleList);
+            detail.setAmountDetailsList(detailsList);
+        }
         Map<String, Object> map = new HashMap<>();
         map.put("settlementType", String.valueOf(settlementType));
         PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
index a347fdd..c4061e7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl.flowable;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
@@ -283,8 +284,9 @@
 //        Task task = taskService.createTaskQuery().taskId(request.getTaskId()).singleResult();
 
         //只有发起者才能撤回
+        String processId = request.getProcessInstanceId();
         HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
-                .processInstanceId(request.getProcessInstanceId())
+                .processInstanceId(processId)
                 .startedBy(String.valueOf(user.getId()))
                 .or()
                 .unfinished() //审批中的流程才能撤回
@@ -295,6 +297,29 @@
             log.error("该用户无审批中的流程，userId:{}，processInstanceId:{}", user.getId(), request.getProcessInstanceId());
             return ReturnUtil.failed("该用户无审批中的流程");
         }
+        //设置取消状态
+        runtimeService.updateBusinessStatus(processId, ApprovalStatusEnum.CANCELED);
+        List<Task> tasks = taskService.createTaskQuery()
+                .processInstanceId(processId)
+                .active().list();
+        if (CollUtil.isNotEmpty(tasks)) {
+
+            tasks.forEach(task -> {
+                taskService.addComment(task.getId(), task.getProcessInstanceId(), "4", "取消申请");
+            });
+
+            String defKey = tasks.get(0).getTaskDefinitionKey();
+            //驳回至指定节点，现驳回到起始节点
+            HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery()
+                    .processInstanceId(processId)
+                    .orderByHistoricTaskInstanceStartTime()
+                    .asc().list().get(0);
+
+            runtimeService.createChangeActivityStateBuilder()
+                    .processInstanceId(processId)
+                    .moveActivityIdTo(defKey, historicTaskInstance.getTaskDefinitionKey())
+                    .changeState();
+        }
 
         //设置取消状态
         runtimeService.updateBusinessStatus(request.getProcessInstanceId(), ApprovalStatusEnum.CANCELED);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/finance/IFinanceBusinessSettlementInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/finance/IFinanceBusinessSettlementInfoService.java
index c4e5232..cd96251 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/finance/IFinanceBusinessSettlementInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/finance/IFinanceBusinessSettlementInfoService.java
@@ -35,5 +35,5 @@
 
     Integer selectCompleteAmount(String year);
 
-    void formExport(Long id, int settlementType, HttpServletResponse response);
+    void formExport(Long id, List<Long> ids, int settlementType, HttpServletResponse response);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java
index 97660b5..29cf0a4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java
@@ -89,6 +89,14 @@
                 params.put("monthD", calendar.get(Calendar.MONTH) + 1);
                 params.put("dayD", calendar.get(Calendar.DAY_OF_MONTH));
             }
+            if (StringUtils.isNotEmpty(metaData.getExpirationDate())) {
+                params.put("expirationDate", new SimpleDateFormat("yyyy年MM月dd日").format(new SimpleDateFormat("yyyy-MM-dd").parse(metaData.getExpirationDate())));
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(new SimpleDateFormat("yyyy-MM-dd").parse(metaData.getExpirationDate()));
+                params.put("yearE", calendar.get(Calendar.YEAR));
+                params.put("monthE", calendar.get(Calendar.MONTH) + 1);
+                params.put("dayE", calendar.get(Calendar.DAY_OF_MONTH));
+            }
             params.put("calibrationPlace", metaData.getCalibrationPlace());
             params.put("manufacturer", metaData.getManufacturer());
             params.put("measurePerson", metaData.getMeasurePerson());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/finance/SettlementPrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/finance/SettlementPrintFileData.java
index 160460c..cf0ae81 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/finance/SettlementPrintFileData.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/finance/SettlementPrintFileData.java
@@ -9,10 +9,12 @@
 import com.casic.missiles.model.finance.FinanceBusinessSettlementDetails;
 import com.casic.missiles.service.listeners.register.data.PrintFileDataGeneric;
 import com.casic.missiles.service.listeners.register.data.PrintFileDataSupport;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -32,6 +34,8 @@
     private String settlementCooperationTemplateName;
     @Value("${casic.template.settlementCalibration}")
     private String settlementCalibrationTemplateName;
+    @Value("${casic.template.businessStatistic}")
+    private String businessStatisticTemplateName;
 
     @Override
     public FilePrintRegister CustomizedPrintFileRegister(RegisterCustomParameters registerParameters, String templateFileDir) {
@@ -43,8 +47,10 @@
             templateName = getTemplateName(settlementTestTemplateName);
         } else if ("2".equals(registerParameters.getCustomParam().get("settlementType"))) {
             templateName = getTemplateName(settlementCooperationTemplateName);
-        } else {
+        } else if ("3".equals(registerParameters.getCustomParam().get("settlementType"))) {
             templateName = getTemplateName(settlementCalibrationTemplateName);
+        } else {
+            templateName = getTemplateName(businessStatisticTemplateName);
         }
         filePrintRegister = initialization(templateFileDir, metaData.getId(), templateName);
         //关联数据
@@ -84,8 +90,12 @@
                 map.put("sampleName", sampleDetailsList.get(i).getSampleName());
                 map.put("sampleModel", sampleDetailsList.get(i).getSampleModel());
                 map.put("manufacturingNo", sampleDetailsList.get(i).getManufacturingNo());
+                map.put("orderCode", detail.getOrderCode());
                 map.put("sets", sampleDetailsList.get(i).getSets());
-                map.put("orderTime", sampleDetailsList.get(i).getOrderTime());
+                String orderTime = sampleDetailsList.get(i).getOrderTime();
+                if (StringUtils.isNotEmpty(orderTime)) {
+                    map.put("orderTime", orderTime.split(" ")[0]);
+                }
                 map.put("measureContent", sampleDetailsList.get(i).getMeasureContent());
                 map.put("accordStandard", sampleDetailsList.get(i).getAccordStandard());
                 map.put("shouldTestFee", "¥" + sampleDetailsList.get(i).getShouldTestFee());
@@ -98,6 +108,17 @@
                 map.put("certificationCompany", detail.getCertificationCompany());
                 sampleList.add(map);
             }
+            //合计行
+            if (4 == sampleDetailsList.get(0).getSettlementType()) {
+                BigDecimal sum = BigDecimal.ZERO;
+                for (FinanceBusinessSettlementDetails sample : sampleDetailsList) {
+                    sum = sum.add(new BigDecimal(sample.getSubtotal()));
+                }
+                Map<String, Object> map = new HashMap<>();
+                map.put("seq", "合计");
+                map.put("subtotal", "¥" + sum.setScale(2, BigDecimal.ROUND_HALF_UP).stripTrailingZeros());
+                sampleList.add(map);
+            }
         }
         filePrintRegister.getParams().put("sampleList", sampleList);
         return this;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/order/CalibrationOrderPrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/order/CalibrationOrderPrintFileData.java
index ed0b350..bc72e36 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/order/CalibrationOrderPrintFileData.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/order/CalibrationOrderPrintFileData.java
@@ -78,13 +78,17 @@
         map.put("email", metaData.getEmail());
         map.put("requireOverTime", metaData.getRequireOverTime());
         map.put("staffNo", metaData.getStaffNo());
+        map.put("staffName", metaData.getStaffName());
         map.put("receiveDate", metaData.getReceiveDate());
         map.put("type1", "\u25CB");
         map.put("type2", "\u25CB");
-        map.put("type3", "\u25CB");
-        map.put("type4", "\u25CB");
-        map.put("type5", "\u25CB");
-        map.put("type6", "\u25CB");
+        map.put("type3", "\uF0A3");
+        map.put("type4", "\uF0A3");
+        map.put("type5", "\uF0A3");
+        map.put("type6", "\uF0A3");
+        map.put("type7", "\u25CB");
+        map.put("type8", "\u25CB");
+        map.put("type9", "\u25CB");
         if(Objects.nonNull(metaData.getContactReturn()) && 1 == metaData.getContactReturn()){
             map.put("type1", "\u2299");
         }
@@ -92,16 +96,25 @@
             map.put("type2", "\u2299");
         }
         if(Objects.nonNull(metaData.getNeedAccordDeclare()) && 1 == metaData.getNeedAccordDeclare()){
-            map.put("type3", "\u2299");
+            map.put("type3", "\uF052");
         }
         if(Objects.nonNull(metaData.getAccordLab()) && 1 == metaData.getAccordLab()){
-            map.put("type4", "\u2299");
+            map.put("type4", "\uF052");
         }
         if(Objects.nonNull(metaData.getNeedAdvice()) && 1 == metaData.getNeedAdvice()){
-            map.put("type5", "\u2299");
+            map.put("type5", "\uF052");
         }
         if(Objects.nonNull(metaData.getAgreeOther()) && 1 == metaData.getAgreeOther()){
-            map.put("type6", "\u2299");
+            map.put("type6", "\uF052");
+        }
+        if(Objects.nonNull(metaData.getTimeRequire())){
+            if (1 == metaData.getTimeRequire()) {
+                map.put("type7", "\u2299");
+            } else if (2 == metaData.getTimeRequire()) {
+                map.put("type8", "\u2299");
+            } else {
+                map.put("type9", "\u2299");
+            }
         }
         Map<String, Object> params = new HashMap<>();
         params.putAll(map);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ExcelPrintUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ExcelPrintUtils.java
index 45a807b..4425de8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ExcelPrintUtils.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ExcelPrintUtils.java
@@ -63,7 +63,7 @@
      */
     private static String exportParam(String tempLocalFileDir, FilePrintRegister filePrintRegister, String customFileName) {
         // 加载模板
-        customFileName = StringUtils.isNotEmpty(customFileName) ? customFileName + ".xls" : filePrintRegister.getFileName();
+        customFileName = StringUtils.isNotEmpty(customFileName) ? customFileName + ".xlsx" : filePrintRegister.getFileName();
         TemplateExportParams params = new TemplateExportParams(tempLocalFileDir + filePrintRegister.getFileName());
         //添加sheet三页的打印
         Map<Integer, List<Map<String, Object>>> sheetsMap = new HashMap<>();