From aa084fcf2f099ebcf1e2d7ae46a03a5f77f76949 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 03 三月 2025 03:00:34 +0800
Subject: [PATCH] 工程库调整
---
business/src/main/resources/mapper/ProjectProcessMapper.xml | 60 +++++++++++++++++++-
business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java | 13 +++-
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 2
business/src/main/resources/mapper/ProjectEngineeringMapper.xml | 1
business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java | 8 ++
business/src/main/java/com/ycl/utils/TreeUtil.java | 43 ++++++++++++++
business/src/main/java/com/ycl/mapper/ProjectProcessMapper.java | 6 ++
business/src/main/java/com/ycl/service/impl/ProjectEngineeringServiceImpl.java | 6 +-
business/src/main/java/com/ycl/domain/vo/ProjectProcessVO.java | 3 +
9 files changed, 130 insertions(+), 12 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 a7a9d86..059d654 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java
@@ -53,7 +53,8 @@
/** 涓氫富鍗曚綅 */
@ApiModelProperty("涓氫富鍗曚綅")
- private Long unit;
+ private Long projectOwnerUnit;
+ private String projectOwnerUnitName;
/** 骞翠唤 */
@ApiModelProperty("骞翠唤")
@@ -63,9 +64,13 @@
@ApiModelProperty("鐖跺伐绋�")
private String parent;
- /** 涓荤閮ㄩ棬鍚嶅瓧 */
- @ApiModelProperty("涓荤閮ㄩ棬鍚嶅瓧")
- private String departmentName;
+ /** 涓荤閮ㄩ棬 */
+ @ApiModelProperty("涓荤閮ㄩ棬")
+ private Long competentDepartment;
+
+ /** 涓荤閮ㄩ棬 */
+ @ApiModelProperty("涓荤閮ㄩ棬")
+ private String competentDepartmentName;
/** 涓氫富鍗曚綅鍚嶅瓧 */
@ApiModelProperty("涓氫富鍗曚綅鍚嶅瓧")
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
index 5dbf816..2673e12 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
@@ -78,6 +78,9 @@
@ApiModelProperty("涓荤閮ㄩ棬(瀵瑰簲瀹℃壒閮ㄩ棬id)")
private String competentDepartment;
+ @ApiModelProperty("涓荤閮ㄩ棬")
+ private String competentDepartmentName;
+
@ApiModelProperty("涓荤閮ㄩ棬鑱旂郴浜�")
/** 涓荤閮ㄩ棬鑱旂郴浜� */
private String competentDepartmentPerson;
@@ -159,6 +162,9 @@
@ApiModelProperty("椤圭洰涓氫富鍗曚綅")
private Long projectOwnerUnit;
+ @ApiModelProperty("椤圭洰涓氫富鍗曚綅")
+ private String projectOwnerUnitName;
+
/** 椤圭洰鑱旂郴浜� */
@ApiModelProperty("椤圭洰鑱旂郴浜�")
private String projectContactPerson;
@@ -200,7 +206,7 @@
private ProjectUnitRegistrationInfoVO projectUnitRegistrationInfo;
private ProjectInvestmentPolicyComplianceVO projectInvestmentPolicyCompliance;
private Boolean auditRole;
- private String projectOwnerUnitName;
+
public static ProjectInfoVO getVoByEntity(@NonNull ProjectInfo entity, ProjectInfoVO vo) {
if(vo == null) {
vo = new ProjectInfoVO();
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectProcessVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectProcessVO.java
index 67530f6..c97370d 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectProcessVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectProcessVO.java
@@ -46,6 +46,9 @@
@ApiModelProperty("寮�宸ョ姸鎬�")
private String status;
+ @ApiModelProperty("骞翠唤")
+ private String year;
+
@ApiModelProperty("宸ョ▼鍒楄〃")
private List<ProjectEngineeringVO> children = new ArrayList<>();
}
diff --git a/business/src/main/java/com/ycl/mapper/ProjectProcessMapper.java b/business/src/main/java/com/ycl/mapper/ProjectProcessMapper.java
index 5b22dcf..f83d080 100644
--- a/business/src/main/java/com/ycl/mapper/ProjectProcessMapper.java
+++ b/business/src/main/java/com/ycl/mapper/ProjectProcessMapper.java
@@ -5,6 +5,7 @@
import com.ycl.domain.entity.ProjectProcess;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.domain.vo.ProjectEngineeringVO;
import com.ycl.domain.vo.ProjectProcessVO;
import com.ycl.domain.form.ProjectProcessForm;
import com.ycl.domain.query.ProjectProcessQuery;
@@ -35,6 +36,11 @@
IPage getPage(@Param("query") ProjectProcessQuery query, IPage page);
/**
+ * 鏍规嵁椤圭洰鑾峰彇宸ョ▼鍒楄〃
+ */
+ List<ProjectEngineeringVO> getEngineeringList(@Param("projectId") Long projectId);
+
+ /**
* 閫氳繃娴佺▼瀹炰緥id鑾峰彇椤圭洰id銆佸悕绉�
*
* @param processInstanceId
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectEngineeringServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectEngineeringServiceImpl.java
index bd2ddec..3961dc9 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectEngineeringServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectEngineeringServiceImpl.java
@@ -100,9 +100,9 @@
*/
@Override
public Result detail(String id) {
- ProjectEngineeringVO vo = baseMapper.getById(id);
- Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
- return Result.ok().data(vo);
+ ProjectEngineering entity = baseMapper.selectById(id);
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ return Result.ok().data(entity);
}
/**
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 1ad1628..61a8123 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -36,6 +36,7 @@
import com.ycl.system.service.ISysDictTypeService;
import com.ycl.system.service.ISysRoleService;
import com.ycl.system.service.ISysUserService;
+import com.ycl.utils.TreeUtil;
import lombok.Synchronized;
import org.apache.commons.lang3.StringUtils;
import org.flowable.bpmn.model.*;
@@ -104,6 +105,7 @@
IPage<ProjectProcessVO> page = PageUtil.getPage(query, ProjectProcessVO.class);
baseMapper.getPage(query, page);
for (ProjectProcessVO vo : page.getRecords()) {
+ vo.setChildren(TreeUtil.treeForProjectEng(baseMapper.getEngineeringList(vo.getId())));
vo.setStatus(vo.getProjectStatus());
if (Objects.nonNull(vo.getProcessDefId())) {
ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(vo.getProcessDefId()).singleResult();
diff --git a/business/src/main/java/com/ycl/utils/TreeUtil.java b/business/src/main/java/com/ycl/utils/TreeUtil.java
new file mode 100644
index 0000000..4ea7fc9
--- /dev/null
+++ b/business/src/main/java/com/ycl/utils/TreeUtil.java
@@ -0,0 +1,43 @@
+package com.ycl.utils;
+
+import com.ycl.domain.vo.ProjectEngineeringVO;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鏋勫缓鏍戝伐鍏�
+ *
+ * @author锛歺p
+ * @date锛�2025/3/3 2:37
+ */
+public class TreeUtil {
+
+ /**
+ * 涓哄伐绋嬫瀯閫犳爲
+ *
+ * @param nodes
+ * @return
+ */
+ public static List<ProjectEngineeringVO> treeForProjectEng(List<ProjectEngineeringVO> nodes) {
+ Map<String, ProjectEngineeringVO> nodeMap = new HashMap<>();
+ for (ProjectEngineeringVO node : nodes) {
+ nodeMap.put(node.getId(), node);
+ }
+ List<ProjectEngineeringVO> roots = new ArrayList<>();
+ for (ProjectEngineeringVO node : nodes) {
+ if ("0".equals(node.getParent())) {
+ roots.add(node);
+ } else {
+ ProjectEngineeringVO parentNode = nodeMap.get(node.getParent());
+ if (parentNode != null) {
+ parentNode.getChildren().add(node);
+ }
+ }
+ }
+ return roots;
+ }
+
+}
diff --git a/business/src/main/resources/mapper/ProjectEngineeringMapper.xml b/business/src/main/resources/mapper/ProjectEngineeringMapper.xml
index eeafba2..a5cf56d 100644
--- a/business/src/main/resources/mapper/ProjectEngineeringMapper.xml
+++ b/business/src/main/resources/mapper/ProjectEngineeringMapper.xml
@@ -64,7 +64,6 @@
<select id="getPage" resultMap="BaseResultMap">
SELECT
TPE.project_info_id,
-
TPE.project_type,
TPE.investment_amount,
TPE.status,
diff --git a/business/src/main/resources/mapper/ProjectProcessMapper.xml b/business/src/main/resources/mapper/ProjectProcessMapper.xml
index 70b2fd1..0b9ec31 100644
--- a/business/src/main/resources/mapper/ProjectProcessMapper.xml
+++ b/business/src/main/resources/mapper/ProjectProcessMapper.xml
@@ -56,16 +56,68 @@
<result column="project_owner_unit" property="projectOwnerUnit" />
<result column="project_owner_unit_name" property="projectOwnerUnitName" />
<result column="project_contact_person" property="projectContactPerson" />
+ <result column="competent_department" property="competentDepartment" />
+ <result column="competent_department_name" property="competentDepartmentName" />
<result column="contact" property="contact" />
<result column="update_by" property="updateBy" />
<result column="create_by" property="createBy" />
<result column="process_def_id" property="processDefId" />
<result column="process_ins_id" property="processInsId" />
- <collection property="children" ofType="com.ycl.domain.vo.ProjectEngineeringVO" select="getProjectEngineering" column="id"></collection>
+<!-- <collection property="children" ofType="com.ycl.domain.vo.ProjectEngineeringVO" select="getProjectEngineering" column="id"></collection>-->
</resultMap>
- <select id="getProjectEngineering" parameterType="long" resultMap="com.ycl.mapper.ProjectEngineeringMapper.BaseResultMap">
- SELECT * FROM t_project_engineering WHERE project_info_id = #{id} and deleted = 0 AND parent_id = '0' ORDER BY gmt_create
+ <resultMap id="EngineeringMap" type="com.ycl.domain.vo.ProjectEngineeringVO">
+ <id column="id" property="id"/>
+ <result column="project_name" property="projectName" />
+ <result column="project_type" property="projectType" />
+ <result column="investment_amount" property="investmentAmount" />
+ <result column="status" property="status" />
+ <result column="unit" property="projectOwnerUnit" />
+ <result column="department" property="competentDepartment" />
+ <result column="year" property="year" />
+ <result column="parent_id" property="parent" />
+ <result column="project_owner_unit_name" property="projectOwnerUnitName" />
+ <result column="competent_department_name" property="competentDepartmentName" />
+<!-- <collection property="children" ofType="com.ycl.domain.vo.ProjectEngineeringVO" select="getProjectEngineeringList" column="id"></collection>-->
+ </resultMap>
+
+ <select id="getProjectEngineeringList" parameterType="string" resultMap="EngineeringMap">
+ SELECT TPE.project_info_id,
+ TPE.project_name,
+ TPE.project_type,
+ TPE.investment_amount,
+ TPE.status,
+ TPE.id,
+ TPE.unit,
+ TPE.department,
+ TPE.parent_id,
+ TPE.year,
+ (SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TPE.unit) AS unit_name,
+ (SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TPE.department) AS department_name
+ FROM t_project_engineering TPE
+ INNER JOIN t_project_info TPI ON TPI.id = TPE.project_info_id AND TPI.deleted = 0
+ WHERE
+ TPE.parent_id = #{id} and TPE.deleted = 0
+ ORDER BY
+ TPE.gmt_create
+ </select>
+
+ <select id="getEngineeringList" parameterType="long" resultMap="EngineeringMap">
+ WITH RECURSIVE temp_table AS (
+ SELECT
+ id, project_info_id, project_name, project_type, investment_amount, status, unit, department, parent_id, year, gmt_create FROM t_project_engineering WHERE project_info_id = #{projectId} AND parent_id = '0' AND deleted = 0
+ UNION ALL
+ SELECT
+ TPE.id, TPE.project_info_id, TPE.project_name, TPE.project_type, TPE.investment_amount, TPE.status, TPE.unit, TPE.department, TPE.parent_id, TPE.year, TPE.gmt_create FROM t_project_engineering TPE INNER JOIN temp_table tb ON TPE.parent_id = tb.id AND TPE.deleted = 0
+ )
+ 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
+ FROM
+ temp_table TT
+ ORDER BY
+ TT.gmt_create DESC
</select>
@@ -87,6 +139,8 @@
TPP.process_def_id,
TPP.process_ins_id,
TPIF.total_investment as investmentAmount,
+ (SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = PI.project_owner_unit) AS project_owner_unit_name,
+ (SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = PI.competent_department) AS competent_department_name,
d.dept_name as project_owner_unit_name
FROM
t_project_info PI
--
Gitblit v1.8.0