From 687f8778acff5e284c62b40f89bf83ad6effc438 Mon Sep 17 00:00:00 2001 From: wangqian <1406304305@qq.com> Date: Tue, 16 Dec 2025 11:30:10 +0800 Subject: [PATCH] 工单管理附件查询修改 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/AssignTasksController.java | 4 +--- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksRespVO.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksSaveReqVO.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasks/AssignTasksServiceImpl.java | 8 ++++---- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoService.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java | 4 ++-- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/attachment/AttachmentController.java | 9 ++++++++- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/attachment/vo/AttachmentPageReqVO.java | 4 ++-- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/attachment/AttachmentDO.java | 6 +++--- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/attachment/AttachmentService.java | 10 +++++++++- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/attachment/AttachmentServiceImpl.java | 22 +++++++++++++++++++--- 12 files changed, 52 insertions(+), 23 deletions(-) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/AssignTasksController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/AssignTasksController.java index 8376197..7a761de 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/AssignTasksController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/AssignTasksController.java @@ -92,12 +92,10 @@ public class AssignTasksController { List assignTaskInfoList = asignTasksInfoService.getAssignTasksInfos(assignTasks.getId()); assignTasksRespVO.setAssignTaskInfoList(assignTaskInfoList); //获取单位集合 - List companyIds = CollectionUtil.isEmpty(assignTaskInfoList) + List companyIds = CollectionUtil.isEmpty(assignTaskInfoList) ? Collections.emptyList() : assignTaskInfoList.stream() .map(AssignTasksInfoDO::getCompanyId) - .map(StrUtil::toString) // Hutool 工具类：自动处理 null（转为 null 字符串，需配合过滤） - .filter(StrUtil::isNotEmpty) // 过滤 null/空字符串 .distinct() .collect(Collectors.toList()); assignTasksRespVO.setCompanyIds(companyIds); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksRespVO.java index 7950b17..5b60abf 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksRespVO.java @@ -63,7 +63,7 @@ public class AssignTasksRespVO { @Schema(description = "修改人（关联用户ID，最后修改人）") private String updater; - private List companyIds; + private List companyIds; private List assignTaskInfoList; public void setParentFinish(Integer parentFinish) { diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksSaveReqVO.java index cd6486e..a41db1e 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksSaveReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksSaveReqVO.java @@ -58,6 +58,6 @@ public class AssignTasksSaveReqVO { /*单位集合*/ @NotEmpty(message = "派发单位不能为空") - private List companyIds; + private List companyIds; } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java index ea1b666..c98d671 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java @@ -38,7 +38,7 @@ public class AssignTasksInfoDO extends BaseDO { /** * 单位ID（关联单位表主键） */ - private String companyId; + private Long companyId; /** * 单位ID（关联单位表主键） */ diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasks/AssignTasksServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasks/AssignTasksServiceImpl.java index 8bc015e..3900b58 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasks/AssignTasksServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasks/AssignTasksServiceImpl.java @@ -92,7 +92,7 @@ public class AssignTasksServiceImpl implements AssignTasksService { assignTasksMapper.updateById(updateObj); // 1. 处理关联的单位任务信息（仅当存在单位ID列表时） - List companyIds = updateReqVO.getCompanyIds(); + List companyIds = updateReqVO.getCompanyIds(); // add by wq 20251116 List assignTaskInfoList = assignTasksInfoMapper.selectList(AssignTasksInfoDO::getTaskId, updateObj.getId()); if (CollectionUtils.isEmpty(assignTaskInfoList)) { @@ -113,11 +113,11 @@ public class AssignTasksServiceImpl implements AssignTasksService { //获取已添加单位集合 - List existingCompanyIds = assignTaskInfoList.stream() - .map(info -> String.valueOf(info.getCompanyId())) + List existingCompanyIds = assignTaskInfoList.stream() + .map(info -> info.getCompanyId()) .collect(Collectors.toList()); //排除 existingCompanyIds 中的元素 作为新增的单位 - List filteredCompanyIds = companyIds.stream() + List filteredCompanyIds = companyIds.stream() .filter(Objects::nonNull) .filter(id -> !existingCompanyIds.contains(id)) // 直接用列表 contains() .collect(Collectors.toList()); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoService.java index 1a93180..616f11b 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoService.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoService.java @@ -70,7 +70,7 @@ public interface AssignTasksInfoService { * @param assignTasks * @Return java.lang.Long */ - public void saveAssignTasksInfos(List companyIds, AssignTasksDO assignTasks); + public void saveAssignTasksInfos(List companyIds, AssignTasksDO assignTasks); /** * @Author wangqian diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java index 51d60cf..a3dbc3f 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java @@ -126,7 +126,7 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { } @Override - public void saveAssignTasksInfos(List companyIds, AssignTasksDO assignTasks) { + public void saveAssignTasksInfos(List companyIds, AssignTasksDO assignTasks) { // 获得用户基本信息 if (companyIds != null && companyIds.size() > 0) { //1、获取单位集合 @@ -140,7 +140,7 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { dept -> dept.getName().trim(), // value 映射：取 companyName（去空格） (oldValue, newValue) -> newValue )); - for (String companyId : companyIds) { + for (Long companyId : companyIds) { AssignTasksInfoDO assignTaskInfo = new AssignTasksInfoDO(); assignTaskInfo.setCompanyId(companyId); assignTaskInfo.setCompanyName(companyIdToNameMap.get(Long.valueOf(companyId))); diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/attachment/AttachmentController.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/attachment/AttachmentController.java index 1c21434..6848a02 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/attachment/AttachmentController.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/attachment/AttachmentController.java @@ -101,4 +101,11 @@ public class AttachmentController { BeanUtils.toBean(list, AttachmentRespVO.class)); } -} \ No newline at end of file + @PostMapping("/getByCondition") + @Operation(summary = "获得工单附件信息") + @PreAuthorize("@ss.hasPermission('workorder:attachment:query')") + public CommonResult> getAttachmentByCondition(@Valid @RequestBody AttachmentPageReqVO reqVO) { + List attachment = attachmentService.getAttachmentByCondition(reqVO); + return success(BeanUtils.toBean(attachment, AttachmentRespVO.class)); + } +} diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/attachment/vo/AttachmentPageReqVO.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/attachment/vo/AttachmentPageReqVO.java index e6090c3..d00963a 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/attachment/vo/AttachmentPageReqVO.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/attachment/vo/AttachmentPageReqVO.java @@ -19,7 +19,7 @@ public class AttachmentPageReqVO extends PageParam { @Schema(description = "业务线:yl 园林,wy 物业,sz 市政 ") private String busiLine; - @Schema(description = "业务类型：01 问题图片,02 街道图片,03 选景图片", example = "1") + @Schema(description = "业务类型：01 问题图片,02 进行中图片,03 已完成图片", example = "01") private String busiType; @Schema(description = "文件名称") @@ -41,4 +41,4 @@ public class AttachmentPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; -} \ No newline at end of file +} diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/attachment/AttachmentDO.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/attachment/AttachmentDO.java index 68bd6a0..fe8e848 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/attachment/AttachmentDO.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/attachment/AttachmentDO.java @@ -32,11 +32,11 @@ public class AttachmentDO extends BaseDO { */ private String orderNo; /** - * 业务线:yl 园林,wy 物业,sz 市政 + * 业务线:yl 园林,wy 物业,sz 市政 */ private String busiLine; /** - * 业务类型：01 问题图片,02 街道图片,03 选景图片 + * 业务类型：01 问题图片,02 进行中图片,03 已完成图片 */ private String busiType; /** @@ -61,4 +61,4 @@ public class AttachmentDO extends BaseDO { private String remark; -} \ No newline at end of file +} diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/attachment/AttachmentService.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/attachment/AttachmentService.java index bf01a32..13190e2 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/attachment/AttachmentService.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/attachment/AttachmentService.java @@ -59,4 +59,12 @@ public interface AttachmentService { */ PageResult getAttachmentPage(AttachmentPageReqVO pageReqVO); -} \ No newline at end of file + /** + * 获得工单附件信息 + * + * @param reqVO 编号 + * @return 工单附件信息 + */ + List getAttachmentByCondition(AttachmentPageReqVO reqVO); + +} diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/attachment/AttachmentServiceImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/attachment/AttachmentServiceImpl.java index 0af1491..fe7594b 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/attachment/AttachmentServiceImpl.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/attachment/AttachmentServiceImpl.java @@ -1,6 +1,8 @@ package com.zteits.urbanops.module.workorder.service.attachment; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -15,7 +17,9 @@ import com.zteits.urbanops.framework.common.util.object.BeanUtils; import com.zteits.urbanops.module.workorder.dal.mysql.attachment.AttachmentMapper; +import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST; import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception0; import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertList; import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.diffList; import static com.zteits.urbanops.module.workorder.enums.ErrorCodeConstants.*; @@ -60,10 +64,10 @@ public class AttachmentServiceImpl implements AttachmentService { } @Override - public void deleteAttachmentListByIds(List ids) { + public void deleteAttachmentListByIds(List ids) { // 删除 attachmentMapper.deleteByIds(ids); - } + } private void validateAttachmentExists(Long id) { @@ -82,4 +86,16 @@ public class AttachmentServiceImpl implements AttachmentService { return attachmentMapper.selectPage(pageReqVO); } -} \ No newline at end of file + @Override + public List getAttachmentByCondition(AttachmentPageReqVO reqVO) { + if (StringUtils.isEmpty(reqVO.getOrderNo())) { + throw exception0(BAD_REQUEST.getCode(),"工单号不能为空"); + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(AttachmentDO::getOrderNo, reqVO.getOrderNo()); + if (StringUtils.isNotEmpty(reqVO.getBusiType())) { + queryWrapper.eq(AttachmentDO::getBusiType, reqVO.getBusiType()); + } + return attachmentMapper.selectList(queryWrapper); + } +} -- libgit2 0.21.4