From 292b7097e838a34c157c4ff32a61add68bdabd96 Mon Sep 17 00:00:00 2001
From: liuao <1150003126@qq.com>
Date: Mon, 12 May 2025 09:28:49 +0800
Subject: [PATCH] =?UTF-8?q?2025=E5=B9=B45=E6=9C=8812=E6=97=A509:28:42?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../boot/intelligencesite/entity/IConstructionReport.java     | 2 +-
 src/main/resources/mappers/IConstructionReportMapper.xml      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zilber/boot/intelligencesite/entity/IConstructionReport.java b/src/main/java/com/zilber/boot/intelligencesite/entity/IConstructionReport.java
index 7c79245..6ab0bf3 100644
--- a/src/main/java/com/zilber/boot/intelligencesite/entity/IConstructionReport.java
+++ b/src/main/java/com/zilber/boot/intelligencesite/entity/IConstructionReport.java
@@ -44,7 +44,7 @@ public class IConstructionReport implements Serializable {
     private String cycle;
 
     @ApiModelProperty(value = "计划id")
-    private Long planId;
+    private String planId;
 
     @ApiModelProperty(value = "计划名称")
     private String planName;
diff --git a/src/main/resources/mappers/IConstructionReportMapper.xml b/src/main/resources/mappers/IConstructionReportMapper.xml
index ca355c8..35e195c 100644
--- a/src/main/resources/mappers/IConstructionReportMapper.xml
+++ b/src/main/resources/mappers/IConstructionReportMapper.xml
@@ -8,7 +8,7 @@
         <result property="id" column="id" jdbcType="INTEGER"/>
         <result property="date" column="date" jdbcType="TIMESTAMP"/>
         <result property="cycle" column="cycle" jdbcType="VARCHAR"/>
-        <result property="planId" column="plan_id" jdbcType="INTEGER"/>
+        <result property="planId" column="plan_id" jdbcType="VARCHAR"/>
         <result property="planName" column="plan_name" jdbcType="VARCHAR"/>
         <result property="totalProgress" column="total_progress" jdbcType="VARCHAR"/>
         <result property="manpower" column="manpower" jdbcType="VARCHAR"/>
@@ -31,7 +31,7 @@ id, date, cycle, plan_id, plan_name, total_progress, manpower, materials_use, eq
         <where>
 			<if test="date != null"> and date=#{date}</if>
 			<if test="cycle != null and cycle != ''"> and cycle like concat('%', #{cycle}, '%')</if>
-			<if test="planId != null"> and plan_id=#{planId}</if>
+			<if test="planId != null and planId != ''"> and plan_id=#{planId}</if>
 			<if test="planName != null and planName != ''"> and plan_name like concat('%', #{planName}, '%')</if>
 			<if test="totalProgress != null and totalProgress != ''"> and total_progress like concat('%', #{totalProgress}, '%')</if>
 			<if test="manpower != null and manpower != ''"> and manpower like concat('%', #{manpower}, '%')</if>