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/ProjectPlanProgressReportMapper.xml | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 5 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml b/business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml
index 8a6d576..5e7ddeb 100644
--- a/business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml
+++ b/business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml
@@ -10,11 +10,32 @@
<result column="progress_status" property="progressStatus" />
<result column="actual_invest" property="actualInvest" />
</resultMap>
-
-
-
-
-
+ <insert id="insertOne">
+ INSERT INTO t_project_plan_progress_report (
+ project_plan_info_id,
+ start_time,
+ end_time,
+ progress_status,
+ actual_invest
+ )
+ VALUES (
+ #{projectPlanInfoId},
+ #{startTime},
+ #{endTime},
+ #{progressStatus},
+ #{actualInvest}
+ )
+ </insert>
+ <update id="updateOne">
+ UPDATE t_project_plan_progress_report
+ SET
+ start_time = #{startTime},
+ end_time = #{endTime},
+ progress_status = #{progressStatus},
+ actual_invest = #{actualInvest}
+ WHERE
+ id = #{id}
+ </update>
<select id="getById" resultMap="BaseResultMap">
@@ -46,4 +67,33 @@
TPPPR.deleted = 0
</select>
+
+ <select id="getDetail" resultType="com.ycl.domain.vo.ProgressReportResponseVO">
+ SELECT
+ ppi.id,
+ pppr.id AS progress_report_id,
+ pper.id AS examine_record_id,
+ ppr.plan_time,
+ ppr.plan_time_flag,
+ ppi.title,
+ ppi.start_time,
+ ppi.end_time,
+ pppr.start_time AS actual_start_time,
+ pppr.end_time AS actual_end_time,
+ pppr.progress_status,
+ pppr.actual_invest,
+ pper.department_examine,
+ pper.department_approval,
+ pper.department_approval_reply,
+ pper.manage_examine,
+ pper.manage_approval,
+ pper.manage_approval_reply
+ FROM t_project_plan_info AS ppi
+ INNER JOIN t_project_plan_record AS ppr ON ppi.project_plan_record_id = ppr.id
+ LEFT JOIN t_project_plan_progress_report AS pppr ON pppr.project_plan_info_id = ppi.id
+ RIGHT JOIN t_project_plan_examine_record AS pper ON pper.project_plan_info_id = ppi.id
+ WHERE ppi.id = #{id}
+ ORDER BY pper.gmt_create DESC LIMIT 1
+ </select>
+
</mapper>
--
Gitblit v1.8.0