HMHJ报告生成优化

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

@@ -52,7 +52,7 @@ public class EntrustSampleItemIndexServiceImpl extends BaseServiceImpl<EntrustSa
     public List<EntrustSampleItemIndex> listBySampleId(Long id) {
 
         List<EntrustSampleItem> itemList =  entrustSampleItemService.list(Condition.create().eq("entrust_sample_id",id));
-        if (CollectionUtils.isNotEmpty(itemList)){
+        if (CollectionUtils.isEmpty(itemList)){
             return null;
         }
         List<Long> itemIds= itemList.stream().map(s->{

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

@@ -75,7 +75,8 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
     private IEntrustReportService entrustReportService;
     @Autowired
     private IOriginalTemplateConfigService originalTemplateConfigService;
-
+    @Autowired
+    private IEntrustReportTemplateConfigService entrustReportTemplateConfigService;
     @Autowired
     private IEntrustService entrustService;
 
@@ -361,7 +362,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
                e.printStackTrace();
            }
 
-           List<OriginalTemplateConfig> configList = originalTemplateConfigService.list(Condition.create().eq("template_id",templateId));
+           List<EntrustReportTemplateConfig> configList = entrustReportTemplateConfigService.list(Condition.create().eq("template_id",templateId));
                OriginalUtil.doReplace(xssfWorkbook,entrust);
                XSSFSheet sheetOne = xssfWorkbook.getSheetAt(0);
                String sheetName = sheetOne.getSheetName();
@@ -375,7 +376,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
                        List<EntrustSampleItemIndex> indexList = entrustSampleItemIndexService.listBySampleId(vo.getId());
                        vo.setIndexList(indexList);
                        XSSFRow xssfRow = sheetOne.getRow(beginRow);
-                       for (OriginalTemplateConfig config:configList) {
+                       for (EntrustReportTemplateConfig config:configList) {
                            XSSFCell cell =  xssfRow.getCell(config.getColumnPlace());
                            if ("sn".equals(config.getDataAttribute())){
                                continue;
@@ -392,7 +393,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
                    FileOutputStream os = null;
                    File file = null;
                    try {
-                       file = File.createTempFile(generated, ".docx");
+                       file = File.createTempFile(generated, ".xlsx");
                        os = new FileOutputStream(file);
                        xssfWorkbook.write(os);
                        os.flush();
@@ -442,8 +443,9 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
 
                    for (EntrustSampleVO vo:sampleVOList) {
                        XSSFRow xssfRow = sheetOne.getRow(beginRow);
-
-                       for (OriginalTemplateConfig config:configList) {
+                       List<EntrustSampleItemIndex> indexList = entrustSampleItemIndexService.listBySampleId(vo.getId());
+                       vo.setIndexList(indexList);
+                       for (EntrustReportTemplateConfig config:configList) {
                            if (null == config.getColumnPlace()){
                                continue;
                            }
@@ -458,7 +460,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
                        sn++;
 
                    }
-                   for (OriginalTemplateConfig config:configList) {
+                   for (EntrustReportTemplateConfig config:configList) {
                        if (null==config.getMergeRowNum()){
                            config.setMergeRowNum(1);
                        }

src/main/resources/mapper/hmhj/EntrustSampleItemMapper.xml

@@ -144,7 +144,7 @@
 
 
     <select id="selectVOListBySampleIds" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
-      SELECT i.id,i.name,i.agreed_value,i.test_value,i.standard,s.code AS "sampleCode"
+      SELECT i.id,i.name,i.agreed_value,i.test_value,i.entrust_sample_id,i.standard,s.code AS "sampleCode"
       FROM
 	  entrust_sample_item i
 	  JOIN entrust_sample s ON i.entrust_sample_id = s.ID