土工平台修改

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

@@ -893,17 +893,33 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
 
                 SoilExperimentVO firstVO = null;
 
+                int  sheetNum =  xssfWorkbook.getNumberOfSheets();
+
 
                 for (SoilExperimentVO vo:voList) {
                     if (index==0){
-                        xssfWorkbook.setSheetName(0,vo.getSampleCode());
                         index++;
 
                         firstVO = vo;
                         continue;
                     }
                     XSSFSheet sheet =  xssfWorkbook.cloneSheet(0);
-                    xssfWorkbook.setSheetName(index,vo.getSampleCode());
+                    index++;
+                }
+
+
+                int nextSample = sheetNum;
+
+                boolean start = true;
+                for (SoilExperimentVO vo:voList) {
+                    if (start){
+                        start = false;
+                        continue;
+                    }
+
+                    XSSFSheet sheet =  xssfWorkbook.getSheetAt(nextSample);
+                    xssfWorkbook.setSheetName(nextSample,vo.getSampleCode());
+
                     List<SoilItemVO> itemVOList = sampleSoilItemVOMap.get(vo.getSampleId());
                     if (CollectionUtils.isNotEmpty(itemVOList)){
                         for (SoilItemVO itemVO:itemVOList) {
@@ -930,8 +946,9 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                     }
 
                     mapReplace.put("#{sampleCode}",vo.getSampleCode());
+                    mapReplace.put("#{sampleDepth}",vo.getSampleDepth());
                     HSSFWorkbookUtil.replaceModel(mapReplace,xssfWorkbook,sheet);
-                    index++;
+                    nextSample++;
                 }