diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
index b13ce50..56a707f 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
@@ -90,7 +90,7 @@
         WHERE template_name= #{templateName}
         AND   template_type= #{coverModuleName}
         <if test="descn != null and descn!=''">
-            AND   template_desc =#{descn}
+            AND   template_desc like concat('%',#{descn},'%')
         </if>
 
     </select>

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
index b13ce50..56a707f 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
@@ -90,7 +90,7 @@
         WHERE template_name= #{templateName}
         AND   template_type= #{coverModuleName}
         <if test="descn != null and descn!=''">
-            AND   template_desc =#{descn}
+            AND   template_desc like concat('%',#{descn},'%')
         </if>
 
     </select>
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
index b17b574..871ddd6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.service.Impl.eqpt;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -12,30 +10,21 @@
 import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval;
-import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator;
-import com.casic.missiles.model.equipment.BizEquipmentInfo;
-import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator;
 import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval;
 import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint;
 import com.casic.missiles.service.listeners.register.PrintFileRegister;
-import com.casic.missiles.utils.SnowflakeUtil;
 import com.casic.missiles.utils.SpringContextUtil;
-import com.gexin.fastjson.JSON;
-import liquibase.pro.packaged.A;
-import liquibase.pro.packaged.M;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.docx4j.wml.R;
 import org.springframework.stereotype.Component;
 
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
+
 
 /**
  * 通用的装置数据提供器
@@ -50,9 +39,6 @@
 
     private final PrintFileRegister printFileRegister;
 
-    private static ThreadPoolExecutor threadPool = new ThreadPoolExecutor(4, 10, 100,
-            TimeUnit.SECONDS, new LinkedBlockingQueue<>(10));
-
     /**
      * 核查记录生成更新证书的任务
      */
@@ -61,6 +47,7 @@
         if (ObjectUtils.isEmpty(request) || StringUtils.isEmpty(request.getBelongStandardEquipment())) {
             throw new BusinessException(BusinessExceptionEnum.MEASURE_STANDARD_IS_NULL);
         }
+        log.info("check data  is  check,please  wait  ...");
         //生成核查记录单
         StandardEquipmentPrint standardEquipmentPrint = SpringContextUtil.getBean(request.getBelongStandardEquipment());
         List<String> checkCertificateFileList = standardEquipmentPrint.doCheckCertificateFile(request);
@@ -89,6 +76,9 @@
      * @param oldCertificateFile
      */
     public void excuteMeasureTaskAsyn(Map<String, Object> map, Long id, String oldCertificateFile) {
+       ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100,
+                TimeUnit.SECONDS, new LinkedBlockingQueue<>(2));
+       log.info("measure data  is  check,please  wait  ...");
         List<String> customTemplateUrls = new ArrayList<>();
         customTemplateUrls.add(oldCertificateFile);
         //生成证书报告的,需要改变为动态选择性
@@ -126,6 +116,8 @@
     public void excuteCheckTaskAsyn(Map<String, Object> map, Long id, String oldCertificateFile) {
         List<String> customTemplateUrls = new ArrayList<>();
         customTemplateUrls.add(oldCertificateFile);
+        ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100,
+                TimeUnit.SECONDS, new LinkedBlockingQueue<>(2));
         //生成证书报告的
         CompletableFuture<String> certificateFutureTask = CompletableFuture.supplyAsync(
                 () -> printFileRegister.registerPrintFile(MULTIFUNCTION_CHECK_DATA, "数据打印", null, map, true, null, customTemplateUrls), threadPool);
@@ -155,6 +147,8 @@
      * 生成更新证书的任务
      */
     public void measureCertificateTask(BizBusinessDeviceMeasureApproval request) {
+        ThreadPoolExecutor threadPool = new ThreadPoolExecutor(2, 2, 100,
+                TimeUnit.SECONDS, new LinkedBlockingQueue<>(2));
         StandardEquipmentPrint equipmentPrint = getStandardEquipmentPrint(request);
         log.info("---111111111");
         //生成证书报告的
@@ -172,7 +166,7 @@
                 List<String> certificateFileUrl = certificateFutureTask.join();
                 String originalRecordFileUrl = originalFutureTask.join();
                 BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class);
-                log.info("----------------获取生成的数据结果");
+                log.info("----------------get result orign is {},certificate is {}",originalRecordFileUrl,certificateFileUrl);
                 if (CollectionUtils.isNotEmpty(certificateFileUrl) || StringUtils.isNotEmpty(originalRecordFileUrl)) {
                     //生成证书文件
                     if (CollectionUtils.isNotEmpty(certificateFileUrl)) {
@@ -192,6 +186,7 @@
                     throw new BusinessException(BusinessExceptionEnum.MEASURE_FILE_CREATE_FAILED);
                 }
             } catch (Exception ex) {
+                log.info("---- data  is  exception， this  is  {}", ex);
                 throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_GET_FAILED);
             }
         }).join();

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
index b13ce50..56a707f 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
@@ -90,7 +90,7 @@
         WHERE template_name= #{templateName}
         AND   template_type= #{coverModuleName}
         <if test="descn != null and descn!=''">
-            AND   template_desc =#{descn}
+            AND   template_desc like concat('%',#{descn},'%')
         </if>
 
     </select>
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
index b17b574..871ddd6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.service.Impl.eqpt;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -12,30 +10,21 @@
 import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval;
-import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator;
-import com.casic.missiles.model.equipment.BizEquipmentInfo;
-import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator;
 import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval;
 import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint;
 import com.casic.missiles.service.listeners.register.PrintFileRegister;
-import com.casic.missiles.utils.SnowflakeUtil;
 import com.casic.missiles.utils.SpringContextUtil;
-import com.gexin.fastjson.JSON;
-import liquibase.pro.packaged.A;
-import liquibase.pro.packaged.M;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.docx4j.wml.R;
 import org.springframework.stereotype.Component;
 
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
+
 
 /**
  * 通用的装置数据提供器
@@ -50,9 +39,6 @@
 
     private final PrintFileRegister printFileRegister;
 
-    private static ThreadPoolExecutor threadPool = new ThreadPoolExecutor(4, 10, 100,
-            TimeUnit.SECONDS, new LinkedBlockingQueue<>(10));
-
     /**
      * 核查记录生成更新证书的任务
      */
@@ -61,6 +47,7 @@
         if (ObjectUtils.isEmpty(request) || StringUtils.isEmpty(request.getBelongStandardEquipment())) {
             throw new BusinessException(BusinessExceptionEnum.MEASURE_STANDARD_IS_NULL);
         }
+        log.info("check data  is  check,please  wait  ...");
         //生成核查记录单
         StandardEquipmentPrint standardEquipmentPrint = SpringContextUtil.getBean(request.getBelongStandardEquipment());
         List<String> checkCertificateFileList = standardEquipmentPrint.doCheckCertificateFile(request);
@@ -89,6 +76,9 @@
      * @param oldCertificateFile
      */
     public void excuteMeasureTaskAsyn(Map<String, Object> map, Long id, String oldCertificateFile) {
+       ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100,
+                TimeUnit.SECONDS, new LinkedBlockingQueue<>(2));
+       log.info("measure data  is  check,please  wait  ...");
         List<String> customTemplateUrls = new ArrayList<>();
         customTemplateUrls.add(oldCertificateFile);
         //生成证书报告的,需要改变为动态选择性
@@ -126,6 +116,8 @@
     public void excuteCheckTaskAsyn(Map<String, Object> map, Long id, String oldCertificateFile) {
         List<String> customTemplateUrls = new ArrayList<>();
         customTemplateUrls.add(oldCertificateFile);
+        ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100,
+                TimeUnit.SECONDS, new LinkedBlockingQueue<>(2));
         //生成证书报告的
         CompletableFuture<String> certificateFutureTask = CompletableFuture.supplyAsync(
                 () -> printFileRegister.registerPrintFile(MULTIFUNCTION_CHECK_DATA, "数据打印", null, map, true, null, customTemplateUrls), threadPool);
@@ -155,6 +147,8 @@
      * 生成更新证书的任务
      */
     public void measureCertificateTask(BizBusinessDeviceMeasureApproval request) {
+        ThreadPoolExecutor threadPool = new ThreadPoolExecutor(2, 2, 100,
+                TimeUnit.SECONDS, new LinkedBlockingQueue<>(2));
         StandardEquipmentPrint equipmentPrint = getStandardEquipmentPrint(request);
         log.info("---111111111");
         //生成证书报告的
@@ -172,7 +166,7 @@
                 List<String> certificateFileUrl = certificateFutureTask.join();
                 String originalRecordFileUrl = originalFutureTask.join();
                 BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class);
-                log.info("----------------获取生成的数据结果");
+                log.info("----------------get result orign is {},certificate is {}",originalRecordFileUrl,certificateFileUrl);
                 if (CollectionUtils.isNotEmpty(certificateFileUrl) || StringUtils.isNotEmpty(originalRecordFileUrl)) {
                     //生成证书文件
                     if (CollectionUtils.isNotEmpty(certificateFileUrl)) {
@@ -192,6 +186,7 @@
                     throw new BusinessException(BusinessExceptionEnum.MEASURE_FILE_CREATE_FAILED);
                 }
             } catch (Exception ex) {
+                log.info("---- data  is  exception， this  is  {}", ex);
                 throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_GET_FAILED);
             }
         }).join();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java
index a7a12ad..81469e2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java
@@ -96,6 +96,7 @@
             }
             return urlList;
         } catch (Exception ex) {
+            log.info("-----package  data  is  exception， this  is  {}", ex);
             throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED);
         }
     }

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
index b13ce50..56a707f 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
@@ -90,7 +90,7 @@
         WHERE template_name= #{templateName}
         AND   template_type= #{coverModuleName}
         <if test="descn != null and descn!=''">
-            AND   template_desc =#{descn}
+            AND   template_desc like concat('%',#{descn},'%')
         </if>
 
     </select>
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
index b17b574..871ddd6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.service.Impl.eqpt;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -12,30 +10,21 @@
 import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval;
-import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator;
-import com.casic.missiles.model.equipment.BizEquipmentInfo;
-import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator;
 import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval;
 import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint;
 import com.casic.missiles.service.listeners.register.PrintFileRegister;
-import com.casic.missiles.utils.SnowflakeUtil;
 import com.casic.missiles.utils.SpringContextUtil;
-import com.gexin.fastjson.JSON;
-import liquibase.pro.packaged.A;
-import liquibase.pro.packaged.M;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.docx4j.wml.R;
 import org.springframework.stereotype.Component;
 
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
+
 
 /**
  * 通用的装置数据提供器
@@ -50,9 +39,6 @@
 
     private final PrintFileRegister printFileRegister;
 
-    private static ThreadPoolExecutor threadPool = new ThreadPoolExecutor(4, 10, 100,
-            TimeUnit.SECONDS, new LinkedBlockingQueue<>(10));
-
     /**
      * 核查记录生成更新证书的任务
      */
@@ -61,6 +47,7 @@
         if (ObjectUtils.isEmpty(request) || StringUtils.isEmpty(request.getBelongStandardEquipment())) {
             throw new BusinessException(BusinessExceptionEnum.MEASURE_STANDARD_IS_NULL);
         }
+        log.info("check data  is  check,please  wait  ...");
         //生成核查记录单
         StandardEquipmentPrint standardEquipmentPrint = SpringContextUtil.getBean(request.getBelongStandardEquipment());
         List<String> checkCertificateFileList = standardEquipmentPrint.doCheckCertificateFile(request);
@@ -89,6 +76,9 @@
      * @param oldCertificateFile
      */
     public void excuteMeasureTaskAsyn(Map<String, Object> map, Long id, String oldCertificateFile) {
+       ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100,
+                TimeUnit.SECONDS, new LinkedBlockingQueue<>(2));
+       log.info("measure data  is  check,please  wait  ...");
         List<String> customTemplateUrls = new ArrayList<>();
         customTemplateUrls.add(oldCertificateFile);
         //生成证书报告的,需要改变为动态选择性
@@ -126,6 +116,8 @@
     public void excuteCheckTaskAsyn(Map<String, Object> map, Long id, String oldCertificateFile) {
         List<String> customTemplateUrls = new ArrayList<>();
         customTemplateUrls.add(oldCertificateFile);
+        ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100,
+                TimeUnit.SECONDS, new LinkedBlockingQueue<>(2));
         //生成证书报告的
         CompletableFuture<String> certificateFutureTask = CompletableFuture.supplyAsync(
                 () -> printFileRegister.registerPrintFile(MULTIFUNCTION_CHECK_DATA, "数据打印", null, map, true, null, customTemplateUrls), threadPool);
@@ -155,6 +147,8 @@
      * 生成更新证书的任务
      */
     public void measureCertificateTask(BizBusinessDeviceMeasureApproval request) {
+        ThreadPoolExecutor threadPool = new ThreadPoolExecutor(2, 2, 100,
+                TimeUnit.SECONDS, new LinkedBlockingQueue<>(2));
         StandardEquipmentPrint equipmentPrint = getStandardEquipmentPrint(request);
         log.info("---111111111");
         //生成证书报告的
@@ -172,7 +166,7 @@
                 List<String> certificateFileUrl = certificateFutureTask.join();
                 String originalRecordFileUrl = originalFutureTask.join();
                 BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class);
-                log.info("----------------获取生成的数据结果");
+                log.info("----------------get result orign is {},certificate is {}",originalRecordFileUrl,certificateFileUrl);
                 if (CollectionUtils.isNotEmpty(certificateFileUrl) || StringUtils.isNotEmpty(originalRecordFileUrl)) {
                     //生成证书文件
                     if (CollectionUtils.isNotEmpty(certificateFileUrl)) {
@@ -192,6 +186,7 @@
                     throw new BusinessException(BusinessExceptionEnum.MEASURE_FILE_CREATE_FAILED);
                 }
             } catch (Exception ex) {
+                log.info("---- data  is  exception， this  is  {}", ex);
                 throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_GET_FAILED);
             }
         }).join();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java
index a7a12ad..81469e2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java
@@ -96,6 +96,7 @@
             }
             return urlList;
         } catch (Exception ex) {
+            log.info("-----package  data  is  exception， this  is  {}", ex);
             throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED);
         }
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java
index 22597c2..508863c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java
@@ -26,6 +26,7 @@
 import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider;
 import com.casic.missiles.service.listeners.NotifyEventPostProcessor;
 import com.casic.missiles.utils.SpringContextUtil;
+import com.gexin.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -99,6 +100,7 @@
         try {
             //存储到证书打印表
             saveCertificatePrintInfo(deviceMeasureApproval);
+            log.info("-----------------{}", JSON.toJSON(deviceMeasureApproval));
             GenericEqptDataProvider genericEqptDataProvider=SpringContextUtil.getBean(GenericEqptDataProvider.class);
             Map<String, Object> map = BeanUtil.beanToMap(deviceMeasureApproval);
             genericEqptDataProvider.excuteMeasureTaskAsyn(map,deviceMeasureApproval.getId(),deviceMeasureApproval.getCertificateWordFile());

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
index b13ce50..56a707f 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
@@ -90,7 +90,7 @@
         WHERE template_name= #{templateName}
         AND   template_type= #{coverModuleName}
         <if test="descn != null and descn!=''">
-            AND   template_desc =#{descn}
+            AND   template_desc like concat('%',#{descn},'%')
         </if>
 
     </select>
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
index b17b574..871ddd6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.service.Impl.eqpt;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -12,30 +10,21 @@
 import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval;
-import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator;
-import com.casic.missiles.model.equipment.BizEquipmentInfo;
-import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator;
 import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval;
 import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint;
 import com.casic.missiles.service.listeners.register.PrintFileRegister;
-import com.casic.missiles.utils.SnowflakeUtil;
 import com.casic.missiles.utils.SpringContextUtil;
-import com.gexin.fastjson.JSON;
-import liquibase.pro.packaged.A;
-import liquibase.pro.packaged.M;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.docx4j.wml.R;
 import org.springframework.stereotype.Component;
 
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
+
 
 /**
  * 通用的装置数据提供器
@@ -50,9 +39,6 @@
 
     private final PrintFileRegister printFileRegister;
 
-    private static ThreadPoolExecutor threadPool = new ThreadPoolExecutor(4, 10, 100,
-            TimeUnit.SECONDS, new LinkedBlockingQueue<>(10));
-
     /**
      * 核查记录生成更新证书的任务
      */
@@ -61,6 +47,7 @@
         if (ObjectUtils.isEmpty(request) || StringUtils.isEmpty(request.getBelongStandardEquipment())) {
             throw new BusinessException(BusinessExceptionEnum.MEASURE_STANDARD_IS_NULL);
         }
+        log.info("check data  is  check,please  wait  ...");
         //生成核查记录单
         StandardEquipmentPrint standardEquipmentPrint = SpringContextUtil.getBean(request.getBelongStandardEquipment());
         List<String> checkCertificateFileList = standardEquipmentPrint.doCheckCertificateFile(request);
@@ -89,6 +76,9 @@
      * @param oldCertificateFile
      */
     public void excuteMeasureTaskAsyn(Map<String, Object> map, Long id, String oldCertificateFile) {
+       ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100,
+                TimeUnit.SECONDS, new LinkedBlockingQueue<>(2));
+       log.info("measure data  is  check,please  wait  ...");
         List<String> customTemplateUrls = new ArrayList<>();
         customTemplateUrls.add(oldCertificateFile);
         //生成证书报告的,需要改变为动态选择性
@@ -126,6 +116,8 @@
     public void excuteCheckTaskAsyn(Map<String, Object> map, Long id, String oldCertificateFile) {
         List<String> customTemplateUrls = new ArrayList<>();
         customTemplateUrls.add(oldCertificateFile);
+        ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100,
+                TimeUnit.SECONDS, new LinkedBlockingQueue<>(2));
         //生成证书报告的
         CompletableFuture<String> certificateFutureTask = CompletableFuture.supplyAsync(
                 () -> printFileRegister.registerPrintFile(MULTIFUNCTION_CHECK_DATA, "数据打印", null, map, true, null, customTemplateUrls), threadPool);
@@ -155,6 +147,8 @@
      * 生成更新证书的任务
      */
     public void measureCertificateTask(BizBusinessDeviceMeasureApproval request) {
+        ThreadPoolExecutor threadPool = new ThreadPoolExecutor(2, 2, 100,
+                TimeUnit.SECONDS, new LinkedBlockingQueue<>(2));
         StandardEquipmentPrint equipmentPrint = getStandardEquipmentPrint(request);
         log.info("---111111111");
         //生成证书报告的
@@ -172,7 +166,7 @@
                 List<String> certificateFileUrl = certificateFutureTask.join();
                 String originalRecordFileUrl = originalFutureTask.join();
                 BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class);
-                log.info("----------------获取生成的数据结果");
+                log.info("----------------get result orign is {},certificate is {}",originalRecordFileUrl,certificateFileUrl);
                 if (CollectionUtils.isNotEmpty(certificateFileUrl) || StringUtils.isNotEmpty(originalRecordFileUrl)) {
                     //生成证书文件
                     if (CollectionUtils.isNotEmpty(certificateFileUrl)) {
@@ -192,6 +186,7 @@
                     throw new BusinessException(BusinessExceptionEnum.MEASURE_FILE_CREATE_FAILED);
                 }
             } catch (Exception ex) {
+                log.info("---- data  is  exception， this  is  {}", ex);
                 throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_GET_FAILED);
             }
         }).join();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java
index a7a12ad..81469e2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java
@@ -96,6 +96,7 @@
             }
             return urlList;
         } catch (Exception ex) {
+            log.info("-----package  data  is  exception， this  is  {}", ex);
             throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED);
         }
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java
index 22597c2..508863c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java
@@ -26,6 +26,7 @@
 import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider;
 import com.casic.missiles.service.listeners.NotifyEventPostProcessor;
 import com.casic.missiles.utils.SpringContextUtil;
+import com.gexin.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -99,6 +100,7 @@
         try {
             //存储到证书打印表
             saveCertificatePrintInfo(deviceMeasureApproval);
+            log.info("-----------------{}", JSON.toJSON(deviceMeasureApproval));
             GenericEqptDataProvider genericEqptDataProvider=SpringContextUtil.getBean(GenericEqptDataProvider.class);
             Map<String, Object> map = BeanUtil.beanToMap(deviceMeasureApproval);
             genericEqptDataProvider.excuteMeasureTaskAsyn(map,deviceMeasureApproval.getId(),deviceMeasureApproval.getCertificateWordFile());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
index 3d33192..9fe5034 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.model.file.ImageConfig;
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.SpringContextUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -22,6 +23,7 @@
 /**
  * @author cz
  */
+@Slf4j
 public class ElectronicSignSeal extends ElectronicSignTemplate implements FilePrintEnum {
 
 
@@ -118,7 +120,7 @@
                     }
                 }
             } else {
-                if(!metaDataMap.containsKey(flowField)||ObjectUtils.isEmpty(metaDataMap.get(flowField))){
+                if (!metaDataMap.containsKey(flowField) || ObjectUtils.isEmpty(metaDataMap.get(flowField))) {
                     return;
                 }
                 //配置参数中包含有工作流的字段
@@ -194,6 +196,7 @@
                         filePrintRegister.getParams().put("comment" + timeSeqCount, approvalLog.getComment().getComment());
                     }
                     timeSeqCount++;
+                    log.info(":-----{}", filePrintRegister.getTemDir() + signFileName + "------" + StringUtils.isEmpty(signFileName));
                     //设置集合
                     electronicImage.setElectronicSealImageUrl(filePrintRegister.getTemDir() + signFileName);
                     electronicImage.setImageConfig(approvalImageList.get(i));

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
index b13ce50..56a707f 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
@@ -90,7 +90,7 @@
         WHERE template_name= #{templateName}
         AND   template_type= #{coverModuleName}
         <if test="descn != null and descn!=''">
-            AND   template_desc =#{descn}
+            AND   template_desc like concat('%',#{descn},'%')
         </if>
 
     </select>
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
index b17b574..871ddd6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
@@ -1,7 +1,5 @@
 package com.casic.missiles.service.Impl.eqpt;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -12,30 +10,21 @@
 import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper;
 import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper;
 import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval;
-import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCalibrator;
-import com.casic.missiles.model.equipment.BizEquipmentInfo;
-import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator;
 import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval;
 import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint;
 import com.casic.missiles.service.listeners.register.PrintFileRegister;
-import com.casic.missiles.utils.SnowflakeUtil;
 import com.casic.missiles.utils.SpringContextUtil;
-import com.gexin.fastjson.JSON;
-import liquibase.pro.packaged.A;
-import liquibase.pro.packaged.M;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.docx4j.wml.R;
 import org.springframework.stereotype.Component;
 
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
+
 
 /**
  * 通用的装置数据提供器
@@ -50,9 +39,6 @@
 
     private final PrintFileRegister printFileRegister;
 
-    private static ThreadPoolExecutor threadPool = new ThreadPoolExecutor(4, 10, 100,
-            TimeUnit.SECONDS, new LinkedBlockingQueue<>(10));
-
     /**
      * 核查记录生成更新证书的任务
      */
@@ -61,6 +47,7 @@
         if (ObjectUtils.isEmpty(request) || StringUtils.isEmpty(request.getBelongStandardEquipment())) {
             throw new BusinessException(BusinessExceptionEnum.MEASURE_STANDARD_IS_NULL);
         }
+        log.info("check data  is  check,please  wait  ...");
         //生成核查记录单
         StandardEquipmentPrint standardEquipmentPrint = SpringContextUtil.getBean(request.getBelongStandardEquipment());
         List<String> checkCertificateFileList = standardEquipmentPrint.doCheckCertificateFile(request);
@@ -89,6 +76,9 @@
      * @param oldCertificateFile
      */
     public void excuteMeasureTaskAsyn(Map<String, Object> map, Long id, String oldCertificateFile) {
+       ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100,
+                TimeUnit.SECONDS, new LinkedBlockingQueue<>(2));
+       log.info("measure data  is  check,please  wait  ...");
         List<String> customTemplateUrls = new ArrayList<>();
         customTemplateUrls.add(oldCertificateFile);
         //生成证书报告的,需要改变为动态选择性
@@ -126,6 +116,8 @@
     public void excuteCheckTaskAsyn(Map<String, Object> map, Long id, String oldCertificateFile) {
         List<String> customTemplateUrls = new ArrayList<>();
         customTemplateUrls.add(oldCertificateFile);
+        ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100,
+                TimeUnit.SECONDS, new LinkedBlockingQueue<>(2));
         //生成证书报告的
         CompletableFuture<String> certificateFutureTask = CompletableFuture.supplyAsync(
                 () -> printFileRegister.registerPrintFile(MULTIFUNCTION_CHECK_DATA, "数据打印", null, map, true, null, customTemplateUrls), threadPool);
@@ -155,6 +147,8 @@
      * 生成更新证书的任务
      */
     public void measureCertificateTask(BizBusinessDeviceMeasureApproval request) {
+        ThreadPoolExecutor threadPool = new ThreadPoolExecutor(2, 2, 100,
+                TimeUnit.SECONDS, new LinkedBlockingQueue<>(2));
         StandardEquipmentPrint equipmentPrint = getStandardEquipmentPrint(request);
         log.info("---111111111");
         //生成证书报告的
@@ -172,7 +166,7 @@
                 List<String> certificateFileUrl = certificateFutureTask.join();
                 String originalRecordFileUrl = originalFutureTask.join();
                 BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class);
-                log.info("----------------获取生成的数据结果");
+                log.info("----------------get result orign is {},certificate is {}",originalRecordFileUrl,certificateFileUrl);
                 if (CollectionUtils.isNotEmpty(certificateFileUrl) || StringUtils.isNotEmpty(originalRecordFileUrl)) {
                     //生成证书文件
                     if (CollectionUtils.isNotEmpty(certificateFileUrl)) {
@@ -192,6 +186,7 @@
                     throw new BusinessException(BusinessExceptionEnum.MEASURE_FILE_CREATE_FAILED);
                 }
             } catch (Exception ex) {
+                log.info("---- data  is  exception， this  is  {}", ex);
                 throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_GET_FAILED);
             }
         }).join();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java
index a7a12ad..81469e2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java
@@ -96,6 +96,7 @@
             }
             return urlList;
         } catch (Exception ex) {
+            log.info("-----package  data  is  exception， this  is  {}", ex);
             throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED);
         }
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java
index 22597c2..508863c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java
@@ -26,6 +26,7 @@
 import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider;
 import com.casic.missiles.service.listeners.NotifyEventPostProcessor;
 import com.casic.missiles.utils.SpringContextUtil;
+import com.gexin.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -99,6 +100,7 @@
         try {
             //存储到证书打印表
             saveCertificatePrintInfo(deviceMeasureApproval);
+            log.info("-----------------{}", JSON.toJSON(deviceMeasureApproval));
             GenericEqptDataProvider genericEqptDataProvider=SpringContextUtil.getBean(GenericEqptDataProvider.class);
             Map<String, Object> map = BeanUtil.beanToMap(deviceMeasureApproval);
             genericEqptDataProvider.excuteMeasureTaskAsyn(map,deviceMeasureApproval.getId(),deviceMeasureApproval.getCertificateWordFile());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
index 3d33192..9fe5034 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.model.file.ImageConfig;
 import com.casic.missiles.service.flowable.ApprovalOperateService;
 import com.casic.missiles.utils.SpringContextUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -22,6 +23,7 @@
 /**
  * @author cz
  */
+@Slf4j
 public class ElectronicSignSeal extends ElectronicSignTemplate implements FilePrintEnum {
 
 
@@ -118,7 +120,7 @@
                     }
                 }
             } else {
-                if(!metaDataMap.containsKey(flowField)||ObjectUtils.isEmpty(metaDataMap.get(flowField))){
+                if (!metaDataMap.containsKey(flowField) || ObjectUtils.isEmpty(metaDataMap.get(flowField))) {
                     return;
                 }
                 //配置参数中包含有工作流的字段
@@ -194,6 +196,7 @@
                         filePrintRegister.getParams().put("comment" + timeSeqCount, approvalLog.getComment().getComment());
                     }
                     timeSeqCount++;
+                    log.info(":-----{}", filePrintRegister.getTemDir() + signFileName + "------" + StringUtils.isEmpty(signFileName));
                     //设置集合
                     electronicImage.setElectronicSealImageUrl(filePrintRegister.getTemDir() + signFileName);
                     electronicImage.setImageConfig(approvalImageList.get(i));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java
index 5791a39..faf91dd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java
@@ -198,6 +198,7 @@
         if (CollectionUtil.isNotEmpty(mergeColNames)) {
             //遍寻列，同时增加下标超值判断
             int positionIndex = tryGetInitialMergeRow(table);
+            //查询合并索引的列
             List<Integer> mergeIndexList = checkThisTableCellMergeIndex(positionIndex, table, mergeColNames);
 
             Map<Integer, Integer> mergeIndexMap = mergeIndexList.stream().collect(Collectors.toMap(e -> e, e -> e));
@@ -251,7 +252,7 @@
         );
         int colIndex = 0;
         List<Integer> mergeIndexList = new ArrayList<>();
-        for (int i = 0; i < --positionIndex; i++) {
+        for (int i = 0; i <= positionIndex; i++) {
             XWPFTableRow row = table.getRow(i);
             //标题合并行
             while (colIndex < row.getTableCells().size()) {