diff --git a/src/main/java/cn/palmte/work/model/process/QueryProject.java b/src/main/java/cn/palmte/work/model/process/QueryProject.java index 6ad345f..c834421 100644 --- a/src/main/java/cn/palmte/work/model/process/QueryProject.java +++ b/src/main/java/cn/palmte/work/model/process/QueryProject.java @@ -17,4 +17,6 @@ public class QueryProject { private ProcessType processType; + private Integer creatorId; + } diff --git a/src/main/java/cn/palmte/work/service/ProjectProcessService.java b/src/main/java/cn/palmte/work/service/ProjectProcessService.java index d3d521a..3cf05fe 100644 --- a/src/main/java/cn/palmte/work/service/ProjectProcessService.java +++ b/src/main/java/cn/palmte/work/service/ProjectProcessService.java @@ -73,7 +73,7 @@ public class ProjectProcessService { projects = projectRepository.findBudgetPassedProjects(q); } else if (processType == ProcessType.sale_contract) { - List queryProjects = jdbcTemplate.query("select distinct p.id, p.name, p.project_no projectNo, pp.process_type processType " + + List 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()); }