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

项目进度的支持使用项目编号搜索

Browse Source
This commit is contained in:
砂糖
2025-12-03 15:18:38 +08:00
parent 5f03c019bb
commit 120ae4f38a
4 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaProjectSchedule.java
View File

@@ -71,4 +71,6 @@ public class OaProjectSchedule extends BaseEntity {
//进度负责人
private String steward;
private String projectNum;
}

2
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProjectScheduleBo.java
View File

@@ -86,4 +86,6 @@ public class OaProjectScheduleBo extends BaseEntity {
private Integer tradeType;
//项目代号
private String projectCode;
private String projectNum;
}

2
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleServiceImpl.java
View File

@@ -87,6 +87,7 @@ public class OaProjectScheduleServiceImpl implements IOaProjectScheduleService {
QueryWrapper<OaProjectSchedule> lqw = Wrappers.query();
lqw.eq("ops.del_flag", 0);
lqw.eq(bo.getProjectId() != null,"ops.project_id", bo.getProjectId());
lqw.eq(bo.getTemplateId() != null, "ops.template_id", bo.getTemplateId());
lqw.eq(bo.getCurrentStep() != null, "ops.current_step", bo.getCurrentStep());
lqw.eq(bo.getStatus() != null, "ops.status", bo.getStatus());
@@ -94,6 +95,7 @@ public class OaProjectScheduleServiceImpl implements IOaProjectScheduleService {
lqw.eq(bo.getTradeType() !=null, "op.trade_type",bo.getTradeType());
//根据代号
lqw.like(bo.getProjectCode() != null, "op.project_code", bo.getProjectCode());
lqw.like(bo.getProjectNum() != null, "op.project_num", bo.getProjectNum());
lqw.gt(bo.getPrePay()!=null&&bo.getPrePay()>0, "op.pre_pay", 0);
// lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
// "op.begin_time", params.get("beginCreateTime"), params.get("endCreateTime"));

3
ruoyi-oa/src/main/resources/mapper/oa/OaProjectScheduleMapper.xml
View File

@@ -63,7 +63,8 @@
) AS schedulePercentage
FROM oa_project_schedule AS ops
LEFT JOIN sys_oa_project AS op ON ops.project_id = op.project_id
LEFT JOIN sys_oa_project AS op
ON ops.project_id = op.project_id
LEFT JOIN oa_project_schedule_step AS opss
ON ops.schedule_id = opss.schedule_id
AND opss.step_order = ops.current_step