hmhj优化报告生成

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

@@ -418,10 +418,11 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
             String sheetName = sheetOne.getSheetName();
             System.out.println(sheetName);
             sheetOne.setForceFormulaRecalculation(true);
-            Integer beginRow = sysFileTemplate.getSampleBeginRow();
+
             int sampleMergerNum = sysFileTemplate.getSampleMergerNum();
             int templateSampleNum = sysFileTemplate.getTemplateSampleNum();
             if (templateSampleNum >= sampleVOList.size()) {
+                Integer beginRow = sysFileTemplate.getSampleBeginRow();
                 for (EntrustSampleVO vo : sampleVOList) {
                     List<EntrustSampleItemIndex> indexList = entrustSampleItemIndexService.listBySampleId(vo.getId());
                     vo.setIndexList(indexList);
@@ -470,6 +471,43 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
                 }
 
             } else {
+
+                if (null!=sysFileTemplate.getMoreSheet()&&sysFileTemplate.getMoreSheet()==1){
+                    int total= sampleVOList.size();
+                    int totalSheetSize = (total+templateSampleNum-1)/templateSampleNum;
+                    List<List<EntrustSampleVO>> listList = Lists.partition(sampleVOList,templateSampleNum);
+                    for (int i = 1; i < totalSheetSize; i++) {
+                        xssfWorkbook.cloneSheet(0,sheetOne.getSheetName()+(i+1));
+                    }
+                    for (int k = 0; k < listList.size(); k++) {
+                        Integer beginRow = sysFileTemplate.getSampleBeginRow();
+                        List<EntrustSampleVO> sampleVOListIndex  = listList.get(k);
+
+                        for (EntrustSampleVO vo : sampleVOListIndex) {
+                            List<EntrustSampleItemIndex> indexList = entrustSampleItemIndexService.listBySampleId(vo.getId());
+                            vo.setIndexList(indexList);
+
+                             XSSFSheet sheetOneIndex=  xssfWorkbook.getSheetAt(k);
+
+                            XSSFRow xssfRow = sheetOneIndex.getRow(beginRow);
+                            for (EntrustReportTemplateConfig config : configList) {
+                                XSSFCell cell = xssfRow.getCell(config.getColumnPlace());
+                                if ("sn".equals(config.getDataAttribute())) {
+                                    continue;
+                                }
+                                if (StringUtils.isBlank(config.getDataAttribute())) {
+                                    continue;
+                                }
+                                String value = StringHandleUtils.getFieldValue(config.getDataAttribute(), vo);
+                                cell.setCellValue(value);
+                            }
+                            beginRow += sampleMergerNum;
+                        }
+                    }
+
+
+                }else {
+                    Integer beginRow = sysFileTemplate.getSampleBeginRow();
                     int insertRow = beginRow + sampleMergerNum * templateSampleNum;
                     XSSFRow zeroRow = sheetOne.getRow(beginRow);
                     XSSFCellStyle cellStyle = zeroRow.getCell(0).getCellStyle();
@@ -489,8 +527,6 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
                         }
                     }
                     int sn = 1;
-
-
                     for (EntrustSampleVO vo : sampleVOList) {
                         XSSFRow xssfRow = sheetOne.getRow(beginRow);
                         List<EntrustSampleItemIndex> indexList = entrustSampleItemIndexService.listBySampleId(vo.getId());
@@ -534,6 +570,9 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
                         }
                     }
                 }
+
+
+            }
             String generated = entrust.getCode();
             FileOutputStream os = null;
             File file = null;

src/test/java/resources/db_sql/hmhj/v113/20210623新增报告模板字段.sql

+ALTER TABLE "public"."entrust_report_template"
+ALTER TABLE "public"."entrust_report_template"
+  ADD COLUMN "more_sheet" int2 DEFAULT 0;
+
+COMMENT ON COLUMN "public"."entrust_report_template"."more_sheet" IS '多Sheet模板（0否1是）';
\ No newline at end of file