土工平台修改

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

@@ -365,6 +365,7 @@ public class CollectUtil {
                     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)");
                     content = content.replace("压缩系数(100-200KPa)：","压缩系数(100-200KPa)");

src/main/java/com/patzn/cloud/service/lims/soil/mapper/SoilItemMapper.java

@@ -22,5 +22,7 @@ public interface SoilItemMapper extends BaseMapper<SoilItem> {
 
     List<SoilItemVO> listVOByExpSampleIds(@Param("sampleIds") List<Long> sampleIds);
 
+    List<SoilItemVO> listVOByExpSampleIdsSenior(@Param("sampleIds") List<Long> sampleIds);
+
     List<SoilItemVO> selectForTestPage(@Param("sampleIds")List<Long> sampleIdsList, @Param("status")SoilExpStatusEnum statusEnum);
 }

src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilItemService.java

@@ -28,5 +28,7 @@ public interface ISoilItemService extends IBaseService<SoilItem> {
 
     List<SoilItemVO> listVOByExpSampleIds(List<Long> sampleIdList);
 
+    List<SoilItemVO> listVOByExpSampleIdsForSenior(List<Long> sampleIdList);
+
     List<SoilItemVO> listForTestPage(List<Long> sampleIdsList, SoilExpStatusEnum end);
 }

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

@@ -1947,10 +1947,24 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
 
                 mapReplace.put("#{sampleCode}",firstVO.getSampleCode());
                 mapReplace.put("#{siteNo}",firstVO.getSiteNo());
-                HSSFWorkbookUtil.replaceModel(mapReplace,xssfWorkbook,xssfSheet);
 
-                int length = voList.size();
+                String midu = mapReplace.get("#{密度}");
+                if (StringUtils.isNotBlank(midu)){
+                    try {
+                        BigDecimal bigDecimal = new BigDecimal(midu);
+                        BigDecimal mul = new BigDecimal("9.81");
 
+                        BigDecimal rz981 = bigDecimal.multiply(mul);
+                        mapReplace.put("#{密度9.81}",rz981.toString());
+
+                    }catch (Exception e){
+                        logger.error("密度9.81失败"+e.getMessage());
+                        mapReplace.put("#{密度9.81}","");
+                    }
+                }else{
+                    mapReplace.put("#{密度9.81}","");
+                }
+                HSSFWorkbookUtil.replaceModel(mapReplace,xssfWorkbook,xssfSheet);
 //                for (int i = 0; i < length; i++) {
 //
 //
@@ -2052,6 +2066,22 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                         }
                     }
 
+                    String midu = mapReplace.get("#{密度}");
+                    if (StringUtils.isNotBlank(midu)){
+                        try {
+                            BigDecimal bigDecimal = new BigDecimal(midu);
+                            BigDecimal mul = new BigDecimal("9.81");
+
+                            BigDecimal rz981 = bigDecimal.multiply(mul);
+                            mapReplace.put("#{密度9.81}",rz981.toString());
+
+                        }catch (Exception e){
+                            logger.error("密度9.81失败"+e.getMessage());
+                            mapReplace.put("#{密度9.81}","");
+                        }
+                    }else{
+                        mapReplace.put("#{密度9.81}","");
+                    }
                     HSSFWorkbookUtil.replaceModel(mapReplaceMy,xssfWorkbook,sheet);
                     templateSheetMum++;
                 }

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

 package com.patzn.cloud.service.lims.soil.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
+import com.baomidou.mybatisplus.mapper.Condition;
+import com.baomidou.mybatisplus.toolkit.CollectionUtils;
+import com.patzn.cloud.service.lims.soil.service.ISoilSampleService;
 import com.patzn.cloud.service.soil.entity.SoilItem;
 import com.patzn.cloud.service.lims.soil.mapper.SoilItemMapper;
 import com.patzn.cloud.service.lims.soil.service.ISoilItemService;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import com.patzn.cloud.service.soil.entity.SoilSample;
 import com.patzn.cloud.service.soil.enums.SoilExpStatusEnum;
 import com.patzn.cloud.service.soil.vo.SoilItemVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -25,6 +32,9 @@ import com.baomidou.mybatisplus.plugins.Page;
 public class SoilItemServiceImpl extends BaseServiceImpl<SoilItemMapper, SoilItem> implements ISoilItemService {
 
 
+    @Autowired
+    private ISoilSampleService soilSampleService;
+
     @Override
     public Page<SoilItem> page(Page<SoilItem> page, SoilItem soilItem) {
         Wrapper wrapper = new EntityWrapper<>(soilItem);
@@ -44,8 +54,64 @@ public class SoilItemServiceImpl extends BaseServiceImpl<SoilItemMapper, SoilIte
     }
 
     @Override
-    public List<SoilItemVO> listVOByExpSampleIds(List<Long> expIdsList) {
-        return baseMapper.listVOByExpSampleIds(expIdsList);
+    public List<SoilItemVO> listVOByExpSampleIds(List<Long> sampleIdList) {
+        return baseMapper.listVOByExpSampleIds(sampleIdList);
+    }
+
+    @Override
+    public List<SoilItemVO> listVOByExpSampleIdsForSenior(List<Long> sampleIdList) {
+
+        List<SoilItemVO> list = baseMapper.listVOByExpSampleIdsSenior(sampleIdList);
+        if (CollectionUtils.isNotEmpty(list)){
+
+            List<String> sampleCodeList = new ArrayList<>();
+
+            for (SoilItemVO itemVO : list) {
+                if (itemVO.getSampleCode().contains("-")){
+                    sampleCodeList.add(itemVO.getSampleCode().split("-")[0]);
+                }
+            }
+
+            if (CollectionUtils.isEmpty(sampleCodeList)){
+                  return list;
+            }
+            List<SoilSample> sampleList = soilSampleService.list(Condition.create().in("sample_code",sampleCodeList));
+            if (CollectionUtils.isEmpty(sampleList)){
+                return list;
+            }
+
+            List<Long>sampleIdsSplitOldList = sampleList.stream().map(s->{
+                return s.getId();
+            }).collect(Collectors.toList());
+
+            List<SoilItemVO> listSplitOld = baseMapper.listVOByExpSampleIdsSenior(sampleIdsSplitOldList);
+            if (CollectionUtils.isEmpty(listSplitOld)){
+                return list;
+            }
+
+            List<SoilItemVO> addList = new ArrayList<>();
+            for (SoilItemVO vo : list) {
+                if (!vo.getSampleCode().contains("-")){
+                    continue;
+                }
+                String codeSample =vo.getSampleCode().split("-")[0];
+
+                for (SoilItemVO soilItemVO : listSplitOld) {
+                      if (soilItemVO.getSampleCode().equals(codeSample)){
+                          SoilItemVO item = soilItemVO.convert(SoilItemVO.class);
+                          item.setSampleId(vo.getSampleId());
+                          addList.add(item);
+                      }
+                }
+            }
+            if (CollectionUtils.isEmpty(addList)){
+                return list;
+            }
+            for (SoilItemVO vo : addList) {
+                  list.add(vo);
+            }
+        }
+        return list;
     }
 
     @Override

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

@@ -20,7 +20,7 @@
 
 
     <select id="listVOByExpSampleIds" resultType="com.patzn.cloud.service.soil.vo.SoilItemVO">
-        SELECT i.id,i.name,i.experiment_id,s.sample_code,s.id AS sample_id,i.test_value FROM soil_item i JOIN
+        SELECT i.id,i.name,i.experiment_id,s.sample_code,s.id AS sample_id,i.test_value,s.sample_code FROM soil_item i JOIN
 
         soil_experiment t ON i.experiment_id = t.id
 
@@ -35,6 +35,23 @@
     </select>
 
 
+    <select id="listVOByExpSampleIdsSenior" resultType="com.patzn.cloud.service.soil.vo.SoilItemVO">
+        SELECT i.id,i.name,i.experiment_id,s.sample_code,s.id AS sample_id,i.test_value,s.sample_code FROM soil_item i JOIN
+
+        soil_experiment t ON i.experiment_id = t.id
+
+        JOIN soil_sample s ON t.sample_id = s.id
+
+        WHERE i.deleted =0 AND t.deleted = 0 AND s.deleted = 0
+
+        AND s.id IN
+        <foreach collection="sampleIds" index="index" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
+
+
     <select id="selectForTestPage" resultType="com.patzn.cloud.service.soil.vo.SoilItemVO">
         SELECT
         s.sample_code,i.name ,i.test_value,i.unit