From 4cd71c0be46a461432989ae7c5d6d56d9e7bbbed Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 17 二月 2025 13:54:31 +0800
Subject: [PATCH] 查询待办任务时，判断是否挂起状态。增加一个临时导入项目的接口
---
business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml b/business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml
index 80f9304..8c2db13 100644
--- a/business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml
+++ b/business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml
@@ -10,12 +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">
@@ -48,17 +68,20 @@
</select>
- <select id="getDetail" resultType="com.ycl.domain.vo.ProgressReportResponseVO">
+ <select id="getDetail" resultType="com.ycl.domain.form.ProgressReportResponseForm">
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.progress_status AS progress_status_int,
ppi.start_time,
ppi.end_time,
pppr.start_time AS actual_start_time,
pppr.end_time AS actual_end_time,
- pppr.progress_status,
+ pppr.progress_status AS progress_status_str,
pppr.actual_invest,
pper.department_examine,
pper.department_approval,
@@ -69,8 +92,11 @@
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}
+ LEFT JOIN t_project_plan_examine_record AS pper ON pper.project_plan_info_id = ppi.id
+ WHERE
+ ppi.id = #{id}
+ AND pper.event_type = 2
+ AND pper.deleted = 0
ORDER BY pper.gmt_create DESC LIMIT 1
</select>
--
Gitblit v1.8.0