查询无归属数据

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/potential/PotentialDataController.java

@@ -202,8 +202,10 @@ public class PotentialDataController {
                 ClerkDTO clerkDTO = clerkMap.get(x.getClerkId());
                 StoreDTO storeDTO = storeMap.get(x.getStoreId());
                 if (!weekMonth) {
+                    // 无归属导购
+                    boolean unassigned = Objects.equals(x.getClerkId(), "-1") ? true : false;
                     // 实时获取当前未建联数 todo
-                    Integer noConnPotCusNum = getNoConnPotCusNum(potentialResponse, enterpriseId, wxEnterpriseId, storeDTO, clerkDTO);
+                    Integer noConnPotCusNum = getNoConnPotCusNum(potentialResponse, enterpriseId, wxEnterpriseId, storeDTO, clerkDTO,unassigned);
                     x.setNoConnPotCusNum(noConnPotCusNum);
                 }
                 PotentialContactDetailOverviewVO overviewVO = new PotentialContactDetailOverviewVO();
@@ -222,7 +224,7 @@ public class PotentialDataController {
         return RestResponse.successResult(res);
     }
 
-    private Integer getNoConnPotCusNum(ServiceResponse<PlatformPotentialCustomerOutDTO> potentialResponse, String enterpriseId,String wxEnterpriseId,StoreDTO storeDTO,ClerkDTO clerkDTO) {
+    private Integer getNoConnPotCusNum(ServiceResponse<PlatformPotentialCustomerOutDTO> potentialResponse, String enterpriseId,String wxEnterpriseId,StoreDTO storeDTO,ClerkDTO clerkDTO,boolean unassigned) {
         if (storeDTO == null && clerkDTO == null) {
             return 0;
         }
@@ -250,7 +252,14 @@ public class PotentialDataController {
         params.setEnterpriseId(enterpriseId);
         params.setWxEnterpriseId(wxEnterpriseId);
         params.setContactParamDTO(contact);
-        ServiceResponse<ContactSumDTO> noContactResponse = customerService.contactMemberSum(new com.gic.haoban.base.api.common.BasePageInfo(), params, new MemberInfoListParamsDTO());
+        String searchParams = "";
+        // 查询无归属数据
+        if (unassigned) {
+            searchParams = "{\\\"filterList\\\":[{\\\"child\\\":{\\\"id\\\":\\\"\\\"},\\\"filterType\\\":\\\"4\\\"},{\\\"child\\\":{\\\"id\\\":\\\"-1\\\"},\\\"filterType\\\":\\\"1\\\"},{\\\"child\\\":{\\\"id\\\":\\\"\\\"},\\\"filterType\\\":\\\"2\\\"},{\\\"child\\\":{\\\"id\\\":\\\"\\\"},\\\"filterType\\\":\\\"3\\\"},{\\\"child\\\":{\\\"id\\\":\\\"\\\"},\\\"filterType\\\":\\\"5\\\"},{\\\"child\\\":{\\\"id\\\":\\\"\\\"},\\\"filterType\\\":\\\"7\\\"},{\\\"child\\\":{\\\"id\\\":\\\"\\\"},\\\"filterType\\\":\\\"8\\\"},{\\\"child\\\":{\\\"id\\\":\\\"\\\"},\\\"filterType\\\":\\\"6\\\"}],\\\"sortCode\\\":\\\"attentionDate_desc\\\",\\\"phoneNameCard\\\":\\\"\\\"}";
+        }
+        MemberInfoListParamsDTO memberInfoListParamsDTO = com.gic.haoban.common.utils.StringUtil.getBean(searchParams, MemberInfoListParamsDTO.class);
+        memberInfoListParamsDTO = Objects.isNull(memberInfoListParamsDTO) ? new MemberInfoListParamsDTO() : memberInfoListParamsDTO;
+        ServiceResponse<ContactSumDTO> noContactResponse = customerService.contactMemberSum(new com.gic.haoban.base.api.common.BasePageInfo(), params, memberInfoListParamsDTO);
         return noContactResponse.getResult() != null ? noContactResponse.getResult().getTotalCount() : 0;
     }