From af404a66aa0e4a55d509f58f12212784b18f5476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E6=98=8A?= Date: Tue, 7 Jul 2026 16:41:12 +0800 Subject: [PATCH] =?UTF-8?q?fix(oa):=20=E4=BF=AE=E5=A4=8D=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E7=BC=BA=E5=A4=B1=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=B9=B6=E6=B7=BB=E5=8A=A0=E7=AD=BE=E8=AE=A2=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 补充按项目ID和合同类型的查询条件 2. 为signTime字段添加GMT+8时区的日期格式化注解 --- .../src/main/java/com/ruoyi/oa/domain/bo/SysOaContractBo.java | 1 + .../com/ruoyi/oa/service/impl/SysOaContractServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaContractBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaContractBo.java index d6b4021..b0d57e3 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaContractBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaContractBo.java @@ -83,6 +83,7 @@ public class SysOaContractBo extends BaseEntity { /** * 签订日期 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date signTime; /** diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaContractServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaContractServiceImpl.java index ab93950..941384f 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaContractServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaContractServiceImpl.java @@ -133,7 +133,8 @@ public class SysOaContractServiceImpl implements ISysOaContractService { private LambdaQueryWrapper buildQueryWrapper(SysOaContractBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(SysOaContract::getContractType, '0'); + lqw.eq(bo.getProjectId() != null, SysOaContract::getProjectId, bo.getProjectId()); + lqw.eq(StringUtils.isNotBlank(bo.getContractType()), SysOaContract::getContractType, bo.getContractType()); lqw.eq(StringUtils.isNotBlank(bo.getContractNum()), SysOaContract::getContractNum, bo.getContractNum()); lqw.like(StringUtils.isNotBlank(bo.getContractName()), SysOaContract::getContractName, bo.getContractName()); lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,