From 2d5662104db14f7c043d9dae26490a135aa0edf2 Mon Sep 17 00:00:00 2001 From: wangqian <1406304305@qq.com> Date: Thu, 18 Dec 2025 23:06:43 +0800 Subject: [PATCH] 工单管理详情字段翻译 --- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java | 27 ++++++++++++++++++++------- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoRespVO.java | 10 ++++++++++ urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java | 29 ++++++++++++++++++++++++----- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoDO.java | 6 +++--- 4 files changed, 57 insertions(+), 15 deletions(-) diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java index 0cbc896..59a951e 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java @@ -1,13 +1,15 @@ package com.zteits.urbanops.module.workorder.controller.admin.maininfo; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog; import com.zteits.urbanops.framework.common.pojo.CommonResult; import com.zteits.urbanops.framework.common.pojo.PageParam; import com.zteits.urbanops.framework.common.pojo.PageResult; import com.zteits.urbanops.framework.common.util.object.BeanUtils; import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; -import com.zteits.urbanops.module.workorder.controller.admin.attachment.vo.AttachmentReqVO; +import com.zteits.urbanops.module.system.api.user.AdminUserApi; +import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO; +import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO; +import com.zteits.urbanops.module.system.service.dept.DeptService; import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoPageReqVO; import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoRespVO; import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoSaveReqVO; @@ -28,10 +30,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.io.IOException; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.EXPORT; @@ -50,6 +49,11 @@ public class MainInfoController { @Resource private AttachmentService attachmentService; + @Resource + private DeptService deptService; + @Resource + private AdminUserApi adminUserApi; + @PostMapping("/create") @Operation(summary = "创建工单信息") @PreAuthorize("@ss.hasPermission('workorder:main-info:create')") @@ -105,7 +109,16 @@ public class MainInfoController { )); } } - return success(MainInfoConvert.INSTANCE.buildMainInfo(mainInfo, attachmentMap)); + DeptDO dept = deptService.getDept(mainInfo.getCompanyId()); + Set userIds = new HashSet<>(); + if (mainInfo.getCoHandlers() != null) { + mainInfo.getCoHandlers().stream() + .filter(Objects::nonNull) // 过滤null ID + .forEach(userIds::add); + } + userIds.add(mainInfo.getUserId()); + Map userMap = adminUserApi.getUserMap(userIds); + return success(MainInfoConvert.INSTANCE.buildMainInfo(mainInfo, attachmentMap, dept.getName(), userMap)); } @GetMapping("/page") diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoRespVO.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoRespVO.java index 4eef52b..2e461d8 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoRespVO.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoRespVO.java @@ -137,4 +137,14 @@ public class MainInfoRespVO { @Schema(description = "文件名称") private String fileNames; + + @Schema(description = "共同处理人") + private Set coHandlers; + @Schema(description = "共同处理人名称，多个逗号拼接") + private String coHandlersName; + + @Schema(description = "单位名称") + private String companyName; + @Schema(description = "提交人电话") + private String userMobile; } diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java index a409301..3825c2d 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java @@ -3,6 +3,7 @@ package com.zteits.urbanops.module.workorder.convert.maininfo; import com.zteits.urbanops.framework.common.pojo.PageResult; import com.zteits.urbanops.framework.common.util.collection.CollectionUtils; import com.zteits.urbanops.framework.common.util.object.BeanUtils; +import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO; import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoRespVO; import com.zteits.urbanops.module.workorder.dal.dataobject.attachment.AttachmentDO; import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoDO; @@ -11,6 +12,8 @@ import org.mapstruct.factory.Mappers; import java.util.List; import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; /** * @Classname MainInfoConvert @@ -26,18 +29,34 @@ public interface MainInfoConvert { default PageResult buildMainInfoPage(PageResult pageResult, Map attachmentMap) { List mainInfoVOList = CollectionUtils.convertList(pageResult.getList(), mainInfoDO -> { MainInfoRespVO mainInfoVo = BeanUtils.toBean(mainInfoDO, MainInfoRespVO.class); - AttachmentDO attachmentDO = attachmentMap.get(mainInfoDO.getOrderNo()); - mainInfoVo.setFileNames(attachmentDO.getFileNames()); + if (attachmentMap != null && !attachmentMap.isEmpty()) { + AttachmentDO attachmentDO = attachmentMap.get(mainInfoDO.getOrderNo()); + mainInfoVo.setFileNames(attachmentDO.getFileNames()); + } return mainInfoVo; }); return new PageResult<>(mainInfoVOList, pageResult.getTotal()); } - default MainInfoRespVO buildMainInfo(MainInfoDO mainInfoDO, Map attachmentMap) { + default MainInfoRespVO buildMainInfo(MainInfoDO mainInfoDO, Map attachmentMap, String deptName,Map userMap) { MainInfoRespVO mainInfoVo = BeanUtils.toBean(mainInfoDO, MainInfoRespVO.class); if (mainInfoDO != null) { - AttachmentDO attachmentDO = attachmentMap.get(mainInfoDO.getOrderNo()); - mainInfoVo.setFileNames(attachmentDO.getFileNames()); + if (attachmentMap != null && !attachmentMap.isEmpty()) { + AttachmentDO attachmentDO = attachmentMap.get(mainInfoDO.getOrderNo()); + mainInfoVo.setFileNames(attachmentDO.getFileNames()); + } + mainInfoVo.setCompanyName(deptName); + if (mainInfoVo.getCoHandlers() != null && !mainInfoVo.getCoHandlers().isEmpty()) { + String coHandlersName = mainInfoVo.getCoHandlers() == null ? "" : mainInfoVo.getCoHandlers().stream() + .filter(userId -> userId != null) + .map(userMap::get) + .filter(Objects::nonNull) + .map(AdminUserRespDTO::getNickname) + .filter(nickname -> nickname != null && !nickname.isEmpty()) + .collect(Collectors.joining(",")); + mainInfoVo.setCoHandlersName(coHandlersName); + } + mainInfoVo.setUserMobile(userMap.get(mainInfoVo.getUserId()).getMobile()); } return mainInfoVo; } diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoDO.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoDO.java index 745185f..be2c8ae 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoDO.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoDO.java @@ -18,7 +18,7 @@ import org.hibernate.validator.constraints.Length; * * @author 超级管理员 */ -@TableName("workorder_main_info") +@TableName(value = "workorder_main_info", autoResultMap = true) @KeySequence("workorder_main_info_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @EqualsAndHashCode(callSuper = true) @@ -34,7 +34,7 @@ public class MainInfoDO extends BaseDO { @TableId private Long id; /** - * 业务线:yl 园林,wy 物业,sz 市政 + * 业务线:yl 园林,wy 物业,sz 市政 */ private String busiLine; /** @@ -151,4 +151,4 @@ public class MainInfoDO extends BaseDO { private Set coHandlers; -} \ No newline at end of file +} -- libgit2 0.21.4