Skip to content

P
patzn-cloud-service-soil
Commit c3c03ef7 by wangweidong
Options

土工平台修改

parent e00076b9
Showing with 32 additions and 0 deletions
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExpReportServiceImpl.java
...@@ -847,6 +847,38 @@ public class SoilExpReportServiceImpl extends BaseServiceImpl<SoilExpReportMappe ...@@ -847,6 +847,38 @@ public class SoilExpReportServiceImpl extends BaseServiceImpl<SoilExpReportMappe
} }
} }
}else if (expName.equals("颗粒分析")){
if (vo.getSampleCode().equals(experiment.getSampleCode())&&"颗粒分析-Hyd".equals(experiment.getName())){
List<SoilItem> itemList = experiment.getItemList();
if (CollectionUtils.isNotEmpty(itemList)){
for (SoilItem item:itemList) {
if (itemName.equals(item.getName())){
cell.setCellValue(item.getTestValue());
break;
}
}
}
}else if (vo.getSampleCode().equals(experiment.getSampleCode())&&"颗粒分析-Sieve".equals(experiment.getName())){
List<SoilItem> itemList = experiment.getItemList();
if (CollectionUtils.isNotEmpty(itemList)){
for (SoilItem item:itemList) {
if (itemName.equals(item.getName())){
cell.setCellValue(item.getTestValue());
break;
}
}
}
}else if (vo.getSampleCode().equals(experiment.getSampleCode())&&"颗粒分析-200".equals(experiment.getName())){
List<SoilItem> itemList = experiment.getItemList();
if (CollectionUtils.isNotEmpty(itemList)){
for (SoilItem item:itemList) {
if (itemName.equals(item.getName())){
cell.setCellValue(item.getTestValue());
break;
}
}
}
}
}else{ }else{
if (vo.getSampleCode().equals(experiment.getSampleCode())&&expName.equals(experiment.getName())){ if (vo.getSampleCode().equals(experiment.getSampleCode())&&expName.equals(experiment.getName())){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment