From 3535432c9638a0830df8e6a34fbd46a113791d14 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 03 三月 2025 10:23:29 +0800
Subject: [PATCH] 流程推进启动变更bug
---
business/src/main/resources/mapper/ProjectProcessMapper.xml | 6 +++++-
business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java | 8 +++++++-
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 4 ----
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java
index 059d654..b9f0918 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java
@@ -35,6 +35,12 @@
@ApiModelProperty("宸ョ▼鍚嶇О")
private String projectName;
+ @ApiModelProperty("娴佺▼瀹炰緥id")
+ private String processInsId;
+
+ @ApiModelProperty("娴佺▼瀹氫箟id")
+ private String processDefId;
+
/** 椤圭洰鎺ㄨ繘绫诲瀷 */
@ApiModelProperty("椤圭洰鎺ㄨ繘绫诲瀷")
private String projectType;
@@ -77,7 +83,7 @@
private String unitName;
/** 宸ョ▼鍒楄〃 */
- @ApiModelProperty("宸ョ▼鍒楄〃")
+ @ApiModelProperty("瀛愬伐绋嬪垪琛�")
private List<ProjectEngineeringVO> children = new ArrayList<ProjectEngineeringVO>();
public static ProjectEngineeringVO getVoByEntity(@NonNull ProjectEngineering entity, ProjectEngineeringVO vo) {
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
index 61a8123..fef5338 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -148,7 +148,6 @@
Long unitId = null;
if (ProjectProcessTypeEnum.PROJECT.equals(form.getProjectType())) {
ProjectInfo project = new LambdaQueryChainWrapper<>(projectInfoMapper)
- .select(ProjectInfo::getProjectOwnerUnit)
.eq(ProjectInfo::getId, form.getProjectId())
.one();
if (Objects.isNull(project)) {
@@ -157,7 +156,6 @@
unitId = project.getProjectOwnerUnit();
} else if (ProjectProcessTypeEnum.ENGINEERING.equals(form.getProjectType())) {
ProjectEngineering projectEngineering = new LambdaQueryChainWrapper<>(projectEngineeringMapper)
- .select(ProjectEngineering::getDepartment)
.eq(ProjectEngineering::getId, form.getProjectId())
.one();
if (Objects.isNull(projectEngineering)) {
@@ -188,7 +186,6 @@
Long unitId = null;
if (ProjectProcessTypeEnum.PROJECT.equals(form.getProjectType())) {
ProjectInfo project = new LambdaQueryChainWrapper<>(projectInfoMapper)
- .select(ProjectInfo::getProjectOwnerUnit)
.eq(ProjectInfo::getId, form.getProjectId())
.one();
if (Objects.isNull(project)) {
@@ -197,7 +194,6 @@
unitId = project.getProjectOwnerUnit();
} else if (ProjectProcessTypeEnum.ENGINEERING.equals(form.getProjectType())) {
ProjectEngineering projectEngineering = new LambdaQueryChainWrapper<>(projectEngineeringMapper)
- .select(ProjectEngineering::getDepartment)
.eq(ProjectEngineering::getId, form.getProjectId())
.one();
if (Objects.isNull(projectEngineering)) {
diff --git a/business/src/main/resources/mapper/ProjectProcessMapper.xml b/business/src/main/resources/mapper/ProjectProcessMapper.xml
index e4f8bdc..a97845f 100644
--- a/business/src/main/resources/mapper/ProjectProcessMapper.xml
+++ b/business/src/main/resources/mapper/ProjectProcessMapper.xml
@@ -77,6 +77,8 @@
<result column="parent_id" property="parent" />
<result column="project_owner_unit_name" property="projectOwnerUnitName" />
<result column="competent_department_name" property="competentDepartmentName" />
+ <result column="process_ins_id" property="processInsId" />
+ <result column="process_def_id" property="processDefId" />
</resultMap>
<select id="getProjectEngineeringList" parameterType="string" resultMap="EngineeringMap">
@@ -111,9 +113,11 @@
SELECT
TT.id, TT.project_info_id, TT.project_name, TT.project_type, TT.investment_amount, TT.status, TT.unit, TT.department, TT.parent_id, TT.year, TT.gmt_create,
(SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TT.unit) AS project_owner_unit_name,
- (SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TT.department) AS competent_department_name
+ (SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TT.department) AS competent_department_name,
+ TPP.process_ins_id, TPP.process_def_id
FROM
temp_table TT
+ LEFT JOIN t_project_process TPP ON TPP.project_id = TT.id AND TPP.deleted = 0 AND TPP.project_type = 'ENGINEERING'
ORDER BY
TT.gmt_create DESC
</select>
--
Gitblit v1.8.0