目标跟进查询过滤已发布门店

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/target/TargetController.java

@@ -50,7 +50,7 @@ public class TargetController {
     @RequestMapping(value = "valid-target-store")
     @ResponseBody
     public RestResponse<Integer> validTargetStore(QueryDataStatisticsCommonQO qo) {
-        List<String> storeIdList = getStoreIdList(qo);
+        List<String> storeIdList = getStoreIdList(qo, false);
         QueryNewDataTargetConfigQDTO param = new QueryNewDataTargetConfigQDTO();
         param.setStoreIdList(storeIdList);
         param.setEnterpriseId(qo.getEnterpriseId());
@@ -237,18 +237,71 @@ public class TargetController {
 
         jsonObject.put("month", qo.getTime());
         jsonObject.put("monthDate", qo.getTime());
-        jsonObject.put("storeId", getStoreIdList(qo).stream().collect(Collectors.joining(",")));
+        jsonObject.put("storeId", getStoreIdList(qo, true).stream().collect(Collectors.joining(",")));
         return jsonObject;
     }
 
-    private List<String> getStoreIdList(QueryDataStatisticsCommonQO qo) {
+    private List<String> getStoreIdList(QueryDataStatisticsCommonQO qo, boolean isRelease) {
+        List<String> storeIdList;
         if (StringUtils.isBlank(qo.getStoreId())) {
-            List<String> storeIdList = storeAuthUtils.queryClerkStoreIds(qo.getClerkId(), qo.getWxEnterpriseId());
-            return storeIdList;
+            storeIdList = storeAuthUtils.queryClerkStoreIds(qo.getClerkId(), qo.getWxEnterpriseId());
         } else {
-            List<String> storeIdList = new ArrayList<>();
+            storeIdList = new ArrayList<>();
             storeIdList.add(qo.getStoreId());
+        }
+        if (!isRelease) {
             return storeIdList;
         }
+        List<String> targetStoreIdList = getReleaseStore(qo, 1);
+        //交集 (已发布的门店数据统计过滤)
+        if (CollectionUtils.isEmpty(targetStoreIdList)) {
+            targetStoreIdList = new ArrayList<>();
+            targetStoreIdList.add("-123456789");
+        }
+        if (CollectionUtils.isEmpty(storeIdList)) {
+            //全部权限，则给出发布门店数据
+            return targetStoreIdList;
+        } else {
+            storeIdList.retainAll(targetStoreIdList);
+            if (CollectionUtils.isEmpty(storeIdList)) {
+                storeIdList.add("-1234567890");
+            }
+        }
+        return storeIdList;
+    }
+
+    public List<String> getReleaseStore(QueryDataStatisticsCommonQO params, Integer releaseFlag) {
+        List<String> storeIdList = new ArrayList<>();
+        QueryNewDataTargetConfigQDTO qdto = new QueryNewDataTargetConfigQDTO();
+        qdto.setEnterpriseId(params.getEnterpriseId());
+        if (StringUtils.isNotBlank(params.getTime())) {
+            qdto.setTargetYear(params.getTime().substring(0, 4));
+        }
+        qdto.setReleaseFlag(releaseFlag);
+        BasePageInfo basePageInfo = new BasePageInfo();
+        basePageInfo.setPageNum(1);
+        basePageInfo.setPageSize(1000);
+        ServiceResponse<Page<NewDataTargetConfigDTO>> res = newDataTargetConfigApiService.queryNewDataTargetConfig(qdto, basePageInfo);
+        Page<NewDataTargetConfigDTO> page = res.getResult();
+        Integer total = page.getTotalCount();
+        if (total <= 0) {
+            return null;
+        }
+        List<NewDataTargetConfigDTO> list = page.getResult();
+        for (NewDataTargetConfigDTO dto : list) {
+            storeIdList.add(dto.getStoreId());
+        }
+        int pageNum = total / 1000 + 1;
+        if (pageNum > 1) {
+            for (int i = 2; i < pageNum; i++) {
+                basePageInfo.setPageNum(i);
+                res = newDataTargetConfigApiService.queryNewDataTargetConfig(qdto, basePageInfo);
+                List<NewDataTargetConfigDTO> temp = res.getResult().getResult();
+                for (NewDataTargetConfigDTO dto : temp) {
+                    storeIdList.add(dto.getStoreId());
+                }
+            }
+        }
+        return storeIdList;
     }
 }