From 2eeb98a360ffbcf891170e1cd017d5742392cb62 Mon Sep 17 00:00:00 2001 From: aikai Date: Mon, 30 Jun 2025 14:16:19 +0800 Subject: [PATCH] =?UTF-8?q?feat(bpm):=20=E5=B7=A5=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=A2=9E=E5=8A=A0=E6=8C=89=E7=BA=A7=E5=88=AB=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 BpmOAWorkOrderPageReqVO 中添加 level 字段,用于工单级别筛选 - 在 BpmOAWorkOrderMapper.xml 中增加对 level 的条件判断 - 优化 createTime 的判断逻辑,提高代码可读性 --- .../admin/oa/vo/workorder/BpmOAWorkOrderPageReqVO.java | 3 +++ .../src/main/resources/mapper/oa/BpmOAWorkOrderMapper.xml | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/workorder/BpmOAWorkOrderPageReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/workorder/BpmOAWorkOrderPageReqVO.java index b699fc3f..93e30d7a 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/workorder/BpmOAWorkOrderPageReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/workorder/BpmOAWorkOrderPageReqVO.java @@ -26,6 +26,9 @@ public class BpmOAWorkOrderPageReqVO extends PageParam { @Schema(description = "工单状态", example = "1") private Integer status; + @Schema(description = "工单级别", example = "1") + private Integer level; + @Schema(description = "责任人ID", example = "1") private Long assigneeUserId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOAWorkOrderMapper.xml b/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOAWorkOrderMapper.xml index 47f42ebd..debb1856 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOAWorkOrderMapper.xml +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOAWorkOrderMapper.xml @@ -78,7 +78,10 @@ AND w.from_user_id = #{req.fromUserId} - + + AND w.level = #{req.level} + + AND w.create_time BETWEEN #{req.createTime[0]} AND #{req.createTime[1]}