From c568a328a8c273531773710fe814ac429bafc48f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 29 一月 2024 14:09:12 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml | 178 +---------------------------------------------------------
1 files changed, 5 insertions(+), 173 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 c41166f..a191c70 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
@@ -394,6 +394,11 @@
SELECT districtNum FROM se_client WHERE clientNum = ${clientNum}
</select>
+ <!--鏍规嵁鍐滄埛缂栧彿鑾峰彇5绾ц鏀垮尯鍒掍覆areaCode锛岃ˉ鍗¤繃绋嬩腑寮�鏂板崱浣跨敤-->
+ <select id="getAreaCodeById" resultType="java.lang.Long">
+ SELECT districtNum FROM se_client WHERE id = ${clientId}
+ </select>
+
<!--鏍规嵁鍐滄埛缂栧彿鑾峰彇鍐滄埛ID-->
<select id="getClientIdByNum" resultType="java.lang.Long">
SELECT id FROM se_client WHERE clientNum = ${clientNum}
@@ -422,179 +427,6 @@
<!--鑾峰彇鐢ㄦ按鏂瑰紡鍒楄〃-->
<select id="getWaterTypes" resultType="java.util.Map">
SELECT id, typeName from se_water_type
- </select>
-
- <!-- 涓嬪垪鍐呭涓轰氦鏄撴槑缁嗘煡璇� -->
- <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇璐按姹囨�诲拰璐崱姹囨��-->
- <select id="getSums" resultType="java.util.Map">
- SELECT
- SUM(money) AS money,
- SUM(cardCost) AS cardCost
- FROM v_operate
- <where>
- <if test = "villageId != null and villageId > 0">
- AND villageId = ${villageId}
- </if>
-
- <if test = "paymentId != null and paymentId >0">
- AND paymentId = ${paymentId}
- </if>
-
- <if test = "operateTimeStart != null and operateTimeStop != null">
- AND operateDt BETWEEN #{operateTimeStart} AND #{operateTimeStop}
- </if>
- </where>
- </select>
-
- <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗璁板綍鏁�-->
- <select id="getOperateRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
- SELECT
- COUNT(*) AS recordCount
- FROM v_operate
- <where>
- <if test = "villageId != null and villageId > 0">
- AND villageId = ${villageId}
- </if>
-
- <if test = "paymentId != null and paymentId >0">
- AND paymentId = ${paymentId}
- </if>
-
- <if test = "operateTimeStart != null and operateTimeStop != null">
- AND operateDt BETWEEN #{operateTimeStart} AND #{operateTimeStop}
- </if>
- </where>
- </select>
-
- <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗璁板綍-->
- <select id="getOperates" resultType="com.dy.pipIrrGlobal.voSe.VoOperate">
- SELECT
- villageId,
- districtTitle,
- clientNum,
- `name`,
- cardNum,
- idCard,
- phone,
- money,
- cardCost,
- paymentId,
- paymentMethod,
- operateType,
- operateDt,
- operatorName
- FROM v_operate
- <where>
- <if test = "villageId != null and villageId > 0">
- AND villageId = ${villageId}
- </if>
-
- <if test = "paymentId != null and paymentId >0">
- AND paymentId = ${paymentId}
- </if>
-
- <if test = "operateTimeStart != null and operateTimeStop != null">
- AND operateDt BETWEEN #{operateTimeStart} AND #{operateTimeStop}
- </if>
- </where>
- ORDER BY operateDt
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${pageCurr}, ${pageSize}
- </if>
- </select>
-
- <!-- 涓嬪垪鍐呭涓轰氦鏄撶粺璁℃煡璇� -->
- <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗绗旀暟姹囨�诲拰浜ゆ槗閲戦姹囨��-->
- <select id="getStatisticSums" resultType="java.util.Map">
- SELECT
- SUM(count) AS count,
- SUM(money) AS money
- FROM
- (
- SELECT
- villageId,
- districtTitle,
- operateType,
- operateDt,
- count(*) AS count,
- (sum(money) + sum(cardCost)) AS money
- FROM v_operate
- <where>
- <if test = "villageId != null and villageId > 0">
- AND villageId = ${villageId}
- </if>
-
-<!-- <if test = "paymentId != null and paymentId >0">-->
-<!-- AND paymentId = ${paymentId}-->
-<!-- </if>-->
-
- <if test = "operateTimeStart != null and operateTimeStop != null">
- AND operateDt BETWEEN #{operateTimeStart} AND #{operateTimeStop}
- </if>
- </where>
- GROUP BY villageId, districtTitle, operateType, operateDt
- ) temp
- </select>
-
- <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇姹囨�昏褰曟暟-->
- <select id="getStatisticRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
- SELECT
- COUNT(*) AS recordCount
- FROM
- (
- SELECT
- villageId,
- districtTitle,
- operateType,
- operateDt,
- count(*) AS count,
- (sum(money) + sum(cardCost)) AS money
- FROM v_operate
- <where>
- <if test = "villageId != null and villageId > 0">
- AND villageId = ${villageId}
- </if>
-
-<!-- <if test = "paymentId != null and paymentId >0">-->
-<!-- AND paymentId = ${paymentId}-->
-<!-- </if>-->
-
- <if test = "operateTimeStart != null and operateTimeStop != null">
- AND operateDt BETWEEN #{operateTimeStart} AND #{operateTimeStop}
- </if>
- </where>
- GROUP BY villageId, districtTitle, operateType, operateDt
- ) temp
- </select>
-
- <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇缁熻璁板綍-->
- <select id="getStatistics" resultType="com.dy.pipIrrGlobal.voSe.VoStatistics">
- SELECT
- villageId,
- districtTitle,
- operateType,
- operateDt,
- count(*) AS count,
- (sum(money) + sum(cardCost)) AS money
- FROM v_operate
- <where>
- <if test = "villageId != null and villageId > 0">
- AND villageId = ${villageId}
- </if>
-
-<!-- <if test = "paymentId != null and paymentId >0">-->
-<!-- AND paymentId = ${paymentId}-->
-<!-- </if>-->
-
- <if test = "operateTimeStart != null and operateTimeStop != null">
- AND operateDt BETWEEN #{operateTimeStart} AND #{operateTimeStop}
- </if>
- </where>
- GROUP BY villageId, districtTitle, operateType, operateDt
- ORDER BY operateDt
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${pageCurr}, ${pageSize}
- </if>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0