From d788dc245d3c69e5499cc342725446ca770a4c3d Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 20 九月 2024 15:49:44 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/QueryVo.java | 7 +++++--
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml | 16 ++++++++++++++++
pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml | 4 ++--
3 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
index 6511c1d..ade2283 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
+++ b/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="鐏屾簤鐢ㄦ按"/>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
index 30c4b20..65bb9e1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
+++ b/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 " >
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/QueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/QueryVo.java
index fb6f34f..be9285f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/QueryVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/QueryVo.java
@@ -29,8 +29,11 @@
//@Schema(description = "鏉慖D")
//public Long villageId ;
//
- //@Schema(description = "鐗囧尯ID")
- //public Long blockId ;
+ @Schema(description = "鐗囧尯ID")
+ public String blockId ;
+
+ @Schema(description = "鍒嗘按鎴縄D")
+ public String divideId ;
@Schema(description = "鍐滄埛濮撳悕")
public String name;
--
Gitblit v1.8.0