土工平台修改

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

@@ -451,11 +451,9 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
                         soilItemCollectData.setSampleCode(sampleCode);
                         soilItemCollectData.setUnit(collectEntity.getUnit());
                         soilItemCollectData.setShortName(shortNames);
-                        if ("重塑".equals(sampleOfStatus)){
-                            soilItemCollectData.setStatus(sampleOfStatus);
-                        }
+                        soilItemCollectData.setStatus(sampleOfStatus);
 
-                        if ("short".equals(collectEntity.getAttribute())){
+                        if ("状态判断".equals(collectEntity.getAttribute())){
                             if (StringUtils.isNotBlank(sampleOfStatus)){
                                 if ("原状".equals(sampleOfStatus)){
                                     soilItemCollectData.setItemName("原状土"+itemName);
@@ -512,9 +510,7 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
                                 soilItemCollectData.setTestValue(value);
                                 soilItemCollectData.setSampleCode(sampleCode);
                                 soilItemCollectData.setShortName(shortNames);
-                                if ("重塑".equals(sampleOfStatus)){
-                                    soilItemCollectData.setStatus(sampleOfStatus);
-                                }
+                                soilItemCollectData.setStatus(sampleOfStatus);
                                 soilItemCollectData.setUnit(collectEntity.getUnit());
                                 soilItemList.add(soilItemCollectData);
                             }
@@ -530,9 +526,7 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
                             soilItemCollectData.setTestValue(value);
                             soilItemCollectData.setSampleCode(sampleCode);
                             soilItemCollectData.setShortName(shortNames);
-                            if ("重塑".equals(sampleOfStatus)){
-                                soilItemCollectData.setStatus(sampleOfStatus);
-                            }
+                            soilItemCollectData.setStatus(sampleOfStatus);
                             soilItemCollectData.setUnit(collectEntity.getUnit());
                             soilItemList.add(soilItemCollectData);
                         }
@@ -566,11 +560,34 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
                  String shortNameTest =     soilItemCollectData.getShortName();
                  String status =     soilItemCollectData.getStatus();
 
+
                     for (SoilExperiment experiment:expList) {
-                           if (experiment.getName().contains(shortNameTest)||experiment.getName().contains(status)){
+                           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;