From e929e18f8d04e72a23c24b06b89ab2d7be6f9c84 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 28 十一月 2024 06:04:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml b/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml
index 14a03c2..1f5eea5 100644
--- a/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml
+++ b/business/src/main/resources/mapper/ProjectPlanExamineRecordMapper.xml
@@ -49,7 +49,8 @@
delay_start_time,
delay_end_time,
gmt_create,
- gmt_update
+ gmt_update,
+ deleted
) values (
#{projectPlanRecordId},
#{projectPlanInfoId},
@@ -65,7 +66,8 @@
#{delayStartTime},
#{delayEndTime},
#{gmtCreate},
- #{gmtUpdate}
+ #{gmtUpdate},
+ #{deleted}
)
</insert>
<update id="updateByForm">
@@ -142,7 +144,7 @@
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
</select>
<select id="getPlanLog" resultType="com.ycl.domain.vo.DepartmentApprovalResponseVO">
--
Gitblit v1.8.0