Merge branch 'dev'

src/main/java/com/patzn/cloud/service/lims/common/CollectUtil.java

@@ -108,6 +108,7 @@ public class CollectUtil {
                     content = content.replace("原 状Qu","原状Qu");
                     content = content.replace("重 塑Qu","重塑Qu");
                     content = content.replace("固结系数(t90):","固结系数(t90)");
+                    content = content.replace("固结系数(100-200Kpa):","固结系数(100-200Kpa)");
                     content = content.replace("压缩系数(100-200KPa):","压缩系数(100-200KPa)");
                     content = content.replace("压缩模量(100-200KPa):","压缩模量(100-200KPa)");
                     content = content.replace("压缩系数(100-200KPa)：","压缩系数(100-200KPa)");
@@ -142,6 +143,7 @@ public class CollectUtil {
             String yasuomoliang100to200 = "";
             String testMethod = "";
             String gujieT90 = "";
+            String gujieXishu100200 = "";
 
 
             String youxiaonianjuli = "";
@@ -247,6 +249,21 @@ public class CollectUtil {
                     }
                 }
 
+
+                if ("固结系数(100-200Kpa)".equals(str)){
+                    gujieXishu100200 = titleList.get(i+1);
+                    if (StringUtils.isNotBlank(gujieXishu100200)){
+                        SoilExperimentCollectData collectData = new SoilExperimentCollectData();
+                        collectData.setName("固结系数(100-200Kpa)");
+                        collectData.setTestValue(gujieXishu100200);
+                        if (i+2<size){
+                            collectData.setUnit(titleList.get(i+2));
+                        }
+                        dataList.add(collectData);
+                    }
+                }
+
+
                 if ("有效凝聚力".equals(str)){
                     youxiaonianjuli = titleList.get(i+1);
                     if (StringUtils.isNotBlank(youxiaonianjuli)){

src/main/resources/mapper/soil/SoilExperimentMapper.xml

@@ -298,7 +298,7 @@
                 #{id}
             </foreach>
         </if>
-        ORDER BY s.sample_code
+        ORDER BY s.sample_code,t.name
     </select>