From c2dfbdc508dd6cd55d1a566d5051a339bf9a5751 Mon Sep 17 00:00:00 2001 From: aikai Date: Tue, 20 Aug 2024 11:30:58 +0800 Subject: [PATCH] =?UTF-8?q?```sql=E4=BF=AE=E6=94=B9=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E4=BB=98=E6=AC=BE=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BB=A5?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BC=80=E5=A7=8B=E5=92=8C=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89=E5=9C=A8=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E4=BB=98=E6=AC=BE=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E5=99=A8XML=E4=B8=AD=EF=BC=8C=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E5=B7=B2=E6=9B=B4=E6=96=B0=EF=BC=8C=E4=BB=A5=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=A0=B9=E6=8D=AE=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=92=8C=E5=AE=8C=E6=88=90=E6=97=B6=E9=97=B4=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E3=80=82=E6=AD=A4=E6=9B=B4=E6=94=B9=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E4=BA=86=E5=85=88=E5=89=8D=E7=9A=84=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E5=BC=95=E5=85=A5=E4=BA=86=E6=96=B0=E7=9A=84=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=E6=97=B6=E9=97=B4=E5=8F=82=E6=95=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 同时，对应的请求VO类也进行了调整，以包含新的开始时间和完成时间字段，从而允许前端用户根据这些参数进行查询。 BREAKING CHANGE: 对于依赖于旧的createTime字段的客户端，需要更新其代码以适应新的beginTime和endTime字段。 ``` --- .../vo/FinancialPaymentPageReqVO.java | 8 ++++++-- .../FinancialPaymentMapper.xml | 18 +++++++++++++----- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpayment/vo/FinancialPaymentPageReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpayment/vo/FinancialPaymentPageReqVO.java index 9c915735..b982b385 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpayment/vo/FinancialPaymentPageReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpayment/vo/FinancialPaymentPageReqVO.java @@ -42,8 +42,12 @@ public class FinancialPaymentPageReqVO extends PageParam { @Schema(description = "当前登陆用户id(领取人) 前端不用传") private Long receiveUserId; - @Schema(description = "创建时间") + @Schema(description = "开始时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; + private LocalDateTime[] beginTime; + + @Schema(description = "完成时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] endTime; } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/financialpayment/FinancialPaymentMapper.xml b/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/financialpayment/FinancialPaymentMapper.xml index 370d5e2b..9f97eda7 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/financialpayment/FinancialPaymentMapper.xml +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/financialpayment/FinancialPaymentMapper.xml @@ -54,12 +54,20 @@ and a.receive_user_id != #{vo.receiveUserId} - - - and a.create_time >= #{vo.createTime[0]} + + + and a.begin_time >= #{vo.beginTime[0]} - - and a.create_time <= #{vo.createTime[1]} + + and a.begin_time <= #{vo.beginTime[1]} + + + + + and a.end_time >= #{vo.endTime[0]} + + + and a.end_time <= #{vo.endTime[1]}