土工平台修改

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExperimentServiceImpl.java

@@ -207,12 +207,14 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
 
         SoilOriginalTemplate template = soilOriginalTemplateService.getById(templateId);
         if (null == template){
+            logger.error("----------------------0");
             RestAssert.fail("模板不存在");
         }
         logger.error("saveExcelOriginalRecord模板存在");
 
         List<SoilExperimentVO> voList = soilExperimentService.listVOByIds(ids);
         if (CollectionUtils.isEmpty(voList)){
+            logger.error("----------------------1");
             return null;
         }
 
@@ -222,6 +224,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
         logger.error("saveExcelOriginalRecord entrust");
         InputStream io = ossClient.download(template.getObjectKey());
         if (null == io){
+            logger.error("----------------------2");
             RestAssert.fail("模板不存在");
         }
 
@@ -239,11 +242,12 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
         mapReplace.put("#{client}",entrust.getClient());
         mapReplace.put("#{boreholeName}",entrust.getBoreholeName());
         mapReplace.put("#{projectNo}",entrust.getProjectNo());
-
+        logger.error("----------------------3");
         replaceModel(mapReplace,xssfWorkbook,0);
-
+        logger.error("----------------------4");
         XSSFSheet sheetOne = xssfWorkbook.getSheetAt(0);
         sheetOne.setForceFormulaRecalculation(true);
+        logger.error("----------------------5");
         if (null != template.getSampleBeginRow()
                 && null!=template.getSampleMergerNum()
                 && null!=template.getTemplateSampleNum()){
@@ -253,6 +257,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
             logger.error("configList");
             int templateSampleNum = template.getTemplateSampleNum();
             if (voList.size()<templateSampleNum){
+                logger.error("----------------------6");
                 int beginRow = template.getSampleBeginRow();
                 int sampleMergerNum = template.getSampleMergerNum();
                 for (SoilExperimentVO vo:voList) {
@@ -264,16 +269,17 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                     }
                     beginRow+=sampleMergerNum;
                 }
+                logger.error("----------------------7");
             }else{
 
-
+                logger.error("----------------------8");
                 int beginRow = template.getSampleBeginRow();
                 int sampleMergerNum = template.getSampleMergerNum();
                 int insertRow = beginRow+sampleMergerNum*templateSampleNum;
-
+                logger.error("---------------------9");
                 XSSFRow zeroRow = sheetOne.getRow(beginRow);
                 XSSFCellStyle cellStyle = zeroRow.getCell(0).getCellStyle();
-
+                logger.error("----------------------10");
                 int lastCellNum  =  zeroRow.getLastCellNum();
 
 
@@ -287,7 +293,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
 
 
                 List<Integer> integerList = new ArrayList<>();
-
+                logger.error("---------------------11");
                 for (SoilOriginalTemplateConfig config:configList) {
                     Integer a = config.getMergeBegin();
                     Integer b = config.getMergeEnd();
@@ -299,7 +305,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                     }
                 }
 
-
+                logger.error("----------------------12");
 
                 for (int m = 0 ; m<insertCount ;m++) {
                     for (int i = 0; i < sampleMergerNum; i++) {
@@ -350,7 +356,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                     mergerB = mergerB+sampleMergerNum;
                 }
 
-
+                logger.error("----------------------14");
                 int sn = 1;
                 for (SoilExperimentVO vo:voList) {
                     XSSFRow xssfRow = sheetOne.getRow(beginRow);
@@ -375,11 +381,12 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                     beginRow+=sampleMergerNum;
                     sn++;
                 }
-
+                logger.error("----------------------15");
             }
 
 
         }
+        logger.error("----------------------16");
         FileOutputStream os = null;
         File file = null;
         String generated="原始记录";
@@ -390,6 +397,8 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
             xssfWorkbook.write(os);
             os.flush();
             objectKey= soilOriginalRecordService.uploadExpGenerate(ids,template,entrust, account, "原始记录生成", file);
+
+            logger.error("----------------------17");
         } catch (Exception e) {
 
             logger.error("Exception 报错"+e.getMessage());
@@ -405,7 +414,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
             }
 
         }
-
+        logger.error("----------------------20");
         return objectKey;
     }