修改查询线索时的类型条件

ad-platform-pojo/src/main/java/com/baiye/model/dto/ClueQueryCriteria.java

@@ -73,4 +73,6 @@ public class ClueQueryCriteria {
     private String nid;
 
     private Integer clueType;
+
+    private List<Integer> clueTypes;
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/TaskServiceImpl.java

@@ -141,8 +141,9 @@ public class TaskServiceImpl implements TaskService {
      */
     @Override
     public Object queryAll(TaskQueryCriteria taskQueryCriteria, Pageable pageable) {
+        //这个地方 4为dmp,5为拓客
         if (taskQueryCriteria.getIsForm() == null) {
-            taskQueryCriteria.setIsForms(Arrays.asList(0, 1, 2, 3));
+            taskQueryCriteria.setIsForms(Arrays.asList(0, 1, 2, 3,6));
         }
         PageRequest pageRequest = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), Sort.by(Sort.Direction.DESC, "isForm", "updateTime"));
         taskQueryCriteria.setCreateBy(SecurityUtils.getCurrentUserId());

manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/api/ExtensionNumberController.java

@@ -9,8 +9,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
-
 /**
  * @author wujingtao
  * @date 2022/02/14
@@ -31,10 +29,13 @@ public class ExtensionNumberController {
                                              @RequestParam("dyDisplay") Long dyDisplay,
                                              @RequestParam("companyId") Long companyId
     ) {
-        if (file == null || companyId == null || (display == null && dyDisplay == null)) {
-            return CommonResponse.createByErrorMessage("文件，外显号不能为空，请检查");
+        if (companyId == null) {
+            return CommonResponse.createByErrorMessage("参数错误");
+        }
+        if (display == null && dyDisplay == null) {
+            return CommonResponse.createByErrorMessage("外显号不能为空，请检查");
         }
-        return extensionNumberService.addNumbers(file, display, dyDisplay,companyId);
+        return extensionNumberService.addNumbers(file, display, dyDisplay, companyId);
     }
 
     @GetMapping("/get/extension")
@@ -42,4 +43,9 @@ public class ExtensionNumberController {
     public CommonResponse<Object> getExtension(Long memberId) {
         return CommonResponse.createBySuccess(extensionNumberService.getExtension(memberId));
     }
+
+    @GetMapping("/extension/display")
+    public CommonResponse<Object> queryExtensionDisplay(Long companyId) {
+        return CommonResponse.createBySuccess(extensionNumberService.queryExtensionDisplay(companyId));
+    }
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/ExtensionNumberService.java

@@ -2,6 +2,7 @@ package com.baiye.modules.telemarkting.service;
 
 
 import com.baiye.http.CommonResponse;
+import com.baiye.modules.telemarkting.entity.ExtensionDisplay;
 import com.baiye.modules.telemarkting.entity.ExtensionNumber;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -30,4 +31,12 @@ public interface ExtensionNumberService {
      * @param organizeId
      */
     void unbindExtension(Long organizeId);
+
+    /**
+     * 查询公司的分机号和外显号信息
+     *
+     * @param companyId
+     * @return
+     */
+    ExtensionDisplay queryExtensionDisplay(Long companyId);
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/ExtensionNumberServiceImpl.java

@@ -47,43 +47,45 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public CommonResponse<String> addNumbers(MultipartFile file, Long display, Long dyDisplay, Long companyId) {
-        List<ExtensionNumber> list = new ArrayList<>();
-        try {
-            int lastIndexOf = Objects.requireNonNull(file.getOriginalFilename()).lastIndexOf(".");
-            String nameFormat = file.getOriginalFilename().substring(lastIndexOf + 1);
-            if ("xlsx".equals(nameFormat) || "xls".equals(nameFormat)) {
-                ExcelReader reader = ExcelUtil.getReader(file.getInputStream());
-                List<List<Object>> read = reader.read(0, reader.getRowCount());
-                for (List<Object> objects : read) {
-                    String number = String.valueOf(objects.get(0));
-                    ExtensionNumber extensionNumber = new ExtensionNumber();
-                    extensionNumber.setNumber(Integer.valueOf(number));
-                    extensionNumber.setCompanyId(companyId);
-                    list.add(extensionNumber);
-                }
-
-            }
-        } catch (Exception e) {
-            log.error("读取文件错误:{}", e.getMessage());
-            return CommonResponse.createByErrorMessage("读取文件错误");
-        }
-        if (list.size() > 0) {
-            extensionNumberRepository.saveAll(list);
-            ExtensionDisplay extensionDisplay = extensionDisplayRepository.findExtensionDisplayByCompanyId(companyId);
-            if (ObjectUtil.isEmpty(extensionDisplay)) {
-                extensionDisplay=new ExtensionDisplay();
+        //保存外显号
+        ExtensionDisplay extensionDisplay = extensionDisplayRepository.findExtensionDisplayByCompanyId(companyId);
+        if (ObjectUtil.isEmpty(extensionDisplay)) {
+            extensionDisplay = new ExtensionDisplay();
+            extensionDisplay.setDisplay(display);
+            extensionDisplay.setCompanyId(companyId);
+            extensionDisplay.setDyDisplay(dyDisplay);
+        } else {
+            if (display != null) {
                 extensionDisplay.setDisplay(display);
-                extensionDisplay.setCompanyId(companyId);
+            }
+            if (dyDisplay != null) {
                 extensionDisplay.setDyDisplay(dyDisplay);
-            } else {
-                if (display != null) {
-                    extensionDisplay.setDisplay(display);
-                }
-                if (dyDisplay != null) {
-                    extensionDisplay.setDyDisplay(dyDisplay);
+            }
+        }
+        extensionDisplayRepository.save(extensionDisplay);
+
+        //解析保存分机号
+        if (file != null) {
+            List<ExtensionNumber> list = new ArrayList<>();
+            try {
+                int lastIndexOf = Objects.requireNonNull(file.getOriginalFilename()).lastIndexOf(".");
+                String nameFormat = file.getOriginalFilename().substring(lastIndexOf + 1);
+                if ("xlsx".equals(nameFormat) || "xls".equals(nameFormat)) {
+                    ExcelReader reader = ExcelUtil.getReader(file.getInputStream());
+                    List<List<Object>> read = reader.read(0, reader.getRowCount());
+                    for (List<Object> objects : read) {
+                        String number = String.valueOf(objects.get(0));
+                        ExtensionNumber extensionNumber = new ExtensionNumber();
+                        extensionNumber.setNumber(Integer.valueOf(number));
+                        extensionNumber.setCompanyId(companyId);
+                        list.add(extensionNumber);
+                    }
                 }
+                extensionNumberRepository.saveAll(list);
+            } catch (Exception e) {
+                log.error("读取文件错误:{}", e.getMessage());
+                return CommonResponse.createByErrorMessage("读取文件错误");
             }
-            extensionDisplayRepository.save(extensionDisplay);
         }
         return CommonResponse.createBySuccess();
     }
@@ -144,4 +146,9 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
             extensionUserRepository.deleteByOrganizeId(organizeId);
         }
     }
+
+    @Override
+    public ExtensionDisplay  queryExtensionDisplay(Long companyId) {
+        return extensionDisplayRepository.findExtensionDisplayByCompanyId(companyId);
+    }
 }

services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueJpa.java

@@ -335,7 +335,7 @@ public class ClueJpa {
             if (clueType != null) {
                 sql.append("AND tcm.clue_type = :clueType ");
             } else {
-                sql.append("AND tcm.clue_type < :clueType ");
+                sql.append("AND tcm.clue_type in :clueTypes ");
             }
             if(clueCallStatus !=null){
                 sql.append("AND tcm.clue_call_status = :clueCallStatus ");
@@ -370,7 +370,7 @@ public class ClueJpa {
             if (clueType != null) {
                 query.setParameter("clueType", clueType);
             } else {
-                query.setParameter("clueType", DefaultNumberConstants.FOUR_NUMBER);
+                query.setParameter("clueTypes",clueQueryCriteria.getClueTypes());
             }
             if(clueCallStatus!=null){
                 query.setParameter("clueCallStatus", clueCallStatus);

services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java

@@ -876,6 +876,9 @@ public class ClueServiceImpl implements ClueService {
         //获取所有任务id
         Set<Long> taskIds = findTaskId(taskQueryCriteria);
         if (CollUtil.isNotEmpty(taskIds)) {
+            if (clueQueryCriteria.getClueType() == null) {
+                clueQueryCriteria.setClueTypes(Arrays.asList(0, 1, 2, 3,6));
+            }
             List<Clue> clueAll = clueJpa.findClue(taskIds, pageable, clueQueryCriteria);
             Set<Long> memberIds = clueAll.stream().map(Clue::getMemberId).collect(Collectors.toSet());
             Map<Long, String> userNickNameMap = userClient.findById(memberIds);