From 001f24d4efd7b818bc2224b976c82faf4f9e564c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十一月 2024 11:25:00 +0800
Subject: [PATCH] 1、通信协议要增加版本号(目的为远程升级准备),原来没有版本号的协议默认为版本号为1,所以调整了程序命名; 2、流浪控制器与控制器数据库表都增加了协议版本号字段; 3、VO中Double和Float类型的属性增加注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
index 07fb518..927a12d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml
@@ -833,4 +833,55 @@
</if>
</trim>
</select>
+ <!--鏈�杩戞湭鍏呭�肩殑鍐滄埛鏁伴噺-->
+ <select id="getNotRechargeLastClientsCount" resultType="java.lang.Long">
+ SELECT COUNT(*)
+ FROM
+ ( SELECT
+ sc.id AS clientId,
+ sc.`name` AS clientName,
+ sc.clientNum AS clientNum,
+ sc.address AS address,
+ sc.phone AS phone,
+ sc.idCard AS idCard
+ FROM
+ se_client sc
+ LEFT JOIN (SELECT srh.clientId FROM `se_recharge_history` srh
+ <where>
+ srh.amount > 0 AND srh.operate_valid = 2
+ <if test="timeStart != null and timeStart != ''">
+ AND srh.operateDt > #{timeStart}
+ </if>
+ </where>
+ ) c on c.clientId = sc.id
+ WHERE c.clientId IS NULL
+ GROUP BY sc.id) d
+ </select>
+ <!--鏈�杩戞湭鍏呭�肩殑鍐滄埛-->
+ <select id="getNotRechargeLastClients" resultType="com.dy.pipIrrGlobal.voSt.VoClient">
+ SELECT
+ sc.id AS clientId,
+ sc.`name` AS clientName,
+ sc.clientNum AS clientNum,
+ sc.address AS address,
+ sc.phone AS phone,
+ sc.idCard AS idCard
+ FROM
+ se_client sc
+ LEFT JOIN (SELECT srh.clientId FROM `se_recharge_history` srh
+ <where>
+ srh.amount > 0 AND srh.operate_valid = 2
+ <if test="timeStart != null and timeStart != ''">
+ AND srh.operateDt > #{timeStart}
+ </if>
+ </where>
+ ) c on c.clientId = sc.id
+ WHERE c.clientId IS NULL
+ GROUP BY sc.id
+ <trim prefix="limit ">
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0