土工平台修改

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

@@ -18,6 +18,7 @@ import com.patzn.cloud.service.eln.entity.ElnTemplate;
 import com.patzn.cloud.service.lims.soil.mapper.SoilOriginalRecordMapper;
 import com.patzn.cloud.service.lims.soil.service.ISoilExpRelOriginalRecordService;
 import com.patzn.cloud.service.lims.soil.service.ISoilExperimentService;
+import com.patzn.cloud.service.lims.soil.service.ISoilItemService;
 import com.patzn.cloud.service.lims.soil.service.ISoilOriginalRecordService;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
 import com.patzn.cloud.service.soil.entity.*;
@@ -53,6 +54,8 @@ public class SoilOriginalRecordServiceImpl extends BaseServiceImpl<SoilOriginalR
     @Autowired
     private ISoilExpRelOriginalRecordService soilExpRelOriginalRecordService;
 
+    @Autowired
+    private ISoilItemService soilItemService;
 
     @Autowired
     private OssClient ossClient;
@@ -135,6 +138,18 @@ public class SoilOriginalRecordServiceImpl extends BaseServiceImpl<SoilOriginalR
                     return r.getId();
                 }).collect(Collectors.toList());
                 soilExpRelOriginalRecordService.remove(Condition.create().in("id",relIds));
+
+                List<Long> expIdsList = new ArrayList<>();
+                for (SoilExpRelOriginalRecord originalRecord:relOriginalRecords) {
+                    if (null != originalRecord.getExpId()){
+                        expIdsList.add(originalRecord.getExpId());
+                    }
+                }
+                if (CollectionUtils.isNotEmpty(expIdsList)){
+                    soilItemService.remove(Condition.create().in("experiment_id",expIdsList));
+                }
+
+
             }
         }
         return true;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.mapper.Condition;
 import com.patzn.cloud.commons.api.RestAssert;
 import com.patzn.cloud.oss.starter.OssClient;
 import com.patzn.cloud.oss.starter.OssFileResult;
+import com.patzn.cloud.service.lims.common.HSSFWorkbookUtil;
 import com.patzn.cloud.service.lims.handler.ItemCollectEntity;
 import com.patzn.cloud.service.lims.handler.SoilItemCollectData;
 import com.patzn.cloud.service.lims.soil.mapper.SoilOriginalTemplateMapper;
@@ -12,8 +13,6 @@ import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
 import com.patzn.cloud.service.soil.entity.*;
 import com.patzn.cloud.service.soil.vo.SoilExperimentVO;
 import com.patzn.cloud.service.soil.vo.SoilItemVO;
-import com.patzn.poibox.xwpf.HSSFWorkbookUtil;
-import org.apache.bcel.generic.IF_ACMPEQ;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.DataFormatter;
@@ -305,7 +304,8 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
         for (SoilItemVO soilItemVO:indexList) {
             stringMap.put(soilItemVO.getSampleCode()+soilItemVO.getExperimentId()+soilItemVO.getName(),soilItemVO.getId());
         }
-
+        FormulaEvaluator evaluator = xssfWorkbook.getCreationHelper().createFormulaEvaluator();
+        DataFormatter formatter = new DataFormatter();
         if (null ==moreSheet || 0 == moreSheet){
             int sampleBeginRow = template.getSampleBeginRow();
             int sampleMergerNum = template.getSampleMergerNum();
@@ -364,8 +364,8 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
 
             List<SoilItemCollectData> soilItemList = new ArrayList<>();
 
-            DataFormatter formatter = new DataFormatter();
-            FormulaEvaluator evaluator = xssfWorkbook.getCreationHelper().createFormulaEvaluator();
+
+
             for (int i = sampleBeginRow;i<lastRowNum;i+=sampleMergerNum) {
                 XSSFRow xssfRow = sheet.getRow(i);
                 XSSFCell sampleCodeCell = xssfRow.getCell(sampleCol);
@@ -583,7 +583,7 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
                                 continue;
                             }
 
-                            String value = HSSFWorkbookUtil.getJavaValue(valueCell).toString();
+                             String value = formatter.formatCellValue(valueCell, evaluator);
 
                             if (StringUtils.isBlank(value)){
                                 continue;