|
|
@@ -24,10 +24,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
|
|
24
|
24
|
import org.springframework.web.bind.annotation.RestController;
|
|
25
|
25
|
|
|
26
|
26
|
import javax.annotation.Resource;
|
|
27
|
|
-import java.util.Date;
|
|
28
|
|
-import java.util.HashMap;
|
|
29
|
|
-import java.util.List;
|
|
30
|
|
-import java.util.Map;
|
|
|
27
|
+import java.util.*;
|
|
31
|
28
|
|
|
32
|
29
|
/**
|
|
33
|
30
|
* @author lvzhikai
|
|
|
@@ -142,8 +139,12 @@ public class FumigationProcessController {
|
|
142
|
139
|
TFumigationPlan tFumigationPlan = fumigationPlanService.findById(tFumigationProcess.getFumigationId());
|
|
143
|
140
|
modelMap.put("fumigationEdit",tFumigationPlan);//熏蒸方案数据
|
|
144
|
141
|
|
|
145
|
|
- List<TQtdevinfoValue> tQtdevinfoValue = gasDetectionService.getList("","","","'"+tFumigationProcess.getDcsqtinfoId()+"'");
|
|
|
142
|
+ List<TQtdevinfoValue> tQtdevinfoValue = new ArrayList<>();
|
|
|
143
|
+ if (ParameterUtil.isnotnull(tFumigationProcess.getDcsqtinfoId())) {
|
|
|
144
|
+ tQtdevinfoValue = gasDetectionService.getList("","","",tFumigationProcess.getDcsqtinfoId());
|
|
|
145
|
+ }
|
|
146
|
146
|
modelMap.put("tQtdevinfoEdit",tQtdevinfoValue);//气体数据
|
|
|
147
|
+
|
|
147
|
148
|
}
|
|
148
|
149
|
|
|
149
|
150
|
return modelMap;
|