From afa3bc1e2f39f66f59ee9b15d6af16593acdc9a4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 02 十二月 2023 10:38:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 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 0d3e3ea..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
@@ -36,9 +36,9 @@
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
@@ -47,16 +47,25 @@
}
@Override
- public Page<Cstmr> getPage1(Page<Cstmr> page, Long hostId, String deptId, Long userId,String conditionName, String condition) {
- return page.setRecords(baseMapper.listByPage1(page, hostId, deptId, userId,conditionName, condition));
+ 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, List<Integer> cstmrIds, String conditionName, String condition) {
+ 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,conditionName, condition));
+ return page.setRecords(baseMapper.listByPage1(page, hostId, deptId, userId, director,conditionName, condition));
}else {
- return page.setRecords(baseMapper.listByPage3(page, hostId, deptId, userId,cstmrIds,conditionName, condition));
+ 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));
}
}
@@ -66,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