zhubaomin
2024-09-20 d788dc245d3c69e5499cc342725446ca770a4c3d
Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
3个文件已修改
27 ■■■■ 已修改文件
pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/QueryVo.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
@@ -26,8 +26,8 @@
                <item4 name="银行转账"/>
            </payments>
            <settings>
                <item1 item_name="lng" item_value="101.87345" remarks="经度"/>
                <item2 item_name="lat" item_value="25.70424" remarks="纬度"/>
                <item1 item_name="lng" item_value="101.89878161146011" remarks="经度"/>
                <item2 item_name="lat" item_value="25.673963608371185" remarks="纬度"/>
            </settings>
            <waterTypes>
                <item1 typeName="灌溉用水"/>
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
@@ -325,6 +325,16 @@
      <if test = "address != null and address !=''">
        AND cli.address like CONCAT('%',#{address},'%')
      </if>
      <if test = "villageId != null and villageId !=''">
        AND cli.villageId =  #{villageId}
      </if>
      <if test = "blockId != null and blockId !=''">
        AND cli.blockId =  #{blockId}
      </if>
      <if test = "divideId != null and divideId !=''">
        AND cli.divideId =  #{divideId}
      </if>
    </where>
  </select>
@@ -384,6 +394,12 @@
      <if test = "villageId != null and villageId !=''">
        AND cli.villageId =  #{villageId}
      </if>
      <if test = "blockId != null and blockId !=''">
        AND cli.blockId =  #{blockId}
      </if>
      <if test = "divideId != null and divideId !=''">
        AND cli.divideId =  #{divideId}
      </if>
    </where>
    ORDER BY cli.operateDt DESC
    <trim prefix="limit " >
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/QueryVo.java
@@ -29,8 +29,11 @@
    //@Schema(description = "村ID")
    //public Long villageId ;
    //
    //@Schema(description = "片区ID")
    //public Long blockId ;
    @Schema(description = "片区ID")
    public String blockId ;
    @Schema(description = "分水房ID")
    public String divideId ;
    @Schema(description = "农户姓名")
    public String name;