sheet合并单元格；修改委托书模板

src/main/java/com/patzn/cloud/service/lims/hmhj/original/SingleSheetMoreItemOperation.java

 package com.patzn.cloud.service.lims.hmhj.original;
 
-import com.baomidou.mybatisplus.toolkit.CollectionUtils;
 import com.patzn.cloud.service.hmhj.entity.Entrust;
 import com.patzn.cloud.service.hmhj.entity.OriginalTemplate;
 import com.patzn.cloud.service.hmhj.entity.OriginalTemplateConfig;
 import com.patzn.cloud.service.hmhj.vo.EntrustSampleVO;
 import com.patzn.cloud.service.lims.common.StringHandleUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.*;
 
 import java.util.HashMap;
@@ -146,6 +146,7 @@ public class SingleSheetMoreItemOperation implements Operation {
             beginRow+=sampleMergerNum;
             sn++;
         }
+        // 公式
         Integer sampleBgMum = template.getSampleBeginRow();
         for (OriginalTemplateConfig config:configList) {
             if (null == config.getMergeRowNum()){
@@ -175,5 +176,29 @@ public class SingleSheetMoreItemOperation implements Operation {
                 cell.setCellFormula(OriginalUtil.initFormula(formula,i));
             }
         }
+        // 合并单元格
+        for (OriginalTemplateConfig config:configList) {
+            if (null==config.getMergeRowNum()){
+                config.setMergeRowNum(1);
+            }
+            if (null == config.getMergeBegin()){
+                continue;
+            }
+            if (null == config.getMergeEnd()){
+                continue;
+            }
+            int step=  config.getMergeRowNum();
+            if (step==1 && config.getMergeEnd() == config.getMergeBegin()){
+                continue;
+            }
+            if (null != config.getColumnPlace() && null != config.getMergeRowNum()){
+                sampleBgMum = template.getSampleBeginRow()+templateSampleNum*sampleMergerNum;
+                Integer sampleEnMum = template.getSampleBeginRow()+voList.size()*sampleMergerNum-1;
+                while (sampleBgMum<=sampleEnMum) {
+                    sheetOne.addMergedRegion(new CellRangeAddress(sampleBgMum,sampleBgMum+step-1,config.getMergeBegin(),config.getMergeEnd()));
+                    sampleBgMum=sampleBgMum+step;
+                }
+            }
+        }
     }
 }
\ No newline at end of file