refactor(oa): 将签约公司字段类型从 String 改为 Integer
- 在 SysOaProject、SysOaProjectBo、SysOaProjectVo 中将 signingCompany 字段类型从 String 改为 Integer - 更新 SysOaProjectServiceImpl 中的相关查询条件 -此修改可能会影响前端界面展示,需同步更新前端相关代码
This commit is contained in:
@@ -154,5 +154,5 @@ public class SysOaProject extends BaseEntity {
|
||||
*/
|
||||
private String projectCode;
|
||||
//签约公司
|
||||
private String signingCompany;
|
||||
private Integer signingCompany;
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package com.ruoyi.oa.domain.bo;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.ruoyi.common.core.validate.AddGroup;
|
||||
import com.ruoyi.common.core.validate.EditGroup;
|
||||
import liquibase.pro.packaged.I;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
@@ -189,6 +190,6 @@ public class SysOaProjectBo extends BaseEntity {
|
||||
|
||||
private String status;
|
||||
//签约公司
|
||||
private String signingCompany;
|
||||
private Integer signingCompany;
|
||||
}
|
||||
|
||||
|
||||
@@ -256,6 +256,6 @@ public class SysOaProjectVo {
|
||||
*/
|
||||
private String status;
|
||||
//签约公司
|
||||
private String signingCompany;
|
||||
private Integer signingCompany;
|
||||
|
||||
}
|
||||
|
||||
@@ -181,7 +181,7 @@ public class SysOaProjectServiceImpl implements ISysOaProjectService {
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getProjectStatus()), SysOaProject::getProjectStatus, bo.getProjectStatus());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getCreateBy()), SysOaProject::getCreateBy, bo.getCreateBy());
|
||||
//新增签约公司作为筛选条件
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSigningCompany()), SysOaProject::getSigningCompany, bo.getSigningCompany());
|
||||
lqw.eq(bo.getSigningCompany()!= null, SysOaProject::getSigningCompany, bo.getSigningCompany());
|
||||
lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
|
||||
SysOaProject::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
|
||||
lqw.orderByDesc(SysOaProject::getCreateTime);
|
||||
|
||||
Reference in New Issue
Block a user