From cbd307160ef71900ae6efd93a4abb76cffe8b53e Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 13 Dec 2025 11:35:57 +0800 Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E6=B7=BB=E5=8A=A0=E8=B4=A2?= =?UTF-8?q?=E5=8A=A1=E8=AE=B0=E5=BD=95=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 SysOaFinanceBo 中增加 beginCreateTime 和 endCreateTime 字段 - 配置 JsonFormat 和 DateTimeFormat 注解以支持日期时间格式化 - 修改 SysOaFinanceServiceImpl 中的查询逻辑，使用 BO 对象中的时间字段进行范围查询 - 移除对 params 参数中时间字段的依赖，统一通过 BO 对象传递查询条件 --- .../main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java | 9 +++++++++ .../ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java index f5789de..58dc71e 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java @@ -16,6 +16,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; /** * 进出账管理业务对象 sys_oa_finance @@ -145,4 +146,12 @@ public class SysOaFinanceBo extends BaseEntity { //cost_category varchar(32) 成本分类 private String costCategory; + //时间筛选 带时分秒的 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date beginCreateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date endCreateTime; + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java index d98593d..505047c 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java @@ -199,8 +199,8 @@ public class SysOaFinanceServiceImpl implements ISysOaFinanceService { lqw.eq(StringUtils.isNotBlank(bo.getFinanceType()), "sof.finance_type", bo.getFinanceType()); lqw.eq(StringUtils.isNotBlank(bo.getSigningCompany()), "sof.signing_company", bo.getSigningCompany()); lqw.eq(Objects.nonNull(bo.getReceiveAccountId()) && bo.getReceiveAccountId()!=-1L, "sof.receive_account_id", bo.getReceiveAccountId()); - lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, - "sof.create_time", params.get("beginCreateTime"), params.get("endCreateTime")); + lqw.between(bo.getBeginCreateTime()!= null && bo.getEndCreateTime()!= null, + "sof.create_time", bo.getBeginCreateTime(), bo.getEndCreateTime()); lqw.orderByDesc("create_time"); return lqw; }