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 f428e70..65aa360 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 @@ -140,7 +140,6 @@ public class EmergencyTaskController { emergencyTaskExcleRespVO.setRemarks(emergencyTask.getRemarks()); emergencyTaskExcleRespVO.setBusiStatus(getLabel(rescueStatusList, emergencyTask.getBusiStatus())); emergencyTaskExcleRespVO.setCompanyName(emergencyTask.getCompanyName()); - emergencyTaskExcleRespVO.setDeptName(emergencyTask.getDeptName()); emergencyTaskExcleRespVO.setApprovalUserName(emergencyTask.getApprovalUserName()); emergencyTaskExcleRespVO.setApprovalRemarks(emergencyTask.getApprovalRemarks()); emergencyTaskExcleRespVO.setCreatorName(emergencyTask.getCreatorName()); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskExcleRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskExcleRespVO.java index 31c3b9a..022500e 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskExcleRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskExcleRespVO.java @@ -111,9 +111,4 @@ public class EmergencyTaskExcleRespVO { @ExcelProperty("归属公司") private String companyName; - - @Schema(description = "部门(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "12055") - @ExcelProperty("果蔬部门") - private String deptName; - } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskRespVO.java index 0969603..e2a7f39 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskRespVO.java @@ -132,7 +132,6 @@ public class EmergencyTaskRespVO { @ExcelProperty("归属(一级部门id)") private String companyName; - @Schema(description = "部门(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "12055") @ExcelProperty("部门") private String deptName; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java index 0b1584b..43033ad 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java @@ -239,11 +239,11 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService { Map deptMap = deptApi.getDeptMap(deptIds); list.forEach(plan -> { - DeptRespDTO dept = deptMap.get(plan.getDeptId()); - if (dept != null) { - plan.setDeptName(dept.getName()); - - } +// DeptRespDTO dept = deptMap.get(plan.getDeptId()); +// if (dept != null) { +// plan.setDeptName(dept.getName()); +// +// } DeptRespDTO company = deptMap.get(plan.getCompanyId()); if(company != null){ plan.setCompanyName(company.getName());