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 25d9f66..984e6f7 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,4 +132,13 @@ public class EmergencyTaskRespVO { private List emergencyMachineryList; + @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "20800") + @ExcelProperty("归属(一级部门id)") + 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/service/emergencytask/EmergencyTaskServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java index 7595fee..608f2b4 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 @@ -8,16 +8,22 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; +import com.zteits.urbanops.module.garden.controller.admin.road.vo.RoadRespVO; import com.zteits.urbanops.module.garden.dal.dataobject.emergencytask.EmergencyMachineryDO; import com.zteits.urbanops.module.garden.dal.mysql.emergencytask.EmergencyMachineryMapper; +import com.zteits.urbanops.module.system.api.dept.DeptApi; +import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO; import jodd.util.StringUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; +import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; import java.util.*; +import java.util.stream.Collectors; + import com.zteits.urbanops.module.garden.controller.admin.emergencytask.vo.*; import com.zteits.urbanops.module.garden.dal.dataobject.emergencytask.EmergencyTaskDO; import com.zteits.urbanops.framework.common.pojo.PageResult; @@ -46,6 +52,9 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService { @Resource private EmergencyMachineryMapper emergencyMachineryMapper; + @Resource + protected DeptApi deptApi; + @Transactional(rollbackFor = Exception.class) @Override public Long createEmergencyTask(EmergencyTaskSaveReqVO createReqVO) { @@ -193,11 +202,41 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService { emergencyTaskRespVO.setEmergencyMachineryList(detailList); } }); + addDataInspectionPlan(listTwo); // 转换返回 return new PageResult<>(listTwo, page.getTotal()); } + /** + * 回填部门/公司/角色 + * @param list 分页对象 + */ + private void addDataInspectionPlan(List list ){ + if(CollectionUtils.isEmpty(list)){ + return ; + } + //公司 + Set companyIds = list.stream().map(EmergencyTaskRespVO::getCompanyId).collect(Collectors.toSet()); + //部门 + Set deptIds = list.stream().map(EmergencyTaskRespVO::getDeptId).collect(Collectors.toSet()); + deptIds.addAll(companyIds); + /*1.获取部门*/ + Map deptMap = deptApi.getDeptMap(deptIds); + + list.forEach(plan -> { + 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()); + } + }); + } + } \ No newline at end of file