Merge branch 'dev'

src/main/java/com/patzn/cloud/service/lims/handler/SoilItemCollectData.java

@@ -9,6 +9,11 @@ public class SoilItemCollectData {
 
      private String sampleCode;
 
+     private String shortName;
+
+
+    private String status;
+
     private Long expId;
 
     public String getItemName() {
@@ -51,6 +56,22 @@ public class SoilItemCollectData {
         this.unit = unit;
     }
 
+    public String getShortName() {
+        return shortName;
+    }
+
+    public void setShortName(String shortName) {
+        this.shortName = shortName;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
     @Override
     public String toString() {
         return "SoilItemCollectData{" +

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

@@ -1519,7 +1519,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                         }
                         if (null != config.getColumnPlace() && null != config.getMergeRowNum()){
                                 Integer sampleBgMum = template.getSampleBeginRow()+templateSampleNum*sampleMergerNum;
-                                Integer sampleEnMum = template.getSampleBeginRow()+sampleList.size()*sampleMergerNum-1;
+                                Integer sampleEnMum = template.getSampleBeginRow()+voList.size()*sampleMergerNum-1;
                                 while (sampleBgMum<=sampleEnMum) {
                                     sheetOne.addMergedRegion(new CellRangeAddress(sampleBgMum,sampleBgMum+step-1,config.getMergeBegin(),config.getMergeEnd()));
                                     sampleBgMum=sampleBgMum+step;

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

@@ -302,9 +302,17 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
 
         List<SoilExperimentVO> experimentVOList = soilExperimentService.listVOByIds(expIdsList);
 
-        Map<String,SoilExperiment> experimentMap = new HashMap<>();
+        Map<String,List<SoilExperiment>> experimentMap = new HashMap<>();
         for (SoilExperimentVO soilExperimentVO:experimentVOList) {
-            experimentMap.put(soilExperimentVO.getSampleCode(),soilExperimentVO);
+            if (experimentMap.containsKey(soilExperimentVO.getSampleCode())){
+                List<SoilExperiment> listExp =  experimentMap.get(soilExperimentVO.getSampleCode());
+                listExp.add(soilExperimentVO);
+                experimentMap.put(soilExperimentVO.getSampleCode(),listExp);
+            }else{
+                List<SoilExperiment> listExp =  new ArrayList<>();
+                listExp.add(soilExperimentVO);
+                experimentMap.put(soilExperimentVO.getSampleCode(),listExp);
+            }
         }
 
         List<SoilItemVO> indexList = soilItemService.listVOByExpIds(expIdsList);
@@ -326,6 +334,9 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
 
             Integer sampleCol = null ;
 
+
+
+
             for (SoilOriginalTemplateConfig config:configList) {
                 if ("sampleCode".equals(config.getDataAttribute())){
                     sampleCol = config.getColumnPlace();
@@ -342,6 +353,13 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
                 }
             }
 
+            Integer shortName = null ;
+            for (SoilOriginalTemplateConfig config:configList) {
+                if ("shortName".equals(config.getDataAttribute())){
+                    shortName = config.getColumnPlace();
+                    break;
+                }
+            }
             if (sampleCol == null) {
                 return true;
             }
@@ -387,6 +405,18 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
 
 
 
+                XSSFCell shortNameCell = null;
+                String shortNames = null;
+                if (null != shortName){
+                    shortNameCell =   xssfRow.getCell(shortName);
+
+                    shortNames = HSSFWorkbookUtil.getJavaValue(shortNameCell).toString();
+                }
+
+
+
+
+
                 for (ItemCollectEntity collectEntity:collectEntitiesList) {
                     Integer itemValueIndex = collectEntity.getItemMegerRow();
                     if (null == itemValueIndex || itemValueIndex ==sampleMergerNum){
@@ -420,8 +450,22 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
                         soilItemCollectData.setTestValue(value);
                         soilItemCollectData.setSampleCode(sampleCode);
                         soilItemCollectData.setUnit(collectEntity.getUnit());
+                        soilItemCollectData.setShortName(shortNames);
+                        soilItemCollectData.setStatus(sampleOfStatus);
 
-
+                        if ("状态判断".equals(collectEntity.getAttribute())){
+                            if (StringUtils.isNotBlank(sampleOfStatus)){
+                                if ("原状".equals(sampleOfStatus)){
+                                    soilItemCollectData.setItemName("原状土"+itemName);
+                                }else if ("重塑".equals(sampleOfStatus)){
+                                    soilItemCollectData.setItemName("重塑土"+itemName);
+                                }
+                            }else {
+                                soilItemCollectData.setItemName(itemName);
+                            }
+                        }else{
+                            soilItemCollectData.setItemName(itemName);
+                        }
 
                         soilItemList.add(soilItemCollectData);
                     }else{
@@ -465,6 +509,8 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
                                 soilItemCollectData.setItemName(name);
                                 soilItemCollectData.setTestValue(value);
                                 soilItemCollectData.setSampleCode(sampleCode);
+                                soilItemCollectData.setShortName(shortNames);
+                                soilItemCollectData.setStatus(sampleOfStatus);
                                 soilItemCollectData.setUnit(collectEntity.getUnit());
                                 soilItemList.add(soilItemCollectData);
                             }
@@ -479,6 +525,8 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
                             soilItemCollectData.setItemName(itemName);
                             soilItemCollectData.setTestValue(value);
                             soilItemCollectData.setSampleCode(sampleCode);
+                            soilItemCollectData.setShortName(shortNames);
+                            soilItemCollectData.setStatus(sampleOfStatus);
                             soilItemCollectData.setUnit(collectEntity.getUnit());
                             soilItemList.add(soilItemCollectData);
                         }
@@ -502,7 +550,49 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
             List<SoilItem> saveList = new ArrayList<>();
             List<SoilItem> updateList = new ArrayList<>();
             for (SoilItemCollectData soilItemCollectData:soilItemList) {
-                SoilExperiment exp = experimentMap.get(soilItemCollectData.getSampleCode());
+                List<SoilExperiment> expList = experimentMap.get(soilItemCollectData.getSampleCode());
+                SoilExperiment exp = null ;
+
+                if (expList.size()==1){
+                    exp = expList.get(0);
+                }else if (expList.size()>1){
+
+                 String shortNameTest =     soilItemCollectData.getShortName();
+                 String status =     soilItemCollectData.getStatus();
+
+
+                    for (SoilExperiment experiment:expList) {
+                           if (shortNameTest!=null&&experiment.getName().contains(shortNameTest)){
+                               exp = experiment;
+                           }else if (null!=status&&experiment.getName().contains(status)){
+                               exp = experiment;
+                           }
+                    }
+                    if (exp==null&&CollectionUtils.isNotEmpty(expList)){
+
+                        if (expList.size()>0){
+                            for (SoilExperiment experiment:expList) {
+                                if (StringUtils.isBlank(status)){
+                                    exp = experiment;
+                                    break;
+                                }else  if ("原状".equals(status)) {
+                                    if (!experiment.getName().contains("重塑")){
+                                        exp = experiment;
+                                        break;
+                                    }
+                                }else{
+                                    exp = experiment;
+                                }
+                            }
+                        }
+                    }
+
+
+                }
+                if (null==exp){
+                    continue;
+                }
+
                 if (null!=exp){
                     soilItemCollectData.setExpId(exp.getId());
                 }
@@ -631,8 +721,11 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
                                 continue;
                             }
 
-
-                           SoilExperiment exp = experimentMap.get(sampleCode);
+                           List<SoilExperiment>  listE =     experimentMap.get(sampleCode);
+                            if (CollectionUtils.isEmpty(listE)){
+                                continue;
+                            }
+                           SoilExperiment exp = listE.get(0);
                            if (null == exp){
                                continue;
                            }