2025年5月12日09:28:42

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;

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>