From 9fb370afff71f4d5659d8904e8751479280d5b48 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 07 四月 2025 09:26:50 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java | 63 +++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 16 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java
index 7cc032e..c2f14e6 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java
@@ -5,7 +5,9 @@
import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
import com.dy.pipIrrGlobal.voSe.VoCardInfo;
import com.dy.pipIrrGlobal.voSe.VoCards;
+import com.dy.pipIrrGlobal.voSe.VoCards2;
import com.dy.pipIrrSell.clientCard.qo.QoCards;
+import com.dy.pipIrrSell.clientCard.qo.QoCards2;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -59,7 +61,7 @@
* @param cardNum
* @return
*/
- public Map getCardIdAndClientNum(String cardNum) {
+ public Map getCardIdAndClientNum(Long cardNum) {
return seClientCardMapper.getCardIdAndClientNum(cardNum);
}
/**
@@ -72,7 +74,7 @@
}
/**
- * 鏍规嵁鍐滄埛涓婚敭鑾峰彇姘村崱鍒楄〃
+ * 鏍规嵁鍐滄埛涓婚敭鑾峰彇姘村崱鍒楄〃锛堢墿鐞嗗崱+铏氭嫙鍗★級
* @param clientId
* @return
*/
@@ -108,8 +110,7 @@
* @return
*/
public String getCardStateByCardNum(Long cardNum) {
- String stateName = Optional.ofNullable(seClientCardMapper.getCardStateByCardNum(cardNum)).orElse("");
- return stateName;
+ return Optional.ofNullable(seClientCardMapper.getCardStateByCardNum(cardNum)).orElse("");
}
/**
@@ -122,22 +123,52 @@
Long itemTotal = seClientCardMapper.getCardsCount(params);
QueryResultVo<List<VoCards>> rsVo = new QueryResultVo<>() ;
- Integer pageCurr = 0;
- Integer pageSize = 10000;
- rsVo.pageCurr = 1;
- rsVo.pageSize = 10000;
- if(queryVo.pageSize != null && queryVo.pageCurr != null) {
- rsVo.pageSize = queryVo.pageSize ;
- rsVo.pageCurr = queryVo.pageCurr;
- pageSize = queryVo.pageSize ;
- pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
- }
- params.put("pageCurr", pageCurr);
- params.put("pageSize", pageSize);
+ rsVo.pageSize = queryVo.pageSize ;
+ rsVo.pageCurr = queryVo.pageCurr ;
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seClientCardMapper.getCards(params);
return rsVo ;
}
+
+ /**
+ * 鑾峰彇宸叉寕澶憋紝鏈ˉ鍗＄殑璁板綍锛屽簲鐢ㄧ▼搴忎娇鐢�
+ * @param queryVo
+ * @return
+ */
+ public QueryResultVo<List<VoCards>> getUnreplaced(QoCards queryVo){
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo) ;
+ Long itemTotal = seClientCardMapper.getUnreplacedRecordCount();
+
+ QueryResultVo<List<VoCards>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = queryVo.pageSize ;
+ rsVo.pageCurr = queryVo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = seClientCardMapper.getUnreplaced(params);
+
+ return rsVo ;
+ }
+
+ /**
+ * 鏍规嵁鍐滄埛濮撳悕銆佺數璇濇煡璇㈡甯哥姸鎬佺殑姘村崱鍒楄〃
+ * @param queryVo
+ * @return
+ */
+ public QueryResultVo<List<VoCards2>> getCardsByClientNameAndPhone(QoCards2 queryVo){
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo) ;
+ Long itemTotal = seClientCardMapper.getCardsByClientNameAndPhoneCount(params);
+
+ QueryResultVo<List<VoCards2>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = queryVo.pageSize ;
+ rsVo.pageCurr = queryVo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = seClientCardMapper.getCardsByClientNameAndPhone(params);
+
+ return rsVo ;
+ }
+
+
}
--
Gitblit v1.8.0