Commit 57978475ec1f7a2fac0d05f574a8b0b04f6a094e
1 parent
5b722fb3
抢险任务提交update
Showing
1 changed file
with
2 additions
and
2 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java
| @@ -148,16 +148,16 @@ public class EmergencyTaskController { | @@ -148,16 +148,16 @@ public class EmergencyTaskController { | ||
| 148 | emergencyTaskExcleRespVO.setCreateTime(emergencyTask.getCreateTime()); | 148 | emergencyTaskExcleRespVO.setCreateTime(emergencyTask.getCreateTime()); |
| 149 | List<String> machineryList = new ArrayList<>(); | 149 | List<String> machineryList = new ArrayList<>(); |
| 150 | if(CollectionUtils.isEmpty(emergencyTask.getEmergencyMachineryList())){ | 150 | if(CollectionUtils.isEmpty(emergencyTask.getEmergencyMachineryList())){ |
| 151 | - emergencyTaskExcleRespVO.setMachineryInfo(Collections.EMPTY_LIST); | 151 | + emergencyTaskExcleRespVO.setMachineryInfo(Collections.emptyList()); |
| 152 | }else{ | 152 | }else{ |
| 153 | emergencyTask.getEmergencyMachineryList().forEach(emergencyMachinery -> { | 153 | emergencyTask.getEmergencyMachineryList().forEach(emergencyMachinery -> { |
| 154 | String machineryName = getLabel(mechanicalTypeNameList, emergencyMachinery.getMachineryNameId()); | 154 | String machineryName = getLabel(mechanicalTypeNameList, emergencyMachinery.getMachineryNameId()); |
| 155 | Integer machineryCount = emergencyMachinery.getMachineryCount(); | 155 | Integer machineryCount = emergencyMachinery.getMachineryCount(); |
| 156 | machineryList.add(machineryName + ":" + machineryCount); | 156 | machineryList.add(machineryName + ":" + machineryCount); |
| 157 | }); | 157 | }); |
| 158 | - respList.add(emergencyTaskExcleRespVO); | ||
| 159 | emergencyTaskExcleRespVO.setMachineryInfo(machineryList); | 158 | emergencyTaskExcleRespVO.setMachineryInfo(machineryList); |
| 160 | } | 159 | } |
| 160 | + respList.add(emergencyTaskExcleRespVO); | ||
| 161 | }); | 161 | }); |
| 162 | 162 | ||
| 163 | 163 |