From 99b917a8b570e2eba9438212909cca628f07907c Mon Sep 17 00:00:00 2001 From: yanhuiqing Date: Wed, 24 Dec 2025 17:07:43 +0800 Subject: [PATCH] 工作流 底层扩展 支持 app端 pc端 审批附件url功能 修订 --- urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/service/task/BpmTaskServiceImpl.java | 2 +- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoHasTaskPageReqVO.java | 2 ++ urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderController.java | 1 + urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java | 15 +++++++++++++++ urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java | 6 ++++++ 5 files changed, 25 insertions(+), 1 deletion(-) diff --git a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/service/task/BpmTaskServiceImpl.java b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/service/task/BpmTaskServiceImpl.java index d3cc3c8..3a5a772 100644 --- a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/service/task/BpmTaskServiceImpl.java +++ b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/service/task/BpmTaskServiceImpl.java @@ -1691,7 +1691,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { List attachmentList = taskService.getProcessInstanceAttachments(processInstanceId); // 空列表直接返回空集合（避免null） if (CollUtil.isEmpty(attachmentList)) { - return CollUtil.empty(String.class); + return new ArrayList<>(); } List targetList = new ArrayList<>(); diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoHasTaskPageReqVO.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoHasTaskPageReqVO.java index bf93294..c997f18 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoHasTaskPageReqVO.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoHasTaskPageReqVO.java @@ -39,6 +39,8 @@ public class MainInfoHasTaskPageReqVO extends PageParam { private String busiLine; @Schema(description = "工单号") private String orderNo; + @Schema(description = "工单类型 Q:快速工单,C:普通工单,O:其他工单") + private String orderType; @Schema(description = "工单名称", example = "张三") private String orderName; @Schema(description = "工单描述", example = "你说的对") diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderController.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderController.java index 6615431..1cbd8b0 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderController.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderController.java @@ -351,6 +351,7 @@ public class AppGardenWorkOrderController { inspectStartReqVO.setAgree(revokeStatus); inspectStartReqVO.setReason(reqVO.getReason()); inspectStartReqVO.setId(reqVO.getTaskId()); + inspectStartReqVO.setReturnImgs(reqVO.getReturnImgs()); this.approveTask(inspectStartReqVO); log.info("当前操作："+OperateTypeEnum.YL_INSPECTOR_START_FINISH.getDesc()+"<--结束"); return success(true); diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java index d70692f..d39fbdd 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java @@ -92,6 +92,9 @@ public interface MainInfoExtMapper extends BaseMapperX { " ", " AND m.curing_level_id = #{query.curingLevelId}", " ", + " ", + " AND m.order_type = #{query.orderType}", + " ", " ", " AND t.ID_ = #{query.taskId}", " ", @@ -208,6 +211,9 @@ public interface MainInfoExtMapper extends BaseMapperX { " ", " AND m.curing_level_id = #{query.curingLevelId}", " ", + " ", + " AND m.order_type = #{query.orderType}", + " ", " ", " AND t.ID_ = #{query.taskId}", " ", @@ -316,6 +322,9 @@ public interface MainInfoExtMapper extends BaseMapperX { " ", " AND m.curing_level_id = #{query.curingLevelId}", " ", + " ", + " AND m.order_type = #{query.orderType}", + " ", " ", " AND t.ID_ = #{query.taskId}", " ", @@ -433,6 +442,9 @@ public interface MainInfoExtMapper extends BaseMapperX { " ", " AND m.curing_level_id = #{query.curingLevelId}", " ", + " ", + " AND m.order_type = #{query.orderType}", + " ", " ", " AND t.ID_ = #{query.taskId}", " ", @@ -544,6 +556,9 @@ public interface MainInfoExtMapper extends BaseMapperX { " ", " AND m.curing_level_id = #{query.curingLevelId}", " ", + " ", + " AND m.order_type = #{query.orderType}", + " ", " ", " AND t.ID_ = #{query.taskId}", " ", diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java index afea8a5..698ec04 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java @@ -433,6 +433,8 @@ public class BpmGardenServiceImpl implements BpmGardenService{ taskBuzReqVO.setUserId(SecurityFrameworkUtils.getLoginUserId()); //TODO 先写死 //taskBuzReqVO.setKey(BpmCommonConstant.BPM_GARDEN_INSPECT_WO); + //需求是APP端 只查普通工单 + taskBuzReqVO.setOrderType(BpmCommonConstant.ORDER_TYPE_C); //selectWorkOrderUniqueMyPage 个性化 去重 按工单唯一处理 PageResult pageResult = workOrderExtMapper.selectWorkOrderUniqueMyPage(pageVO,taskBuzReqVO); return AppGardenTaskConvert.INSTANCE.buildBuziTaskPage(pageResult,attachmentMapper, adminUserApi); @@ -467,6 +469,8 @@ public class BpmGardenServiceImpl implements BpmGardenService{ taskBuzReqVO.setUserId(SecurityFrameworkUtils.getLoginUserId()); //TODO 先写死 //taskBuzReqVO.setKey(BpmCommonConstant.BPM_GARDEN_INSPECT_WO); + //需求是APP端 只查普通工单 + taskBuzReqVO.setOrderType(BpmCommonConstant.ORDER_TYPE_C); //已办改为获取最新一条数据 PageResult pageResult = workOrderExtMapper.selectWorkOrderDoneUniquePage(pageVO,taskBuzReqVO); return AppGardenTaskConvert.INSTANCE.buildBuziTaskPage(pageResult,attachmentMapper, adminUserApi); @@ -502,6 +506,8 @@ public class BpmGardenServiceImpl implements BpmGardenService{ taskBuzReqVO.setUserId(SecurityFrameworkUtils.getLoginUserId()); //TODO 先写死 //taskBuzReqVO.setKey(BpmCommonConstant.BPM_GARDEN_INSPECT_WO); + //需求是APP端 只查普通工单 + taskBuzReqVO.setOrderType(BpmCommonConstant.ORDER_TYPE_C); PageResult pageResult = workOrderExtMapper.selectWorkOrderTodoPage(pageVO,taskBuzReqVO); return AppGardenTaskConvert.INSTANCE.buildBuziTaskPage(pageResult,attachmentMapper,adminUserApi); } -- libgit2 0.21.4