From 526165e62a57d2644ba36e944ce6c516aac7c1cb Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Mon, 4 Aug 2025 08:58:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/water/SurveyController.java         |  1 +
 .../java/com/bonus/waterdesign/domain/Survey.java  | 12 ++++++++++++
 .../src/main/resources/mapper/SurveyMapper.xml     | 14 ++++++++++++--
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/SurveyController.java b/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/SurveyController.java
index dacc0d0..6c61edd 100644
--- a/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/SurveyController.java
+++ b/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/SurveyController.java
@@ -38,6 +38,7 @@ public class SurveyController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(Survey survey) {
         startPage();
+        survey.setCreateBy(getUserId().toString());
         List<Survey> list = surveyService.selectSurveyList(survey);
         return getDataTable(list);
     }
diff --git a/water-design-const/src/main/java/com/bonus/waterdesign/domain/Survey.java b/water-design-const/src/main/java/com/bonus/waterdesign/domain/Survey.java
index db67c69..f69ff74 100644
--- a/water-design-const/src/main/java/com/bonus/waterdesign/domain/Survey.java
+++ b/water-design-const/src/main/java/com/bonus/waterdesign/domain/Survey.java
@@ -43,6 +43,18 @@ public class Survey extends BaseEntity
     /** 模型id */
 
     private String modelId;
+
+    public String getModelName() {
+        return modelName;
+    }
+
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+
+    /** 模型名称 */
+
+    private String modelName;
     /** 勘查结果 */
 
     private String surveyResult;
diff --git a/water-design-const/src/main/resources/mapper/SurveyMapper.xml b/water-design-const/src/main/resources/mapper/SurveyMapper.xml
index 11b6e59..3cd5cac 100644
--- a/water-design-const/src/main/resources/mapper/SurveyMapper.xml
+++ b/water-design-const/src/main/resources/mapper/SurveyMapper.xml
@@ -18,6 +18,7 @@
 		<result property="updateTime"    column="update_time"     />
 		<result property="remark"        column="remark"          />
 		<result property="modelId"       column="model_id"        />
+		<result property="modelName"       column="model_name"        />
 		<result property="surveyResult"  column="survey_result"   />
 	</resultMap>
 
@@ -29,19 +30,23 @@
 		       tsi.survey_content,
 		       tsi.survey_result,
 		       tsi.model_id,
+		       tsi.model_name,
 		       tp.pro_name
 		from tb_survey_info tsi
-		left join tb_project tp on tp.id=tsi.pro_id
+		left join tb_project tp on tp.id = tsi.pro_id
 		where tsi.del_flag = '0'
 	</sql>
 
 	<select id="selectSurveyList" parameterType="Survey" resultMap="SurveyResult">
 		<include refid="selectSurvey"/>
+		<if test="createBy != null and createBy != ''">
+			AND tp.create_user = #{createBy}
+		</if>
 		<if test="proName != null and proName != ''">
 			AND tp.pro_name like concat('%', #{proName}, '%')
 		</if>
 		<if test="surveyUser != null and surveyUser != ''">
-			AND tsi.surveyUser like concat('%', #{surveyUser}, '%')
+			AND tsi.survey_user like concat('%', #{surveyUser}, '%')
 		</if>
 		<if test="surveyTime != null and surveyTime != ''">
 			AND tsi.survey_time like concat('%', #{surveyTime}, '%')
@@ -56,6 +61,8 @@
 			   tsi.survey_content,
 			   tsi.survey_result,
 			   tsi.model_id,
+			   tsi.pro_id,
+			   tsi.model_name,
 			   tp.pro_name
 		from tb_survey_info tsi
 		left join tb_project tp on tp.id=tsi.pro_id
@@ -72,6 +79,7 @@
 			<if test="surveyAttach != null and surveyAttach != ''">survey_attach = #{surveyAttach},</if>
 			<if test="updateBy != null and updateBy != ''">update_user = #{updateBy},</if>
 			<if test="modelId != null and modelId != ''">model_id = #{modelId},</if>
+			<if test="modelName != null and modelName != ''">model_name = #{modelName},</if>
 			<if test="surveyResult != null and surveyResult != ''">survey_result = #{surveyResult},</if>
 			update_time = sysdate()
 		</set>
@@ -87,6 +95,7 @@
 		<if test="surveyAttach != null and surveyAttach != ''">survey_attach,</if>
 		<if test="createBy != null and createBy != ''">create_user,</if>
 		<if test="modelId != null and modelId != ''">model_id,</if>
+		<if test="modelName != null and modelName != ''">model_name,</if>
 		<if test="surveyResult != null and surveyResult != ''">survey_result,</if>
 		create_time
 		)values(
@@ -97,6 +106,7 @@
 		<if test="surveyAttach != null and surveyAttach != ''">#{surveyAttach},</if>
 		<if test="createBy != null and createBy != ''">#{createBy},</if>
 		<if test="modelId != null and modelId != ''">#{modelId},</if>
+		<if test="modelName != null and modelName != ''">#{modelName},</if>
 		<if test="surveyResult != null and surveyResult != ''">#{surveyResult},</if>
 		sysdate()
 		)