Commit 9fcc95ab by wangweidong

土工试验优化

parent 70a27b7b
...@@ -15,7 +15,7 @@ import java.util.Map; ...@@ -15,7 +15,7 @@ import java.util.Map;
public final class ReportUtil { public final class ReportUtil {
public static void initChongSu(List<SoilExperimentVO> voList,List<SoilItem> soilItemList){ public static List<SoilExperimentVO> initChongSu(List<SoilExperimentVO> voList,List<SoilItem> soilItemList){
Map<String,Integer> checkChongSuMap = new HashMap<>(); Map<String,Integer> checkChongSuMap = new HashMap<>();
for (SoilExperimentVO vo : voList) { for (SoilExperimentVO vo : voList) {
...@@ -59,6 +59,7 @@ public final class ReportUtil { ...@@ -59,6 +59,7 @@ public final class ReportUtil {
for (SoilItem item : saveNewItemList) { for (SoilItem item : saveNewItemList) {
soilItemList.add(item); soilItemList.add(item);
} }
return voList;
} }
......
...@@ -671,7 +671,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap ...@@ -671,7 +671,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
if (chong){ if (chong){
ReportUtil.initChongSu(voList,soilItemList); voList = ReportUtil.initChongSu(voList,soilItemList);
} }
Map<Long,List<SoilItem>> expItemMap = new HashMap<>(); Map<Long,List<SoilItem>> expItemMap = new HashMap<>();
for (SoilItem item:soilItemList) { for (SoilItem item:soilItemList) {
......
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