Explorar el Código

我的客户,选中全部客户

yuhongqi hace 1 mes
padre
commit
fb2377bc09

+ 26 - 3
fs-company/src/main/java/com/fs/company/controller/crm/CrmCustomerController.java

@@ -117,14 +117,14 @@ public class CrmCustomerController extends BaseController
     }
     @PreAuthorize("@ss.hasPermi('crm:customer:list')")
     @GetMapping("/listAll")
-    public R listAll(CrmCustomerListQueryParam crmCustomer){
+    public TableDataInfo listAll(CrmCustomerListQueryParam crmCustomer){
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         crmCustomer.setCompanyId(loginUser.getCompany().getCompanyId());
 
         if (!CompanyUser.isAdmin(loginUser.getUser().getUserType())) {
             crmCustomer.setCustomerUserId(loginUser.getUser().getUserId());
         }
-        PageHelper.startPage(1, 1000);
+        PageHelper.startPage(crmCustomer.getPageNum(), crmCustomer.getPageSize());
         if(!StringUtils.isEmpty(crmCustomer.getReceiveTimeRange())){
             crmCustomer.setReceiveTimeList(crmCustomer.getReceiveTimeRange().split("--"));
         }
@@ -136,7 +136,30 @@ public class CrmCustomerController extends BaseController
                 }
             }
         }
-        return R.ok().put("rows", list);
+        return getDataTable(list);
+    }
+
+    @PreAuthorize("@ss.hasPermi('crm:customer:list')")
+    @GetMapping("/listNoPage")
+    public TableDataInfo listNoPage(CrmCustomerListQueryParam crmCustomer){
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        crmCustomer.setCompanyId(loginUser.getCompany().getCompanyId());
+
+        if (!CompanyUser.isAdmin(loginUser.getUser().getUserType())) {
+            crmCustomer.setCustomerUserId(loginUser.getUser().getUserId());
+        }
+        if(!StringUtils.isEmpty(crmCustomer.getReceiveTimeRange())){
+            crmCustomer.setReceiveTimeList(crmCustomer.getReceiveTimeRange().split("--"));
+        }
+        List<CrmCustomerListVO> list = crmCustomerService.selectCrmCustomerListQueryParam(crmCustomer);
+        if (list != null) {
+            for (CrmCustomerListVO vo : list) {
+                if(vo.getMobile()!=null){
+                    vo.setMobile(vo.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+                }
+            }
+        }
+        return getDataTable(list);
     }
 
     @ApiOperation("获取我的协作客户列表")

+ 4 - 1
fs-service/src/main/java/com/fs/crm/service/impl/CrmCustomerServiceImpl.java

@@ -248,6 +248,9 @@ public class CrmCustomerServiceImpl extends ServiceImpl<CrmCustomerMapper, CrmCu
                 crmCustomer.setIsLine(1);
                 crmCustomer.setIsReceive(0);
                 crmCustomer.setStatus(0);
+                if (customer.getMobile() != null && customer.getMobile().length() == 11 && customer.getMobile().matches("\\d+")) {
+                    crmCustomer.setMobile(PhoneUtil.encryptPhone(customer.getMobile()));
+                }
 
                 ////当手动导入飞鱼平台线索时
                 if (StringUtils.isEmpty(crmCustomer.getThirdAccount()) && CluesUtils.trafficSourceList.contains(crmCustomer.getTrafficSource())) {
@@ -638,7 +641,7 @@ public class CrmCustomerServiceImpl extends ServiceImpl<CrmCustomerMapper, CrmCu
             crmCustomerMapper.insertCrmCustomer(crmCustomer);
             successNum++;
             successMsg.append("<br/>" + successNum + "、客户 " + customer.getCustomerName() + " 导入成功");
-            
+
             //若存在归属员工编号 就将线索客户分配给该业务员 updated by qxj 2023年05月12日16:51:37
             if (StringUtils.isNotEmpty(customer.getOwnerCompanyUserCode())) {
                 CompanyUser companyUser = companyUserMapper.selectUserByUserName(customer.getOwnerCompanyUserCode());