From e10c9e150cef3096b295e6d9a3160862f4f0128d Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 26 八月 2024 15:26:45 +0800
Subject: [PATCH] 修改农户分页查询接口和查一个农户的所有卡接口
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
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 23e2a6b..30c4b20 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
@@ -286,7 +286,7 @@
address = #{address,jdbcType=VARCHAR},
remarks = #{remarks,jdbcType=VARCHAR},
`operator` = #{operator,jdbcType=BIGINT},
- operateDt = #{operatedt,jdbcType=TIMESTAMP},
+ operateDt = #{operatedt,jdbcType=TIMESTAMP}
<!-- disabled = #{disabled,jdbcType=TINYINT},-->
<!-- deleted = #{deleted,jdbcType=TINYINT}-->
where id = #{id,jdbcType=BIGINT}
@@ -333,7 +333,6 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鍐滄埛鏁版嵁-->
<select id="getClients" resultType="com.dy.pipIrrGlobal.voSe.VoClient">
SELECT
- (@i:=@i+1) AS id,
CAST(cli.countyId AS char) AS countyId,
dis_con.name AS countryName,
CAST(cli.townId AS char) AS townId,
@@ -341,10 +340,10 @@
CAST(cli.villageId AS char) AS villageId,
dis_village.name AS villageName,
CAST(cli.blockId AS char) AS blockId,
- blo.name AS bolckName,
+ blo.name AS blockName,
CAST(cli.divideId AS char) AS divideId,
divi.name AS divideName,
- CAST(cli.typeId AS char) AS waterTypeId,
+ CAST(cli.typeId AS char) AS typeId,
wat.typeName AS waterTypeName,
CAST(cli.id AS char) AS clientId,
cli.name,
@@ -352,7 +351,7 @@
cli.phone,
cli.idCard,
cli.area,
- (SELECT COUNT(*) FROM se_client_card WHERE clientId = cli.id) AS cardCount,
+ (SELECT COUNT(*) FROM se_client_card WHERE clientId = cli.id)+(SELECT COUNT(*) FROM se_virtual_card WHERE client_id = cli.id) AS cardCount,
cli.address,
cli.remarks,
cli.operateDt
@@ -363,7 +362,6 @@
LEFT JOIN ba_block blo ON cli.blockId = blo.id
LEFT JOIN pr_divide divi ON cli.divideId = divi.id
LEFT JOIN se_water_type wat ON cli.typeId = wat.id
- , (SELECT @i:=0) AS itable
<where>
AND cli.disabled = 0
AND cli.deleted = 0
@@ -382,6 +380,10 @@
<if test = "address != null and address !=''">
AND cli.address like CONCAT('%',#{address},'%')
</if>
+
+ <if test = "villageId != null and villageId !=''">
+ AND cli.villageId = #{villageId}
+ </if>
</where>
ORDER BY cli.operateDt DESC
<trim prefix="limit " >
@@ -398,7 +400,7 @@
<!--鏍规嵁鍐滄埛缂栧彿鑾峰彇5绾ц鏀垮尯鍒掍覆areaCode锛岃ˉ鍗¤繃绋嬩腑寮�鏂板崱浣跨敤-->
<select id="getAreaCodeById" resultType="java.lang.Long">
- SELECT districtNum FROM se_client WHERE id = ${clientId}
+ SELECT districtNum FROM se_client WHERE id = #{clientId}
</select>
<!--鏍规嵁鍐滄埛缂栧彿鑾峰彇鍐滄埛ID-->
@@ -433,7 +435,7 @@
<!--鑾峰彇鐢ㄦ按鏂瑰紡鍒楄〃-->
<select id="getWaterTypes" resultType="java.util.Map">
- SELECT id, typeName from se_water_type
+ SELECT CAST(se_water_type.id AS char) AS id, typeName from se_water_type
</select>
<!--鑾峰彇鍐滄埛鍩烘湰淇℃伅锛屽皬绋嬪簭棣栭〉浣跨敤-->
--
Gitblit v1.8.0