抢险任务提交update

王富生
1 parent c6488f67
Showing 3 changed files with 7 additions and 3 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskExcleRespVO.java
urbanops-server/src/main/resources/application.yaml
@@ -3,6 +3,7 @@ package com.zteits.urbanops.module.garden.controller.admin.emergencytask;
 import com.alibaba.fastjson.JSONObject;
 import com.zteits.urbanops.framework.common.biz.system.dict.dto.DictDataRespDTO;
 import jodd.util.StringUtil;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -153,7 +154,7 @@ public class EmergencyTaskController {
                 Integer machineryCount = emergencyMachinery.getMachineryCount();
                 machineryList.add(machineryName + ":" + machineryCount);
             });
-            emergencyTaskExcleRespVO.setMachineryInfo(JSONObject.toJSONString(machineryList));
+            emergencyTaskExcleRespVO.setMachineryInfo(machineryList);
             respList.add(emergencyTaskExcleRespVO);
         });
@@ -162,6 +163,9 @@ public class EmergencyTaskController {
     }
     private String getLabel(List<DictDataRespDTO> dictDataList, Integer id){
+        if(CollectionUtils.isEmpty(dictDataList)){
+            return "";
+        }
         Map<String, String> nameMap = dictDataList.stream()
                 .collect(Collectors.toMap(
                         DictDataRespDTO::getValue,  // Key=id
@@ -105,7 +105,7 @@ public class EmergencyTaskExcleRespVO {
     private String updaterName;
     @ExcelProperty(value="机械信息", converter = ListToStringConverter.class)
-    private String machineryInfo;
+    private List<String> machineryInfo;
     @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "20800")
     @ExcelProperty("归属公司")
@@ -3,7 +3,7 @@ spring:
     name: urbanops-server
   profiles:
-    active: prod
+    active: dev
   main:
     allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。