From e5a12b7a6cf5879c2776a332d2b78e363bbe38cd Mon Sep 17 00:00:00 2001 From: wangfs <15029758498@163.com> Date: Thu, 12 Mar 2026 22:00:26 +0800 Subject: [PATCH] 抢险任务提交update --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java index f1ce75a..b10a3dd 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java @@ -93,7 +93,7 @@ public class EmergencyTaskController { @GetMapping("/page") @Operation(summary = "获得抢险任务主分页") - @PreAuthorize("@ss.hasPermission('garden:emergency-task:query')") + // @PreAuthorize("@ss.hasPermission('garden:emergency-task:query')") public CommonResult> getEmergencyTaskPage(@Valid EmergencyTaskPageReqVO pageReqVO) { PageResult pageResult = emergencyTaskService.getEmergencyTaskPage(pageReqVO); return success(pageResult); @@ -149,15 +149,20 @@ public class EmergencyTaskController { emergencyTaskExcleRespVO.setCreatorName(emergencyTask.getCreatorName()); emergencyTaskExcleRespVO.setCreateTime(emergencyTask.getCreateTime()); List machineryList = new ArrayList<>(); - emergencyTask.getEmergencyMachineryList().forEach(emergencyMachinery -> { - String machineryName = getLabel(mechanicalTypeNameList, emergencyMachinery.getMachineryNameId()); - Integer machineryCount = emergencyMachinery.getMachineryCount(); - machineryList.add(machineryName + ":" + machineryCount); - }); - emergencyTaskExcleRespVO.setMachineryInfo(machineryList); - respList.add(emergencyTaskExcleRespVO); + if(CollectionUtils.isEmpty(emergencyTask.getEmergencyMachineryList())){ + emergencyTaskExcleRespVO.setMachineryInfo(Collections.EMPTY_LIST); + }else{ + emergencyTask.getEmergencyMachineryList().forEach(emergencyMachinery -> { + String machineryName = getLabel(mechanicalTypeNameList, emergencyMachinery.getMachineryNameId()); + Integer machineryCount = emergencyMachinery.getMachineryCount(); + machineryList.add(machineryName + ":" + machineryCount); + }); + respList.add(emergencyTaskExcleRespVO); + emergencyTaskExcleRespVO.setMachineryInfo(machineryList); + } }); + // 导出 Excel ExcelUtils.write(response, "抢险任务主.xls", "数据", EmergencyTaskExcleRespVO.class, respList); } -- libgit2 0.21.4