From 1519a7c81e6566dd0cbc6acfb1b5e92c3aaba7df Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 02 三月 2025 10:53:57 +0800
Subject: [PATCH] 赋码定时任务只判断超时，且用红码时间判断
---
business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml b/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml
index 930a9f2..bac2ea6 100644
--- a/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml
+++ b/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml
@@ -143,6 +143,7 @@
<select id="selectInfo" resultType="com.ycl.domain.vo.DepartmentApprovalResponseVO">
SELECT
ranked.id,
+ ppi.id AS project_plan_info_id,
(SELECT title FROM t_project_plan_info WHERE id = ranked.project_plan_info_id) as title,
ranked.department_examine,
ranked.department_approval,
@@ -150,7 +151,8 @@
ranked.manage_examine,
ranked.manage_approval,
ranked.manage_approval_reply,
- ranked.gmt_create
+ ranked.gmt_create,
+ ppi.plan_status
FROM (
SELECT
*,
@@ -158,6 +160,7 @@
FROM t_project_plan_examine_record AS pper
WHERE project_plan_record_id = #{projectPlanRecordId}
) AS ranked
+ LEFT JOIN t_project_plan_info ppi ON ranked.project_plan_info_id = ppi.id
WHERE rn = 1 AND ranked.deleted = 0
Order by gmt_create DESC
</select>
@@ -176,6 +179,8 @@
FROM t_project_plan_examine_record AS pper
WHERE
pper.project_plan_record_id = #{projectPlanRecordId}
+ AND pper.event_type != 2
+ AND pper.deleted = 0
ORDER BY gmt_update DESC
</select>
<select id="todoList" resultMap="selectToDoResultMap">
@@ -184,7 +189,7 @@
from t_project_plan_examine_record ppe
LEFT JOIN t_project_plan_info ppi on ppe.project_plan_info_id = ppi.id
LEFT JOIN t_project_plan_record ppr on ppe.project_plan_record_id = ppr.id
- LEFT JOIN t_project_info pi on ppr.project_info_id = pi.id
+ Left JOIN t_project_info pi on ppr.project_info_id = pi.id AND pi.deleted = 0
WHERE ppe.department_user_id = #{userId} or manager_user_id = #{userId}
</select>
--
Gitblit v1.8.0