Merge branch 'feature-2023-06-目标配置' into 'developer'

目标跟进达成分析门店明细数据

See merge request !1308

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

@@ -103,25 +103,17 @@ public class StoreTargetConfigController {
      * 目标跟进达成分析门店明细数据
      * @param qo
      * @param pageQo
-     * @param showAllStoreFlag 是否展示分组下全部门店。1：是
-     * @param nextStoreGroupId 分组下钻，需要传值分组id.如果没有值，默认展示全部门店或者全部一级分组
      * @param orderByType 排序类型 1 正序asc  2倒序desc
      * @param orderByFields 数字。具体看数据组的文档，备注里会有文档链接
-     * @param nextStoreGroupId
      * @return
      */
     @RequestMapping(value = "get-target-analysis-store-detail")
     @ResponseBody
     public RestResponse<Page<StoreTargetReachDetailVO>> getTargetAnalysisStoreDetail(QueryDataStatisticsCommonQO qo, PageQo pageQo,
-                                                                                     Integer showAllStoreFlag, String nextStoreGroupId,
                                                                                      Integer orderByType, Integer orderByFields) {
 
         JSONObject jsonObject = getCommon(qo);
         queryStoreGroupType(jsonObject, 8);
-        //如果是下钻的，需要门店过滤取交集
-        if (StringUtils.isNotBlank(nextStoreGroupId)) {
-            dealNextStoreIdParam(jsonObject, nextStoreGroupId);
-        }
         //不传月参数，返回12条月数据。否则返回一条合计
         Map<String, Object> totalRes = StoreTargetConfigHttpUtils.http(jsonObject.toJSONString(),
                 qo.isYearQuery() ? "data_target_mgt_group_year_stat" : "data_target_mgt_group_month_stat");
@@ -134,7 +126,7 @@ public class StoreTargetConfigController {
         jsonObject.put("pageNum", pageQo.getPageNum());
         jsonObject.put("orderByFields", orderByType == null ? 2 : orderByType);
         jsonObject.put("orderByType", orderByFields == null ? 25 : orderByFields);
-        queryStoreGroupType(jsonObject, getStoreGroupType(showAllStoreFlag, nextStoreGroupId));
+        queryStoreGroupType(jsonObject, 7);
 
         Map<String, Object> res = StoreTargetConfigHttpUtils.http(jsonObject.toJSONString(),
                 qo.isYearQuery() ? "data_target_mgt_group_year_stat" : "data_target_mgt_group_month_stat");