BJ_FS / urbanops

Commit e5a12b7a6cf5879c2776a332d2b78e363bbe38cd

Authored by 王富生
1 parent 41adcfa7

抢险任务提交update

Inline Side-by-side
Showing 1 changed file with 13 additions and 8 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java
  View file @e5a12b7
... ... @@ -93,7 +93,7 @@ public class EmergencyTaskController {
93 93  
94 94 @GetMapping("/page")
95 95 @Operation(summary = "获得抢险任务主分页")
96   - @PreAuthorize("@ss.hasPermission('garden:emergency-task:query')")
  96 + // @PreAuthorize("@ss.hasPermission('garden:emergency-task:query')")
97 97 public CommonResult<PageResult<EmergencyTaskRespVO>> getEmergencyTaskPage(@Valid EmergencyTaskPageReqVO pageReqVO) {
98 98 PageResult<EmergencyTaskRespVO> pageResult = emergencyTaskService.getEmergencyTaskPage(pageReqVO);
99 99 return success(pageResult);
... ... @@ -149,15 +149,20 @@ public class EmergencyTaskController {
149 149 emergencyTaskExcleRespVO.setCreatorName(emergencyTask.getCreatorName());
150 150 emergencyTaskExcleRespVO.setCreateTime(emergencyTask.getCreateTime());
151 151 List<String> machineryList = new ArrayList<>();
152   - emergencyTask.getEmergencyMachineryList().forEach(emergencyMachinery -> {
153   - String machineryName = getLabel(mechanicalTypeNameList, emergencyMachinery.getMachineryNameId());
154   - Integer machineryCount = emergencyMachinery.getMachineryCount();
155   - machineryList.add(machineryName + ":" + machineryCount);
156   - });
157   - emergencyTaskExcleRespVO.setMachineryInfo(machineryList);
158   - respList.add(emergencyTaskExcleRespVO);
  152 + if(CollectionUtils.isEmpty(emergencyTask.getEmergencyMachineryList())){
  153 + emergencyTaskExcleRespVO.setMachineryInfo(Collections.EMPTY_LIST);
  154 + }else{
  155 + emergencyTask.getEmergencyMachineryList().forEach(emergencyMachinery -> {
  156 + String machineryName = getLabel(mechanicalTypeNameList, emergencyMachinery.getMachineryNameId());
  157 + Integer machineryCount = emergencyMachinery.getMachineryCount();
  158 + machineryList.add(machineryName + ":" + machineryCount);
  159 + });
  160 + respList.add(emergencyTaskExcleRespVO);
  161 + emergencyTaskExcleRespVO.setMachineryInfo(machineryList);
  162 + }
159 163 });
160 164  
  165 +
161 166 // 导出 Excel
162 167 ExcelUtils.write(response, "抢险任务主.xls", "数据", EmergencyTaskExcleRespVO.class, respList);
163 168 }
... ...