From 1d3e23787a7c7c959925361ebba0671e3f36c53a Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 30 十一月 2024 08:20:32 +0800
Subject: [PATCH] 配置文件调整

---
 business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml |   40 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml b/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml
index be6c346..930a9f2 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">
@@ -134,7 +158,8 @@
                  FROM t_project_plan_examine_record AS pper
                  WHERE project_plan_record_id = #{projectPlanRecordId}
              ) AS ranked
-        WHERE rn = 1;
+        WHERE rn = 1 AND ranked.deleted = 0
+        Order by gmt_create DESC
     </select>
 
     <select id="getPlanLog" resultType="com.ycl.domain.vo.DepartmentApprovalResponseVO">
@@ -153,5 +178,14 @@
             pper.project_plan_record_id = #{projectPlanRecordId}
         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
+        WHERE ppe.department_user_id = #{userId} or manager_user_id = #{userId}
+    </select>
 
 </mapper>

--
Gitblit v1.8.0