From a2e2c9d1f359e9702d59a4d27a36af3f0bb6aceb Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 19 一月 2024 17:27:33 +0800
Subject: [PATCH] 2024-01-19 朱宝民 获取用户列表新接口

---
 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java |   66 +++++++++++++++++++++++++++-----
 1 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java
index c653047..2d55567 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java
@@ -2,6 +2,8 @@
 
 import com.dy.common.webUtil.QueryResultVo;
 import com.dy.pipIrrGlobal.daoSe.SeActiveCardMapper;
+import com.dy.pipIrrGlobal.daoSe.SeClientCardMapper;
+import com.dy.pipIrrGlobal.daoSe.SeClientMapper;
 import com.dy.pipIrrGlobal.pojoSe.SeActiveCard;
 import com.dy.pipIrrGlobal.voSe.VoActiveCard;
 import lombok.extern.slf4j.Slf4j;
@@ -9,8 +11,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Map;
 
@@ -27,19 +27,25 @@
     @Autowired
     private SeActiveCardMapper seActiveCardMapper;
 
+    @Autowired
+    private SeClientCardMapper seClientCardMapper;
+
+    //@Autowired
+    //private BaClientMapper baClientMapper;
+
+    @Autowired
+    private SeClientMapper seClientMapper;
+
     public QueryResultVo<List<VoActiveCard>> getActiveCards(QueryVo queryVo) {
         //瀹屽杽鏌ヨ寮�鍗¤褰曠殑璧锋鏃堕棿
-        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-
-        LocalDateTime activeTimeStart = queryVo.activeTimeStart;
-        LocalDateTime activeTimeStop = queryVo.activeTimeStop;
+        String activeTimeStart = queryVo.activeTimeStart;
+        String activeTimeStop = queryVo.activeTimeStop;
         if(activeTimeStart != null) {
-            activeTimeStart = LocalDateTime.parse(df.format(activeTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+            activeTimeStart = activeTimeStart + " 00:00:00";
             queryVo.setActiveTimeStart(activeTimeStart);
         }
-
         if(activeTimeStop != null) {
-            activeTimeStop = LocalDateTime.parse(df.format(activeTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+            activeTimeStop = activeTimeStop + " 23:59:59";
             queryVo.setActiveTimeStop(activeTimeStop);
         }
 
@@ -48,8 +54,19 @@
         Long itemTotal = seActiveCardMapper.getRecordCount(params);
 
         QueryResultVo<List<VoActiveCard>> rsVo = new QueryResultVo<>() ;
-        rsVo.pageSize = queryVo.pageSize ;
-        rsVo.pageCurr = queryVo.pageCurr ;
+        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.calculateAndSet(itemTotal, params);
         rsVo.obj = seActiveCardMapper.getActiveCards(params);
         return rsVo ;
@@ -59,4 +76,31 @@
         seActiveCardMapper.insert(po);
         return po.getId();
     }
+
+    /**
+     * 鏍规嵁鍐滄埛缂栧彿鑾峰彇5绾ц鏀垮尯鍒掍唬鐮�
+     * @param clientNum 鍐滄埛缂栧彿
+     * @return 5绾ц鏀垮尯鍒掍唬鐮�
+     */
+    public Long getAreaCodeByNum(String clientNum) {
+        return seClientMapper.getAreaCodeByNum(clientNum);
+    }
+
+    /**
+     * 鏍规嵁鍐滄埛缂栧彿鑾峰彇鍐滄埛ID
+     * @param clientNum
+     * @return
+     */
+    public Long getClientIdByNum(String clientNum) {
+        return seClientMapper.getClientIdByNum(clientNum);
+    }
+
+    /**
+     * 鏍规嵁琛屾斂鍖哄垝涓叉ā鍧楁煡璇㈡按鍗$紪鍙�
+     * @param areaCode
+     * @return
+     */
+    String getCardNumOfMax(String areaCode) {
+        return seClientCardMapper.getCardNumOfMax(areaCode);
+    }
 }

--
Gitblit v1.8.0