From ba55749a30a2a2a09a2c64669d6b344a5d8ddb53 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 18 十月 2024 14:08:09 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java | 10 +-
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientSv.java | 27 +++++++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayLastMapper.xml | 51 +++++++++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientCtrl.java | 18 ++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmClientAmountDayLastMapper.java | 15 +++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml | 1
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 2
7 files changed, 117 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmClientAmountDayLastMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmClientAmountDayLastMapper.java
index 332281a..df753e4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmClientAmountDayLastMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmClientAmountDayLastMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoRm.RmClientAmountDayLast;
import com.dy.pipIrrGlobal.voRm.VoClientAmountDay;
+import com.dy.pipIrrGlobal.voSt.VoClient;
import com.dy.pipIrrGlobal.voSt.VoDayClient;
import com.dy.pipIrrGlobal.voSt.VoMonthClient;
import org.apache.ibatis.annotations.Mapper;
@@ -109,4 +110,18 @@
* @return
*/
List<VoMonthClient> getMonthAmountAndMoney(Map<?, ?> params);
+
+ /**
+ * 鏈�杩戞湭鍏呭�肩殑鍐滄埛鏁伴噺
+ * @param params
+ * @return
+ */
+ Long getNotRechargeLastClientsCount(Map<String, Object> params);
+
+ /**
+ * 鏈�杩戞湭鍏呭�肩殑鍐滄埛
+ * @param params
+ * @return
+ */
+ List<VoClient> getNotRechargeLastClients(Map<String, Object> params);
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
index cbab066..9f98c8b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
@@ -265,6 +265,7 @@
tb.rtuAddr rtuAddr,
tb.intakeId intakeId,
tb.findDt findDt,
+ tb.operateDt operateDt,
itb.name intakeName
FROM pr_controller tb
INNER JOIN pr_intake itb on tb.intakeId = itb.id
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
index 61ec6b3..5180618 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -243,7 +243,6 @@
ge.deleted = 0
AND divi.deleted = 0
AND blo.deleted = 0
- AND cont.deleted = 0
<if test="intakeName != null and intakeName != ''">
AND ge.name LIKE CONCAT('%', #{intakeName}, '%')
</if>
@@ -325,7 +324,6 @@
ge.deleted = 0
AND divi.deleted = 0
AND blo.deleted = 0
- AND cont.deleted = 0
<if test="intakeName != null and intakeName != ''">
AND ge.name LIKE CONCAT('%', #{intakeName}, '%')
</if>
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
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java
index 7f81a42..a34dc2e 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealLoss.java
@@ -58,11 +58,11 @@
* @param dataCdC0Vo 寮�闃�涓婃姤鏁版嵁瀵硅薄
*/
private void doDeal(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCdC0Vo dataCdC0Vo) throws Exception {
- Date findDt = controller.getFindDt() ;//鍙戠幇姝ゆ帶鍒跺櫒鐨勬棩鏈熶笌鏃堕棿
- if(findDt != null){
- String findDtStr = DateTime.yyyy_MM_dd(findDt) ;
- if(findDtStr.equals(DateTime.yyyy_MM_dd())){
- //褰撳ぉ鍙戠幇鎺у埗鍣紝鎺у埗鍣ㄨ绠楃殑婕忔崯閲忎竴瀹氫笉姝ｇ‘锛屽己鍒惰缃垚0
+ Date operateDt = controller.getOperateDt() ;//鍙栨按涓笂缁戝畾姝ゆ帶鍒跺櫒鐨勬棩鏈熶笌鏃堕棿
+ if(operateDt != null){
+ String operateDtStr = DateTime.yyyy_MM_dd(operateDt) ;
+ if(operateDtStr.equals(DateTime.yyyy_MM_dd())){
+ //褰撳ぉ鍙戠幇锛堝苟缁戝畾锛夋帶鍒跺櫒锛屾帶鍒跺櫒璁＄畻鐨勬紡鎹熼噺涓�瀹氫笉姝ｇ‘锛屽己鍒惰缃垚0
dataCdC0Vo.lossAmount = 0.0 ;
}
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientCtrl.java
index 7675944..d485488 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientCtrl.java
@@ -298,4 +298,22 @@
}
}
+
+ /**
+ * 鏈�杩戞湭鍏呭�肩殑鍐滄埛
+ *
+ * @param qo
+ * @return
+ */
+ @GetMapping(path = "/getNotRechargeLastClients")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoClient>>> getNotRechargeLastClients(CommonQO qo) {
+ try {
+ QueryResultVo<List<VoClient>> res = clientSv.getNotRechargeLastClients(qo);
+ return BaseResponseUtils.buildSuccess(res);
+ }catch (Exception e){
+ log.error("鑾峰彇璁板綍寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientSv.java
index 1e5b1ad..334c320 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientSv.java
@@ -493,4 +493,31 @@
rsVo.obj = rmClientAmountDayLastMapper.getMonthAmountAndMoney(params);
return rsVo ;
}
+
+ /**
+ * 鏈�杩戞湭鍏呭�肩殑鍐滄埛
+ * @param qo
+ * @return
+ */
+ public QueryResultVo<List<VoClient>> getNotRechargeLastClients(CommonQO qo) {
+ String timeStart = qo.getTimeStart();
+ if (timeStart != null && timeStart != ""){
+ timeStart = timeStart + " 00:00:00";
+ qo.setTimeStart(timeStart);
+ }
+ // 鐢熸垚鏌ヨ鍙傛暟
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
+
+ // 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟
+ Long itemTotal = Optional.ofNullable(rmClientAmountDayLastMapper.getNotRechargeLastClientsCount(params)).orElse(0L);
+
+ QueryResultVo<List<VoClient>> rsVo = new QueryResultVo<>() ;
+
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = rmClientAmountDayLastMapper.getNotRechargeLastClients(params);
+ return rsVo ;
+ }
}
--
Gitblit v1.8.0