Merge branch 'dev'

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

@@ -38,6 +38,10 @@ public class CollectUtil {
                 content = content.replace("灵 敏 度","灵敏度");
                 content = content.replace("粘 聚 力","凝聚力");
                 content = content.replace("粘聚力","凝聚力");
+                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)");
                 String[] dataArray = content.split(" ");
                 for (String handleS:dataArray) {
                      handleS=handleS.trim();

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

@@ -2435,10 +2435,11 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
             String originalFilename = multipartFile.getOriginalFilename();
             if (originalFilename.contains(".bmp")||originalFilename.contains(".txt")){
                 String nameCode = originalFilename.replace(".bmp","").replace(".txt","");
-                String lastName =  name.substring(name.length()-1,name.length());
+                String lastName =  nameCode.substring(nameCode.length()-1,nameCode.length());
                 if ("r".equals(lastName)){
                      if (nameCode.contains("三轴压缩")&&(!nameCode.contains("重塑"))){
                          nameCode =  nameCode.replace("三轴压缩","三轴压缩重塑");
+                         nameCode = nameCode.substring(0, nameCode.length() - 1);
                      }
                 }
                 if (!nameCodeList.containsKey(nameCode)){
@@ -2463,10 +2464,11 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
 
             if (originalFilename.contains(".bmp")||originalFilename.contains(".txt")){
                 String nameCode = originalFilename.replace(".bmp","").replace(".txt","");
-                String lastName =  name.substring(name.length()-1,name.length());
+                String lastName =  nameCode.substring(nameCode.length()-1,nameCode.length());
                 if ("r".equals(lastName)){
                     if (nameCode.contains("三轴压缩")&&(!nameCode.contains("重塑"))){
                         nameCode =  nameCode.replace("三轴压缩","三轴压缩重塑");
+                        nameCode = nameCode.substring(0, nameCode.length() - 1);
                     }
                 }
                 SoilExperimentVO vo = nameCodeList.get(nameCode);

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

@@ -354,6 +354,7 @@
         t.group_name,
         t.group_id,
         s.sample_code,
+        s.site_no,
         s.sample_depth,
         s.describe_detail,
         s.sample_pack,