From 445043ee65eaa71b87f72ab9ff8633827b94d360 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 23 Jul 2025 20:29:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=92=8C=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/securitycontrol/screen/domain/ProjectNew.java    | 2 ++
 .../src/main/resources/mapper/ProjectNewMapper.xml       | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java
index 4b8b651..33be8fc 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java
+++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java
@@ -80,5 +80,7 @@ public class ProjectNew extends BaseEntity {
     @ApiModelProperty(value = "风险等级")
     private String riskLevel;
 
+    private String suggestion;
 
+    private String taskName;
 }
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectNewMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectNewMapper.xml
index 9e5afa0..5a644d6 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectNewMapper.xml
+++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectNewMapper.xml
@@ -18,10 +18,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="planCost"    column="plan_cost"    />
         <result property="actualCost"    column="actual_cost"    />
         <result property="riskLevel"    column="risk_level"    />
+        <result property="suggestion"    column="suggestion"    />
+        <result property="taskName"    column="task_name"    />
     </resultMap>
 
     <sql id="selectProjectNewVo">
-        select pro_id, sign_code, bid_code, pro_code, pro_name, status, plan_start_time, plan_end_time, start_time, end_time, diff_day, plan_cost, actual_cost, risk_level from tb_project_new
+        select pro_id, sign_code, bid_code, pro_code, pro_name, status, plan_start_time,
+               plan_end_time, start_time, end_time, diff_day, plan_cost, actual_cost, risk_level,
+               suggestion, task_name
+        from tb_project_new
     </sql>
 
     <select id="selectProjectNewList" parameterType="com.securitycontrol.screen.domain.ProjectNew" resultMap="ProjectNewResult">
@@ -40,6 +45,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="planCost != null  and planCost != ''"> and plan_cost = #{planCost}</if>
             <if test="actualCost != null "> and actual_cost = #{actualCost}</if>
             <if test="riskLevel != null  and riskLevel != ''"> and risk_level = #{riskLevel}</if>
+            <if test="suggestion != null  and suggestion != ''"> and suggestion = #{suggestion}</if>
+            <if test="taskName != null  and taskName != ''"> and task_name = #{taskName}</if>
         </where>
     </select>