Merge branch 'dev'

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

@@ -1352,6 +1352,8 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
         List<SoilExperimentVO> voList = soilExperimentService.listVOByIds(ids);
 
 
+        boolean chong = "检测报告（力学试验）落锥".equals(template.getName())||"检测报告（力学试验）实验室微型十字板".equals(template.getName());
+
 
         if (CollectionUtils.isEmpty(voList)){
             RestAssert.fail("试验项目不存在");
@@ -1368,21 +1370,89 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
             return e.getId();
         }).collect(Collectors.toList());
 
+
         List<SoilItem> soilItemList = soilItemService.list(Condition.create().in("experiment_id",expIdsList));
 
 
         for (SoilExperimentVO vo:voList) {
-             if (StringUtils.isNotBlank(vo.getShortName())){
-                 if ("CD".equals(vo.getShortName())||"CU".equals(vo.getShortName())){
-                     SoilItem item =new  SoilItem();
-                     item.setName("破坏类型");
-                     item.setTestValue("AB");
-                     item.setExperimentId(vo.getId());
-                     soilItemList.add(item);
+            if (StringUtils.isNotBlank(vo.getShortName())){
+                if ("CD".equals(vo.getShortName())||"CU".equals(vo.getShortName())){
+                    SoilItem item =new  SoilItem();
+                    item.setName("破坏类型");
+                    item.setTestValue("AB");
+                    item.setExperimentId(vo.getId());
+                    soilItemList.add(item);
+                }
+            }
+        }
+
+
+
+        if (chong){
+
+
+            Map<String,Integer> checkChongSuMap = new HashMap<>();
+
+            for (SoilExperimentVO vo : voList) {
+                 String name = vo.getName().replace("-重塑","")+vo.getSampleCode();
+                 if (checkChongSuMap.containsKey(name)){
+                   Integer num =  checkChongSuMap.get(name);
+                     num=num+1;
+                     checkChongSuMap.put(name,num);
+                 }else{
+                     checkChongSuMap.put(name,1);
                  }
-             }
+            }
+
+
+            List<SoilExperimentVO> newVOList = new ArrayList<>();
+
+            Map<String,SoilExperimentVO> newChongSuMap = new HashMap<>();
+
+            for (SoilExperimentVO vo:voList) {
+                String name = vo.getName().replace("-重塑","")+vo.getSampleCode();
+
+
+                if (!vo.getName().contains("重塑")){
+                    newVOList.add(vo);
+                }else{
+                    Integer num =  checkChongSuMap.get(name);
+
+                    if (null==num||num == 1) {
+                        newVOList.add(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()+"-重塑"+vo.getSampleCode());
+                if (null!=chongSu){
+                    for (SoilItem item : soilItemList) {
+                        if (item.getExperimentId().equals(chongSu.getId())){
+                            SoilItem  soilItem = item.convert(SoilItem.class);
+                            soilItem.setExperimentId(vo.getId());
+                            saveNewItemList.add(soilItem);
+                        }
+                    }
+                }
+            }
+
+
+            for (SoilItem item : saveNewItemList) {
+                soilItemList.add(item);
+            }
         }
 
+
+
+
+
         Map<Long,List<SoilItem>> expItemMap = new HashMap<>();
         for (SoilItem item:soilItemList) {
             if (!expItemMap.containsKey(item.getExperimentId())){
@@ -2494,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")){
@@ -2685,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("固结")){