项目编号搜索需保留创建人id

master
OathK1per 2023-01-05 16:21:05 +08:00
parent 035a5f68bc
commit b73d5c403f
2 changed files with 4 additions and 1 deletions

View File

@ -17,4 +17,6 @@ public class QueryProject {
private ProcessType processType;
private Integer creatorId;
}

View File

@ -73,7 +73,7 @@ public class ProjectProcessService {
projects = projectRepository.findBudgetPassedProjects(q);
}
else if (processType == ProcessType.sale_contract) {
List<QueryProject> queryProjects = jdbcTemplate.query("select distinct p.id, p.name, p.project_no projectNo, pp.process_type processType " +
List<QueryProject> queryProjects = jdbcTemplate.query("select distinct p.id, p.name, p.project_no projectNo, pp.process_type processType, p.creator_id " +
" from project p left join project_process pp on p.id = pp.project_id " +
"where (p.`status` > 5 or (p.`status` = 5 and p.approve_status_budget = 2)) " +
" and (p.`project_no` like concat('%', ?, '%') or p.`name` like concat('%', ?, '%'))",
@ -104,6 +104,7 @@ public class ProjectProcessService {
project.setId(queryProject.getId());
project.setName(queryProject.getName());
project.setProjectNo(queryProject.getProjectNo());
project.setCreatorId(queryProject.getCreatorId());
return project;
}).collect(Collectors.toList());
}