From 2dd645b5346f510d1207346347f1fa70a204d9d3 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 05 十一月 2026 16:11:34 +0800
Subject: [PATCH] 1. 完成项目管理全流程优化，补充阶段推进、汇报统计及生命周期记录。 2. 完成业务与项目数据关联，支持查看项目进度、详情及相关附件。 3. 完成采购审批流程接入，支持配置审批人员及采购业务审批。 4. 精简用户、角色、部门、菜单和字典，完善操作日志及附件下载。
---
src/main/resources/mapper/projectManagement/InfoMapper.xml | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/projectManagement/InfoMapper.xml b/src/main/resources/mapper/projectManagement/InfoMapper.xml
index bd245c8..c6b9683 100644
--- a/src/main/resources/mapper/projectManagement/InfoMapper.xml
+++ b/src/main/resources/mapper/projectManagement/InfoMapper.xml
@@ -21,10 +21,6 @@
typeHandler="com.ruoyi.common.handler.LongListJacksonTypeHandler"/>
<result property="projectManagerNames" column="project_manager_names"
typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
- <result property="projectExecutorIds" column="project_executor_ids"
- typeHandler="com.ruoyi.common.handler.LongListJacksonTypeHandler"/>
- <result property="projectExecutorNames" column="project_executor_names"
- typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
<result property="followCycle" column="follow_cycle" jdbcType="VARCHAR"/>
<result property="followDetail" column="follow_detail" jdbcType="VARCHAR"/>
<result property="currentPhase" column="current_phase" jdbcType="VARCHAR"/>
@@ -56,7 +52,6 @@
client_id,client_name,project_management_info_parent_id,
establish_time,project_management_plan_id,source,project_classification,
project_leader_id,project_leader_name,project_manager_ids,project_manager_names,
- project_executor_ids,project_executor_names,
follow_cycle,follow_detail,current_phase,source_business_id,
manager_id,manager_name,salesman_id,
salesman_name,is_delete,create_time,
@@ -74,14 +69,11 @@
typeHandler="com.ruoyi.common.handler.LongListJacksonTypeHandler"/>
<result column="project_manager_names" property="projectManagerNames"
typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
- <result column="project_executor_ids" property="projectExecutorIds"
- typeHandler="com.ruoyi.common.handler.LongListJacksonTypeHandler"/>
- <result column="project_executor_names" property="projectExecutorNames"
- typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
<result column="follow_cycle" property="followCycle"/>
<result column="follow_detail" property="followDetail"/>
<result column="current_phase" property="currentPhase"/>
<result column="source_business_id" property="sourceBusinessId"/>
+ <result column="project_progress" property="projectProgress"/>
<result column="plan_stage"
property="planStage"
@@ -89,7 +81,10 @@
</resultMap>
<select id="searchListInfo" resultMap="ListInfoVoMap">
- select t1.*, t2.name as project_management_plan_name,t3.title as projectManagementInfoParentName
+ select t1.*, t2.name as project_management_plan_name,t3.title as projectManagementInfoParentName,
+ coalesce((select sum(m.project_weight * m.current_progress) / 100
+ from project_management_module m
+ where m.project_id=t1.id and m.is_deleted=0), 0) as project_progress
from project_management_info as t1
left join project_management_plan as t2 on t1.project_management_plan_id = t2.id
left join project_management_info as t3 on t1.project_management_info_parent_id = t3.id
--
Gitblit v1.9.3