土工优化

src/main/java/com/patzn/cloud/service/lims/common/HSSFWorkbookUtil.java

@@ -300,9 +300,7 @@ public class HSSFWorkbookUtil {
                             anchor.setRow1(i);
                             System.out.println("setCol1:"+j);
                             System.out.println("setRow1:"+i);
-                            Picture pict = drawing.createPicture(anchor, nameIndex.get(qrcodeName));
-//                            // 计算单元格的长宽
-//                            pict.resize();
+                            drawing.createPicture(anchor, nameIndex.get(qrcodeName));
                         }
                     }
                 }

src/main/java/com/patzn/cloud/service/lims/original/InitMapReplace.java

@@ -13,6 +13,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 
 public final class InitMapReplace {
@@ -214,7 +215,7 @@ public final class InitMapReplace {
 
 
 
-    public final static void initFormula(SoilOriginalTemplateConfig config, SoilOriginalTemplate template, int sampleMergerNum, int templateSampleNum, XSSFSheet sheetOne) {
+    public final static void initFormula(SoilOriginalTemplateConfig config, SoilOriginalTemplate template, XSSFSheet sheetOne,int formulaNum) {
         if (null == config.getMergeRowNum()){
             config.setMergeRowNum(1);
         }
@@ -223,7 +224,7 @@ public final class InitMapReplace {
         }
         Integer sampleBgMum = template.getSampleBeginRow();
         Integer mergeRowNum = config.getMergeRowNum();
-        int formulaNum = template.getSampleBeginRow()+sampleMergerNum*templateSampleNum-1 ;
+//        int formulaNum = template.getSampleBeginRow()+sampleMergerNum*templateSampleNum-1 ;
         for (int i =sampleBgMum ; i <= formulaNum; i+=mergeRowNum) {
             XSSFRow row = sheetOne.getRow(i);
             if (null == row){
@@ -240,4 +241,7 @@ public final class InitMapReplace {
 
 
 
+
+
+
 }

src/main/java/com/patzn/cloud/service/lims/original/SingleLessOperation.java

@@ -83,7 +83,7 @@ public class SingleLessOperation implements  Operation {
                     beginRow+=sampleMergerNum;
                 }
                 for (SoilOriginalTemplateConfig config:configList) {
-                     InitMapReplace.initFormula(config,template,sampleMergerNum,templateSampleNum,sheetOne);
+                     InitMapReplace.initFormula(config,template,sheetOne, template.getSampleBeginRow()+sampleMergerNum*templateSampleNum-1);
                 }
                 logger.error("----------------------7");
     }

src/main/java/com/patzn/cloud/service/lims/original/SingleMoreOperation.java

@@ -117,8 +117,9 @@ public class SingleMoreOperation implements  Operation{
                     beginRow+=sampleMergerNum;
                     sn++;
                 }
+                int formulaNum = template.getSampleBeginRow()+sampleMergerNum*voList.size()-1 ;
                 for (SoilOriginalTemplateConfig config:configList) {
-                    InitMapReplace.initFormula(config,template,sampleMergerNum,templateSampleNum,sheetOne);
+                    InitMapReplace.initFormula(config,template,sheetOne,formulaNum);
                 }