原始记录修改

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

@@ -29,11 +29,11 @@ public class OriginalFactory {
             if (null == template.getSampleBeginRow()|| null==template.getSampleMergerNum()||null==template.getTemplateSampleNum()){
                return null;
             }
-            if (voList.size()<template.getTemplateSampleNum()){
-                return new SingleSheetLittleOperation(template,voList,entrust,configList,xssfWorkbook);
-            }else{
+//            if (voList.size()<template.getTemplateSampleNum()){
+//                return new SingleSheetLittleOperation(template,voList,entrust,configList,xssfWorkbook);
+//            }else{
                 return new SingleSheetMoreOperation(template,voList,entrust,configList,xssfWorkbook);
-            }
+//            }
 
         }else{
             Integer templateSampleNum = template.getTemplateSampleNum();

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

@@ -11,6 +11,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.*;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -21,6 +22,7 @@ public class SingleSheetMoreOperation implements Operation {
     private  Entrust entrust ;
     private List<OriginalTemplateConfig> configList;
     private XSSFWorkbook xssfWorkbook;
+    private String collectionDataPrefix = "clc.";
     public SingleSheetMoreOperation(OriginalTemplate template, List<EntrustSampleItemVO> voList, Entrust entrust, List<OriginalTemplateConfig> configList, XSSFWorkbook xssfWorkbook) {
         this.template = template;
         this.voList = voList;
@@ -173,5 +175,52 @@ public class SingleSheetMoreOperation implements Operation {
                 }
             }
         }
+
+        // 处理曲线和空白
+        dealCurveAndBlank(configList,voList,template,xssfWorkbook);
+    }
+
+    private void dealCurveAndBlank(List<OriginalTemplateConfig> configList, List<EntrustSampleItemVO> voList, OriginalTemplate template, XSSFWorkbook xssfWorkbook) {
+        Integer curveBeginNum = template.getCurveBeginNum();
+        Integer blankBeginNum = template.getBlankBeginNum();
+        List<Map<String,String>> curveDataList = null;
+        Map<String,String> blankDataMap = null;
+        XSSFSheet sheet = xssfWorkbook.getSheetAt(0);
+        if (CollectionUtils.isNotEmpty(voList)) {
+            curveDataList = voList.get(0).getCurveDataList();
+            blankDataMap = voList.get(0).getBlankDataMap();
+        }
+        // 填充曲线数据
+        if (curveBeginNum != null && CollectionUtils.isNotEmpty(curveDataList)) {
+            int index = 0;
+            for (int i = curveBeginNum; i < curveBeginNum + curveDataList.size(); i++) {
+                XSSFRow row = sheet.getRow(i);
+                for (OriginalTemplateConfig config : configList) {
+                    if (null == config.getColumnPlace()) {
+                        continue;
+                    }
+                    if (null != config.getDataAttribute() && config.getDataAttribute().startsWith(collectionDataPrefix)) {
+                        XSSFCell cell = row.getCell(config.getColumnPlace());
+                        cell.setCellValue(curveDataList.get(index).get(config.getDataAttribute().substring(collectionDataPrefix.length())));
+                    }
+
+                }
+            }
+            index++;
+        }
+        // 填充空白
+        if (blankBeginNum != null && blankDataMap != null && blankDataMap.size() > 0) {
+            XSSFRow row = sheet.getRow(blankBeginNum);
+            // 只插固定一行
+            for (OriginalTemplateConfig config : configList) {
+                if (null == config.getColumnPlace()) {
+                    continue;
+                }
+                if (null != config.getDataAttribute() && config.getDataAttribute().startsWith(collectionDataPrefix)) {
+                    XSSFCell cell = row.getCell(config.getColumnPlace());
+                    cell.setCellValue(blankDataMap.get(config.getDataAttribute().substring(collectionDataPrefix.length())));
+                }
+            }
+        }
     }
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustServiceImpl.java

@@ -1282,7 +1282,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
 
 
     private ByteArrayOutputStream getEntrustBaos() {
-        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("\\templates.\\word.\\entrust.\\EntrustExportTemplate.docx");
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("\\templates\\word\\entrust\\EntrustExportTemplate.docx");
         RestAssert.fail(null == inputStream, "委托检测书模板获取失败");
         byte[] buffer = new byte[1024];
         int len;