报汛列表接口，增加条件

guoshilong

2023-05-30 563c553359e40aa48a654a140d6fd7d9619af38f

报汛列表接口，增加条件

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java

@@ -57,15 +57,15 @@
    private String wlwOverZ;

    /**
     * 人工观测水位超汛幅度
     * 人工观测水位超溢洪道
     */
    @ApiModelProperty("人工观测水位超汛幅度")
    @ApiModelProperty("人工观测水位超溢洪道")
    private String personOverZ;

    /**
     * 新站监测水位（米）
     * 人工监测水位（米）
     */
    @ApiModelProperty("新站监测水位（米）")
    @ApiModelProperty("人工监测水位（米）")
    private String personRz;

    /**

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml

@@ -44,6 +44,15 @@
        <if test="reportFloodRecord.isAudit != null and reportFloodRecord.isAudit !=''">
            AND r.is_audit = #{reportFloodRecord.isAudit}
        </if>
        <if test="reportFloodRecord.reservoirId !=null and reportFloodRecord.reservoirId !=''">
            AND r.reservoir_id = #{reportFloodRecord.reservoirId}
        </if>
        <if test="reportFloodRecord.startTime !=null and reportFloodRecord.startTime !=''">
            AND DATE_FORMAT(r.create_time,'%Y-%m-%d') &gt;= #{reportFloodRecord.startTime}
        </if>
        <if test="reportFloodRecord.endTime !=null and reportFloodRecord.endTime !=''">
            AND DATE_FORMAT(r.create_time,'%Y-%m-%d') &lt;= #{reportFloodRecord.endTime}
        </if>
        ORDER BY CREATE_TIME DESC
    </select>
    <select id="customizeGetDetail" resultMap="vo">

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/vo/ReportFloodRecordVO.java

@@ -9,4 +9,15 @@
     * 水库名
     */
    private String reservoirName;

    /**
     * 开始时间
     */
    private String startTime;


    /**
     * 结束时间
     */
    private String endTime;
}