From b73d5c403fc52a3953c459ac855692b423b17620 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Thu, 5 Jan 2023 16:21:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7=E6=90=9C?=
=?UTF-8?q?=E7=B4=A2=E9=9C=80=E4=BF=9D=E7=95=99=E5=88=9B=E5=BB=BA=E4=BA=BA?=
=?UTF-8?q?id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/cn/palmte/work/model/process/QueryProject.java | 2 ++
.../java/cn/palmte/work/service/ProjectProcessService.java | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
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<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());
}