Преглед изворни кода

优化销售端sop任务客户电话展示逻辑

cgp пре 2 недеља
родитељ
комит
406abc3367

+ 1 - 5
fs-company/src/main/java/com/fs/company/controller/qw/FsSopCompanyUserTaskController.java

@@ -80,10 +80,6 @@ public class FsSopCompanyUserTaskController extends BaseController
             if (StringUtils.isNotBlank(vo.getPhone())){
                 vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
             }
-//            if (StringUtils.isNotBlank(vo.getPhone())&&vo.getPhone().length()>11){
-//                vo.setPhone(decryptPhone(vo.getPhone()));
-//            }
-
         }
         return getDataTable(list);
     }
@@ -95,7 +91,7 @@ public class FsSopCompanyUserTaskController extends BaseController
     public R getUserPhone(@PathVariable("id") Long id){
         SopCompanyUserTaskDto queryDto= new SopCompanyUserTaskDto();
         queryDto.setId(id);
-        List<SopCompanyUserTaskVo> list = fsSopCompanyUserTaskService.selectFsSopCompanyUserTaskVoList(queryDto);
+        List<SopCompanyUserTaskVo> list = fsSopCompanyUserTaskService.statsOverviewAllList(queryDto);
         if (CollectionUtils.isNotEmpty(list)&&list.size()==1){
             String userPhone=list.get(0).getPhone();
             if (userPhone!=null&&userPhone.length()>11){

+ 1 - 7
fs-company/src/main/java/com/fs/company/controller/qw/FsSopCompanyUserTaskStatsController.java

@@ -52,13 +52,7 @@ public class FsSopCompanyUserTaskStatsController extends BaseController
     public TableDataInfo list(SopCompanyUserTaskDto queryDto)
     {
         startPage();
-        List<SopCompanyUserTaskVo> list = fsSopCompanyUserTaskService.statsOverviewList(queryDto);
-        for (SopCompanyUserTaskVo vo : list) {
-            if (StringUtils.isNotBlank(vo.getPhone())&&vo.getPhone().length()>11){
-                vo.setPhone(decryptPhone(vo.getPhone()));
-            }
-
-        }
+        List<SopCompanyUserTaskVo> list = fsSopCompanyUserTaskService.statsOverviewAllList(queryDto);
         return getDataTable(list);
     }
 }

+ 0 - 7
fs-doctor-app/src/main/java/com/fs/app/controller/FsSopDoctorTaskController.java

@@ -82,13 +82,6 @@ public class FsSopDoctorTaskController extends BaseController
         queryDto.setDoctorId(Long.valueOf(getDoctorId()));
         startPage();
         List<SopDoctorTaskVo> list = fsSopDoctorTaskService.selectFsSopDoctorTaskVoList(queryDto);
-        for (SopDoctorTaskVo vo: list){
-            if (StringUtils.isNotBlank(vo.getPhone())&&vo.getPhone().length()>11){
-                vo.setPhone(decryptPhone(vo.getPhone()));
-            }
-        }
-
-
         return getDataTable(list);
     }
 

+ 1 - 1
fs-service/src/main/java/com/fs/qw/service/IFsSopCompanyUserTaskService.java

@@ -73,5 +73,5 @@ public interface IFsSopCompanyUserTaskService extends IService<FsSopCompanyUserT
      */
     Map<String, Object> getTaskTrendLast7Days();
 
-    List<SopCompanyUserTaskVo> statsOverviewList(SopCompanyUserTaskDto queryDto);
+    List<SopCompanyUserTaskVo> statsOverviewAllList(SopCompanyUserTaskDto queryDto);
 }

+ 1 - 1
fs-service/src/main/java/com/fs/qw/service/impl/FsSopCompanyUserTaskServiceImpl.java

@@ -153,7 +153,7 @@ public class FsSopCompanyUserTaskServiceImpl extends ServiceImpl<FsSopCompanyUse
     }
 
     @Override
-    public List<SopCompanyUserTaskVo> statsOverviewList(SopCompanyUserTaskDto queryDto) {
+    public List<SopCompanyUserTaskVo> statsOverviewAllList(SopCompanyUserTaskDto queryDto) {
         return sopCompanyUserTaskMapper.selectFsSopCompanyUserTaskVoList(queryDto);
     }