From ff08d741fcec20ebb6ef95514a59704a06a13a8b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 20 六月 2024 10:47:06 +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 | 196 ++++++------------------------------------------
1 files changed, 26 insertions(+), 170 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 244dd55..674f25f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
@@ -28,7 +28,7 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, countyId, townId, villageId, blockId, divideId, `name`, virtualId, clientNum,
+ id, countyId, townId, villageId, blockid, divideId, `name`, virtualId, clientNum,
districtNum, districtTitle, phone, idCard, area, typeId, address, remarks, `operator`,
operateDt, disabled, deleted
</sql>
@@ -56,7 +56,7 @@
operateDt, disabled, deleted
)
values (#{id,jdbcType=BIGINT}, #{countyid,jdbcType=BIGINT}, #{townid,jdbcType=BIGINT},
- #{villageid,jdbcType=BIGINT}, #{blockid,jdbcType=BIGINT}, #{divideid,jdbcType=BIGINT},
+ #{villageid,jdbcType=BIGINT}, #{blockid,jdbcType=BIGINT}, #{divideid,jdbcType=BIGINT},
#{name,jdbcType=VARCHAR}, #{virtualid,jdbcType=BIGINT}, #{clientnum,jdbcType=VARCHAR},
#{districtnum,jdbcType=BIGINT}, #{districttitle,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR},
#{idcard,jdbcType=VARCHAR}, #{area,jdbcType=DOUBLE}, #{typeid,jdbcType=BIGINT},
@@ -384,9 +384,11 @@
</if>
</where>
ORDER BY cli.operateDt DESC
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${pageCurr}, ${pageSize}
- </if>
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
</select>
<!--鏍规嵁鍐滄埛缂栧彿鑾峰彇5绾ц鏀垮尯鍒掍唬鐮�-->
@@ -402,6 +404,11 @@
<!--鏍规嵁鍐滄埛缂栧彿鑾峰彇鍐滄埛ID-->
<select id="getClientIdByNum" resultType="java.lang.Long">
SELECT id FROM se_client WHERE clientNum = ${clientNum}
+ </select>
+
+ <!--鏍规嵁鐢佃瘽鍙风爜鑾峰彇鍐滄埛ID-->
+ <select id="getClientIdByPhone" resultType="java.lang.Long">
+ SELECT id FROM se_client WHERE phone = #{phoneNumber}
</select>
<!--鏍规嵁鍐滄埛ID閫昏緫鍒犻櫎鍐滄埛-->
@@ -429,177 +436,26 @@
SELECT id, typeName from se_water_type
</select>
- <!-- 涓嬪垪鍐呭涓轰氦鏄撴槑缁嗘煡璇� -->
- <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇璐按姹囨�诲拰璐崱姹囨��-->
- <select id="getSums" resultType="java.util.Map">
+ <!--鑾峰彇鍐滄埛鍩烘湰淇℃伅锛屽皬绋嬪簭棣栭〉浣跨敤-->
+ <select id="getSimpleClientInfo" resultType="com.dy.pipIrrGlobal.voSe.VoClientWechat">
SELECT
- SUM(money) AS money,
- SUM(cardCost) AS cardCost
- FROM v_operate
+ CAST(ope.id AS char) AS sessionId,
+ CAST(cli.id AS char) AS clientId,
+ cli.name AS clientName,
+ cli.phone,
+ CAST(cli.blockId AS char) AS blockId
+ FROM se_open_id ope
+ INNER JOIN se_client cli ON ope.client_id = cli.id
<where>
- <if test = "villageId != null and villageId > 0">
- AND villageId = ${villageId}
+ <if test = "sessionId != null">
+ AND ope.id = #{sessionId}
</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 test = "openId != null">
+ AND ope.open_id = #{openId}
</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>
+ LIMIT 0,1
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0