Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2024-07-26 33be8f91bd328a543fe103afd6ef5ab19e0c8cc7

Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml

@@ -396,6 +396,9 @@
        <if test="valveState != null">
            and rash.valve_state = #{valveState,jdbcType=TINYINT}
        </if>
        <if test="intakeId != null">
            and rash.intake_id = #{intakeId}
        </if>
        <if test="intakeName != null">
            and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
        </if>
@@ -477,6 +480,9 @@
            <if test="valveState != null">
                and rash.valve_state = #{valveState,jdbcType=TINYINT}
            </if>
            <if test="intakeId != null">
                and rash.intake_id = #{intakeId}
            </if>
            <if test="intakeName != null">
                and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
            </if>

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml

@@ -378,6 +378,9 @@
      <if test="valveState != null">
        and rasl.valve_state = #{valveState,jdbcType=TINYINT}
      </if>
      <if test="intakeId != null">
        and rasl.intake_id = #{intakeId}
      </if>
      <if test="intakeName != null">
        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
      </if>
@@ -459,6 +462,9 @@
      <if test="valveState != null">
        and rasl.valve_state = #{valveState,jdbcType=TINYINT}
      </if>
      <if test="intakeId != null">
        and rasl.intake_id = #{intakeId}
      </if>
      <if test="intakeName != null">
        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
      </if>

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml

@@ -197,6 +197,9 @@
      <if test="clientName != null">
        and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
      </if>
      <if test="clientId != null">
        and rcadl.client_id = #{clientId}
      </if>
      <if test="startDt != null">
        and rcadl.dt &gt;= #{startDt,jdbcType=DATE}
      </if>
@@ -225,6 +228,9 @@
      <if test="clientName != null">
        and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
      </if>
      <if test="clientId != null">
        and rcadl.client_id = #{clientId}
      </if>
      <if test="startDt != null">
        and rcadl.dt &gt;= #{startDt,jdbcType=DATE}
      </if>

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml

@@ -187,6 +187,9 @@
      <if test="clientName != null">
        and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
      </if>
      <if test="clientId != null">
        and rcad.client_id = #{clientId}
      </if>
      <if test="startDt != null">
        and rcad.dt &gt;= #{startDt,jdbcType=DATE}
      </if>
@@ -215,6 +218,9 @@
      <if test="clientName != null">
        and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
      </if>
      <if test="clientId != null">
        and rcad.client_id = #{clientId}
      </if>
      <if test="startDt != null">
        and rcad.dt &gt;= #{startDt,jdbcType=DATE}
      </if>

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayLastMapper.xml

@@ -176,6 +176,9 @@
      <if test="intakeName != null">
        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
      </if>
      <if test="intakeId != null">
        and riadl.intake_id = #{intakeId}
      </if>
      <if test="startDt != null">
        and riadl.dt &gt;= #{startDt,jdbcType=DATE}
      </if>
@@ -202,6 +205,9 @@
      <if test="intakeName != null">
        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
      </if>
      <if test="intakeId != null">
        and riadl.intake_id = #{intakeId}
      </if>
      <if test="startDt != null">
        and riadl.dt &gt;= #{startDt,jdbcType=DATE}
      </if>

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmIntakeAmountDayMapper.xml

@@ -164,6 +164,9 @@
      <if test="intakeName != null">
        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
      </if>
      <if test="intakeId != null">
        and riad.intake_id = #{intakeId}
      </if>
      <if test="startDt != null">
        and riad.dt &gt;= #{startDt,jdbcType=DATE}
      </if>
@@ -190,6 +193,9 @@
      <if test="intakeName != null">
        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
      </if>
      <if test="intakeId != null">
        and riad.intake_id = #{intakeId}
      </if>
      <if test="startDt != null">
        and riad.dt &gt;= #{startDt,jdbcType=DATE}
      </if>

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml

@@ -168,6 +168,9 @@
      <if test="intakeName != null">
        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
      </if>
      <if test="intakeId != null">
        and rldl.intake_id = #{intakeId}
      </if>
      <if test="startDt != null">
        and rldl.dt &gt;= #{startDt,jdbcType=DATE}
      </if>
@@ -193,6 +196,9 @@
      <if test="intakeName != null">
        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
      </if>
      <if test="intakeId != null">
        and rldl.intake_id = #{intakeId}
      </if>
      <if test="startDt != null">
        and rldl.dt &gt;= #{startDt,jdbcType=DATE}
      </if>

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayMapper.xml

@@ -158,6 +158,9 @@
      <if test="intakeName != null">
        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
      </if>
      <if test="intakeId != null">
        and rld.intake_id = #{intakeId}
      </if>
      <if test="startDt != null">
        and rld.dt &gt;= #{startDt,jdbcType=DATE}
      </if>
@@ -183,6 +186,9 @@
      <if test="intakeName != null">
        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
      </if>
      <if test="intakeId != null">
        and rld.intake_id = #{intakeId}
      </if>
      <if test="startDt != null">
        and rld.dt &gt;= #{startDt,jdbcType=DATE}
      </if>

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/clientAmountDay/ClientAmountDayQueryVo.java

@@ -1,6 +1,8 @@
package com.dy.pipIrrRemote.records.clientAmountDay;

import com.dy.common.webUtil.QueryConditionVo;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;

@@ -21,6 +23,9 @@
@Schema(name = "农户日用水量统计查询条件")
public class ClientAmountDayQueryVo extends QueryConditionVo {

    @Schema(description = "农户ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    private String clientId;

    @Schema(description = "农户姓名", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    private String clientName;


 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateQueryVo.java

@@ -26,6 +26,9 @@
    @Schema(description = "取水口名称", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    private String intakeName;

    @Schema(description = "取水口ID")
    private String intakeId;

    @Schema(description = "阀门状态", requiredMode = Schema.RequiredMode.NOT_REQUIRED)//（0打开、1关闭）
    private Byte valveState;


 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/intakeAmountDay/IntakeAmountDayQueryVo.java

@@ -24,6 +24,9 @@
    @Schema(description = "取水口名称", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    private String intakeName;

    @Schema(description = "取水口ID")
    private String intakeId;

    @Schema(description = "统计开始日期", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    private Date startDt;


 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayQueryVo.java

@@ -25,6 +25,9 @@
    @Schema(description = "取水口名称", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    private String intakeName;

    @Schema(description = "取水口ID")
    private String intakeId;

    @Schema(description = "统计开始日期", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    private Date startDt;