土工平台修改

src/main/java/com/patzn/cloud/service/lims/collect/core/CollectDataType.java

@@ -21,6 +21,7 @@ public class CollectDataType {
 
 
     private String sampleCode;
+    private String siteNo;
 
     private String entrustCode;
 
@@ -139,4 +140,12 @@ public class CollectDataType {
     public void setExperiment(String experiment) {
         this.experiment = experiment;
     }
+
+    public String getSiteNo() {
+        return siteNo;
+    }
+
+    public void setSiteNo(String siteNo) {
+        this.siteNo = siteNo;
+    }
 }

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

@@ -1394,7 +1394,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
             Map<String,Integer> checkChongSuMap = new HashMap<>();
 
             for (SoilExperimentVO vo : voList) {
-                 String name = vo.getName().replace("-重塑","");
+                 String name = vo.getName().replace("-重塑","")+vo.getSampleCode();
                  if (checkChongSuMap.containsKey(name)){
                    Integer num =  checkChongSuMap.get(name);
                      num=num+1;
@@ -1410,7 +1410,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
             Map<String,SoilExperimentVO> newChongSuMap = new HashMap<>();
 
             for (SoilExperimentVO vo:voList) {
-                String name = vo.getName().replace("-重塑","");
+                String name = vo.getName().replace("-重塑","")+vo.getSampleCode();
 
 
                 if (!vo.getName().contains("重塑")){
@@ -1422,23 +1422,30 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                         newVOList.add(vo);
                     }
 
-                    newChongSuMap.put(vo.getName(),vo);
+                    newChongSuMap.put(vo.getName()+vo.getSampleCode(),vo);
                 }
             }
 
             voList = newVOList;
 
+            List<SoilItem> saveNewItemList = new ArrayList<>();
+
             for (SoilExperimentVO vo:voList) {
-                SoilExperimentVO chongSu =  newChongSuMap.get(vo.getName()+"-重塑");
+                SoilExperimentVO chongSu =  newChongSuMap.get(vo.getName()+"-重塑"+vo.getSampleCode());
                 if (null!=chongSu){
                     for (SoilItem item : soilItemList) {
-                        if (item.getExperimentId().equals(chongSu)){
+                        if (item.getExperimentId().equals(chongSu.getId())){
                             SoilItem  soilItem = item.convert(SoilItem.class);
                             soilItem.setExperimentId(vo.getId());
-                            soilItemList.add(soilItem);
+                            saveNewItemList.add(soilItem);
+                        }
                     }
                 }
             }
+
+
+            for (SoilItem item : saveNewItemList) {
+                soilItemList.add(item);
             }
         }
 
@@ -2557,6 +2564,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
 
                 dataType.setExpId(vo.getId());
                 dataType.setSampleCode(vo.getSampleCode());
+                dataType.setSiteNo(vo.getSiteNo());
                 dataType.setExperiment(vo.getName());
                 dataType.setEntrustCode(vo.getEntrustCode());
                 if (originalFilename.contains(".bmp")){
@@ -2748,7 +2756,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                         appendix.setName("附录"+count+" "+type.getExperiment()+"试验成果图");
                         appendix.setTitle("附录"+count);
                         appendix.setExpId(type.getExpId());
-                        appendix.setSampleCode(type.getSampleCode());
+                        appendix.setSampleCode(type.getSiteNo());
                         if (name.contains("三轴")){
                             appendix.setRemark("三轴");
                         }else if (name.contains("固结")){