From 0b9589ba83464d35e7f43d6151fa2aec1637b61e Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 24 Jul 2025 09:36:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=BF=9B=E5=BA=A6=E5=88=86?=
 =?UTF-8?q?=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/domain/ProjectProgressNew.java              |  4 ++++
 .../main/resources/mapper/ProjectProgressNewMapper.xml | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectProgressNew.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectProgressNew.java
index 54ef82f..c14b865 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectProgressNew.java
+++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectProgressNew.java
@@ -82,6 +82,10 @@ public class ProjectProgressNew extends BaseEntity {
     /** 关键路径任务标识（是 / 否） */
     private String keyPathFlag;
 
+    private String delayStatus;
+
+    private String delayPolicy;
+
     private String month;
 
     private String monthValue;
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectProgressNewMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectProgressNewMapper.xml
index b55f972..837c4ca 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectProgressNewMapper.xml
+++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectProgressNewMapper.xml
@@ -19,6 +19,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="delayActor"    column="delay_actor"    />
         <result property="resourceMatchStatus"    column="resource_match_status"    />
         <result property="keyPathFlag"    column="key_path_flag"    />
+        <result property="delayStatus"    column="delay_status"    />
+        <result property="delayPolicy"    column="delay_policy"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -26,7 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectProjectProgressNewVo">
-        select id, project_id, project_name, task_code, task_name, plan_start_time, plan_end_time, actual_start_time, actual_end_time, process_diff, total_effort, complete_effort, delay_actor, resource_match_status, key_path_flag, create_by, create_time, update_by, update_time from tb_project_progress_new
+        select id, project_id, project_name, task_code, task_name, plan_start_time,
+               plan_end_time, actual_start_time, actual_end_time, process_diff, total_effort,
+               complete_effort, delay_actor, resource_match_status, key_path_flag,
+               create_by, create_time, update_by, update_time, delay_status, delay_policy
+        from tb_project_progress_new
     </sql>
 
     <select id="selectProjectProgressNewList" parameterType="com.securitycontrol.screen.domain.ProjectProgressNew" resultMap="ProjectProgressNewResult">
@@ -44,6 +50,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalEffort != null  and totalEffort != ''"> and total_effort = #{totalEffort}</if>
             <if test="completeEffort != null  and completeEffort != ''"> and complete_effort = #{completeEffort}</if>
             <if test="delayActor != null  and delayActor != ''"> and delay_actor = #{delayActor}</if>
+            <if test="delayStatus != null  and delayStatus != ''"> and delay_status = #{delayStatus}</if>
+            <if test="delayPolicy != null  and delayPolicy != ''"> and delay_policy = #{delayPolicy}</if>
             <if test="resourceMatchStatus != null  and resourceMatchStatus != ''"> and resource_match_status = #{resourceMatchStatus}</if>
             <if test="keyPathFlag != null  and keyPathFlag != ''"> and key_path_flag = #{keyPathFlag}</if>
         </where>