From a7ba113f05b0b32adbab8bd2c603d31d543a0699 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 15 十二月 2023 11:04:40 +0800
Subject: [PATCH] # 大屏显示-1

---
 src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java |   38 ++++++++++++++++++++++++++++++++++----
 1 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java
index 31f1692..0a38ccc 100644
--- a/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java
+++ b/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java
@@ -8,6 +8,8 @@
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service("cstmrService")
 public class CstmrServiceImpl extends ServiceImpl<CstmrMapper, Cstmr> implements CstmrService {
 
@@ -34,14 +36,37 @@
     private String getNextUuid(Long hostId) {
         Cstmr cstmr = this.baseMapper.selectCstmrByNewestUuid(hostId);
         if (cstmr == null) {
-            return "0001";
+            return "00001";
         }
-        return zerofill(String.valueOf(Integer.parseInt(cstmr.getUuid()) + 1), 4);
+        return zerofill(String.valueOf(Integer.parseInt(cstmr.getUuid()) + 1), 5);
     }
 
     @Override
-    public Page<Cstmr> getPage2(Page<Cstmr> page, Long hostId, String deptId, Long userId, String conditionName, String condition) {
-        return page.setRecords(baseMapper.listByPage2(page, hostId, deptId, userId,conditionName, condition));
+    public Page<Cstmr> getPage2(Page<Cstmr> page, Long hostId, Long deptId, Long userId,Long roleId, String conditionName, String condition) {
+        return page.setRecords(baseMapper.listByPage2(page, hostId, deptId, userId,roleId,conditionName, condition));
+    }
+
+    @Override
+    public Page<Cstmr> getPage1(Page<Cstmr> page, Long hostId, String deptId, Long userId,  Long director, String conditionName,  String condition) {
+        return page.setRecords(baseMapper.listByPage1(page, hostId, deptId, userId, director, conditionName, condition));
+    }
+
+    @Override
+    public Page<Cstmr> getPage3(Page<Cstmr> page, Long hostId, String deptId, Long userId,  Long director, List<Integer> cstmrIds, String conditionName, String condition) {
+        if (cstmrIds==null){
+            return page.setRecords(baseMapper.listByPage1(page, hostId, deptId, userId,  director,conditionName, condition));
+        }else {
+            return page.setRecords(baseMapper.listByPage3(page, hostId, deptId, userId,  director,cstmrIds,conditionName, condition));
+        }
+    }
+
+    @Override
+    public Page<Cstmr> getPage33(Page<Cstmr> page, Long hostId, String deptId, Long userId,  Long director, List<Integer> cstmrIds, String conditionName, String condition) {
+        if (cstmrIds==null){
+            return page.setRecords(baseMapper.listByPage11(page, hostId, deptId, userId, director,conditionName, condition));
+        }else {
+            return page.setRecords(baseMapper.listByPage33(page, hostId, deptId, userId, director,cstmrIds,conditionName, condition));
+        }
     }
 
     @Override
@@ -50,6 +75,11 @@
     }
 
     @Override
+    public Page<Cstmr> getPageCstmr2(Page<Cstmr> page, Long hostId, String deptId, Long userId,  String condition) {
+        return page.setRecords(baseMapper.listByPageCstmr2(page, hostId, deptId, userId, condition));
+    }
+
+    @Override
     public int updateDeptIdByUserId(Long userId, Long deptId) {
         return this.baseMapper.updateDeptIdByUserId(userId, deptId);
     }

--
Gitblit v1.9.1