From 9343e802bd45a58de02343db3832b4c7dd16e49e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 14 七月 2025 11:06:22 +0800
Subject: [PATCH] 修改用水户年用水量统计查询中的bug
---
pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardCtrl.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardCtrl.java
index ea8f0f8..fdb93a4 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardCtrl.java
@@ -9,6 +9,7 @@
import com.dy.pipIrrTerminal.card.dto.*;
import com.dy.pipIrrTerminal.card.qo.QoCards;
import com.dy.pipIrrTerminal.card.qo.QoLostCards;
+import com.dy.pipIrrTerminal.card.qo.QoTransaction;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -54,7 +55,10 @@
return BaseResponseUtils
.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
-
+ // 妫�鏌ュ崱鐗囧湴鍧�鏄惁宸插瓨鍦�
+ if (cardSv.isCardAddrExists(po.getCardAddr())) {
+ return BaseResponseUtils.buildErrorMsg("璇ュ崱鐗囧湴鍧�宸插瓨鍦紝璇蜂娇鐢ㄥ叾浠栧崱");
+ }
Map map_result = cardSv.activeOrReissueTermCard(po);
if (map_result.get("success").equals(false)) {
return BaseResponseUtils.buildErrorMsg(map_result.get("msg").toString());
@@ -379,7 +383,7 @@
// 妫�鏌ュ崱鐗囧湴鍧�鏄惁宸插瓨鍦�
if (cardSv.isCardAddrExists(dto.getCardAddr())) {
- return BaseResponseUtils.buildErrorMsg("璇ュ崱鐗囧湴鍧�宸插瓨鍦紝璇蜂娇鐢ㄥ叾浠栧湴鍧�");
+ return BaseResponseUtils.buildErrorMsg("璇ュ崱鐗囧湴鍧�宸插瓨鍦紝璇蜂娇鐢ㄥ叾浠栧崱");
}
Map<String, Object> result = cardSv.createManagementCard(dto);
@@ -389,4 +393,38 @@
return BaseResponseUtils.buildErrorMsg(result.get("msg").toString());
}
}
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗鏄庣粏
+ *
+ * @param vo
+ * @return
+ */
+ @GetMapping(path = "getTransactions")
+ @SsoAop()
+ public BaseResponse<Map> getOperates(QoTransaction vo) {
+ try {
+ return BaseResponseUtils.buildSuccess(cardSv.getTransactions(vo));
+ } catch (Exception e) {
+ log.error("鏌ヨ浜ゆ槗璁板綍寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+
+ @GetMapping(path = "/getOperateRecords")
+ @SsoAop()
+ public BaseResponse<List<Map<String, Object>>> getOperateRecordsAndMoney(QoCards qo){
+ try {
+ Long cardNum = qo.getCardNum();
+ String cardAddr = qo.getCardAddr();
+ if (cardNum == null && cardAddr == null) {
+ return BaseResponseUtils.buildErrorMsg("璇疯緭鍏ュ崱鍙锋垨鍗″湴鍧�");
+ }
+ Map map = cardSv.getOperateRecordsAndMoney(cardNum, cardAddr);
+ return BaseResponseUtils.buildSuccess(map);
+ } catch (Exception e) {
+ log.error("鏌ヨ鎿嶄綔璁板綍寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0