lvzhikai пре 4 година
родитељ
комит
387584ffd6

+ 6 - 5
src/main/java/com/chinaitop/depot/intelligent/fumigation/controller/FumigationProcessController.java

@@ -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;

+ 1 - 1
src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/impl/GasDetectionServiceImpl.java

@@ -48,7 +48,7 @@ public class GasDetectionServiceImpl implements GasDetectionService {
48 48
             map.put("searchEndDate", endTime + DateUtils.endTime);
49 49
         }
50 50
         if (ParameterUtil.isnotnull(id)) {
51
-            map.put("id", "("+id+")");
51
+            map.put("id", "("+ParameterUtil.getBHS(id)+")");
52 52
         }
53 53
         return tQtdevinfoValueMapper.getByCfCdoe(map);
54 54
     }