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 @@ - + @@ -31,7 +31,7 @@ id, date, cycle, plan_id, plan_name, total_progress, manpower, materials_use, eq and date=#{date} and cycle like concat('%', #{cycle}, '%') - and plan_id=#{planId} + and plan_id=#{planId} and plan_name like concat('%', #{planName}, '%') and total_progress like concat('%', #{totalProgress}, '%') and manpower like concat('%', #{manpower}, '%')