From cd6de797868cd3ba10b4bd7fad0d3fdea208b2d5 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 11 二月 2025 11:45:55 +0800
Subject: [PATCH] 按时完成、超时事项、即将超时的统计逻辑更换
---
business/src/main/resources/mapper/ProjectProcessMapper.xml | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectProcessMapper.xml b/business/src/main/resources/mapper/ProjectProcessMapper.xml
index 9985dee..6aded0e 100644
--- a/business/src/main/resources/mapper/ProjectProcessMapper.xml
+++ b/business/src/main/resources/mapper/ProjectProcessMapper.xml
@@ -14,11 +14,10 @@
<result column="invest_type" property="investType" />
<result column="project_phase" property="projectPhase" />
<result column="tag" property="tag" />
- <result column="competent_department" property="competentDepartment" />
+<!-- <result column="competent_department" property="competentDepartment" />-->
<result column="area_code" property="areaCode" />
- <result column="management_centralization" property="managementCentralization" />
+<!-- <result column="management_centralization" property="managementCentralization" />-->
<result column="project_approval_type" property="projectApprovalType" />
- <result column="investment_catalogue" property="investmentCatalogue" />
<result column="importance_type" property="importanceType" />
<result column="year" property="year" />
<result column="year_invest_amount" property="yearInvestAmount" />
@@ -38,12 +37,10 @@
<result column="gmt_update_time" property="gmtUpdateTime" />
<result column="update_by" property="updateBy" />
<result column="create_by" property="createBy" />
- <result column="flowable_process_id" property="flowableProcessId" />
+ <result column="process_def_id" property="processDefId" />
+ <result column="process_ins_id" property="processInsId" />
<!-- <association property="id" column=""-->
</resultMap>
-
-
-
@@ -51,7 +48,7 @@
<select id="getById" resultMap="BaseResultMap">
SELECT
TPP.project_id,
- TPP.flowable_process_id,
+ TPP.process_def_id,
TPP.id
FROM
t_project_process TPP
@@ -63,19 +60,32 @@
<select id="getPage" resultMap="BaseResultMap">
SELECT
PI.*,
- TPP.flowable_process_id
+ TPP.process_def_id,
+ TPP.process_ins_id
FROM
t_project_info PI
- LEFT JOIN t_project_process TPP ON TPP.project_id = PI.id AND TPP.deleted = 0 AND PI.deleted = 0
+ LEFT JOIN t_project_process TPP ON TPP.project_id = PI.id AND TPP.deleted = 0
+ LEFT JOIN sys_dept d ON d.dept_id = PI.project_owner_unit
<where>
+ AND PI.used_status = 2 AND PI.deleted = 0
<if test="query.projectName != null and query.projectName != ''">
AND PI.project_name like concat('%', #{query.projectName}, '%')
</if>
<if test="query.projectCode != null and query.projectCode != ''">
AND PI.project_code like concat('%', #{query.projectCode}, '%')
</if>
+ ${query.params.dataScope}
</where>
</select>
+
+ <select id="getProjectInfo" parameterType="string" resultType="com.ycl.domain.entity.ProjectInfo">
+ SELECT
+ PI.id, PI.project_name
+ FROM
+ t_project_process PP
+ INNER JOIN t_project_info PI ON PP.project_id = PI.id AND PI.deleted = 0 AND PP.process_ins_id = #{processInsId}
+ </select>
+
</mapper>
--
Gitblit v1.8.0