DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(oa): 修复合同查询条件缺失问题并添加签订日期格式化

Browse Source 
1. 补充按项目ID和合同类型的查询条件
2. 为signTime字段添加GMT+8时区的日期格式化注解
This commit is contained in:
王文昊
2026-07-07 16:41:12 +08:00
parent 4f9b1b20b1
commit af404a66aa
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaContractBo.java
View File

@@ -83,6 +83,7 @@ public class SysOaContractBo extends BaseEntity {
/** /**
* 签订日期 * 签订日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date signTime; private Date signTime;
/** /**

3
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaContractServiceImpl.java
View File

@@ -133,7 +133,8 @@ public class SysOaContractServiceImpl implements ISysOaContractService {
private LambdaQueryWrapper<SysOaContract> buildQueryWrapper(SysOaContractBo bo) { private LambdaQueryWrapper<SysOaContract> buildQueryWrapper(SysOaContractBo bo) {
Map<String, Object> params = bo.getParams(); Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SysOaContract> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<SysOaContract> 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.eq(StringUtils.isNotBlank(bo.getContractNum()), SysOaContract::getContractNum, bo.getContractNum());
lqw.like(StringUtils.isNotBlank(bo.getContractName()), SysOaContract::getContractName, bo.getContractName()); lqw.like(StringUtils.isNotBlank(bo.getContractName()), SysOaContract::getContractName, bo.getContractName());
lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,