土工平台修改

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

@@ -261,11 +261,11 @@ public class CollectUtil {
                 }
 
 
-                if ("有效摩擦角".equals(str)){
+                if ("有效内摩擦角".equals(str)){
                     youxiaomocajiao = titleList.get(i+1);
                     if (StringUtils.isNotBlank(youxiaomocajiao)){
                         SoilExperimentCollectData collectData = new SoilExperimentCollectData();
-                        collectData.setName("有效摩擦角");
+                        collectData.setName("有效内摩擦角");
                         collectData.setTestValue(youxiaomocajiao);
                         if (i+2<size){
                             collectData.setUnit(titleList.get(i+2));

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

@@ -93,6 +93,11 @@ public class SoilExpReportServiceImpl extends BaseServiceImpl<SoilExpReportMappe
     public Page<SoilExpReport> page(Page<SoilExpReport> page, SoilExpReport soilExpReport) {
         Wrapper wrapper = new EntityWrapper<>(soilExpReport);
 
+        if (StringUtils.isNotBlank(soilExpReport.getExpName())){
+            wrapper.like("exp_name",soilExpReport.getExpName());
+            soilExpReport.setExpName(null);
+        }
+        wrapper.orderBy("version",true);
         return this.page(page, wrapper);
     }
 
@@ -149,7 +154,7 @@ public class SoilExpReportServiceImpl extends BaseServiceImpl<SoilExpReportMappe
         RestAssert.fail(null == template,"报告模板不存在");
         SoilEntrust entrust = soilEntrustService.getById(entrustId);
         RestAssert.fail(null ==entrust,"委托单不存在");
-        List<SoilExpReport> reportList = soilExpReportService.list(Condition.create().in("id",expReportIds));
+        List<SoilExpReport> reportList = soilExpReportService.list(Condition.create().in("id",expReportIds).orderBy("version",true));
         InputStream ioPut = ossClient.download(template.getObjectKey());
         RestAssert.fail(null == ioPut,"模板不存在");
         XSSFWorkbook xssfWorkbook=  HSSFWorkbookUtil.getWorkbookByIO(ioPut);

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

@@ -1364,15 +1364,25 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
         }
 
         List<SoilSampleVO> sampleList = soilSampleService.listVOByIds(sampleIdList);
-
-
-
         List<Long> expIdsList = voList.stream().map(e->{
             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);
+                 }
+             }
+        }
+
         Map<Long,List<SoilItem>> expItemMap = new HashMap<>();
         for (SoilItem item:soilItemList) {
             if (!expItemMap.containsKey(item.getExperimentId())){