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 | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml b/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml
index be6c346..bac2ea6 100644
--- a/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml
+++ b/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml
@@ -33,6 +33,20 @@
<result property="gmtCreate" column="gmt_create" />
</resultMap>
+ <resultMap id="selectToDoResultMap" type="com.ycl.domain.vo.ProjectProcessToDoVo">
+ <result column="plan_id" property="planId"/>
+ <result column="project_info_id" property="projectInfoId"></result>
+ <result column="project_name" property="projectName"></result>
+ <result column="project_plan_info_id" property="projectPlanInfoId"></result>
+ <result column="project_plan_record_id" property="projectPlanRecordId"></result>
+ <result column="project_plan_examine_record_id" property="projectPlanExamineRecordId"></result>
+ <result column="title" property="projectPlanInfoTitle"></result>
+ <result column="start_time" property="startTime"></result>
+ <result column="end_time" property="endTime"></result>
+ <result column="progress_status" property="progressStatus"></result>
+ <result column="assignee_name" property="assigneeName"/>
+ </resultMap>
+
<insert id="insertOne">
insert into t_project_plan_examine_record (
project_plan_record_id,
@@ -49,7 +63,8 @@
delay_start_time,
delay_end_time,
gmt_create,
- gmt_update
+ gmt_update,
+ deleted
) values (
#{projectPlanRecordId},
#{projectPlanInfoId},
@@ -65,9 +80,18 @@
#{delayStartTime},
#{delayEndTime},
#{gmtCreate},
- #{gmtUpdate}
+ #{gmtUpdate},
+ #{deleted}
)
</insert>
+ <update id="updateByForm">
+ update t_project_plan_examine_record
+ set
+ department_approval_reply = #{form.departmentApprovalReply},
+ manage_approval_reply = #{form.manageApprovalReply}
+ where
+ id = #{form.id}
+ </update>
<select id="getById" resultMap="BaseResultMap">
@@ -119,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,
@@ -126,7 +151,8 @@
ranked.manage_examine,
ranked.manage_approval,
ranked.manage_approval_reply,
- ranked.gmt_create
+ ranked.gmt_create,
+ ppi.plan_status
FROM (
SELECT
*,
@@ -134,7 +160,9 @@
FROM t_project_plan_examine_record AS pper
WHERE project_plan_record_id = #{projectPlanRecordId}
) AS ranked
- WHERE rn = 1;
+ 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>
<select id="getPlanLog" resultType="com.ycl.domain.vo.DepartmentApprovalResponseVO">
@@ -151,7 +179,18 @@
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">
+ SELECT ppe.id project_plan_examine_record_id,ppi.title ,ppr.project_info_id,pi.project_name,ppi.start_time,ppi.end_time,ppi.progress_status,ppe.project_plan_info_id,ppe.project_plan_record_id,ppr.plan_id,
+ (SELECT user_name from sys_user WHERE user_id = #{userId}) as assignee_name
+ 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 AND pi.deleted = 0
+ WHERE ppe.department_user_id = #{userId} or manager_user_id = #{userId}
+ </select>
</mapper>
--
Gitblit v1.8.0