新增导购、门店查询入参

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

@@ -194,6 +194,8 @@ public class PotentialDataAdaptor {
         Integer reportType = potentialOverviewQO.getReportType();
         String bizDate = potentialOverviewQO.getBizDate();
         Integer potGroup = potentialOverviewQO.getPotGroup();
+        String clerkQuery = potentialOverviewQO.getClerkQuery();
+        String storeQuery = potentialOverviewQO.getStoreQuery();
         Map<String, Object> inlineParams = getOverviewBaseParams(potentialOverviewQO, storeIds);
         Pair<String, String> dateParam = getDateParam(reportType, bizDate);
         String startDate = dateParam.getKey();
@@ -211,6 +213,12 @@ public class PotentialDataAdaptor {
         if (reportType != null) {
             inlineParams.put("reportType", reportType);
         }
+        if (StringUtils.isNotBlank(clerkQuery)) {
+            inlineParams.put("clerkQuery", clerkQuery);
+        }
+        if (StringUtils.isNotBlank(storeQuery)) {
+            inlineParams.put("storeQuery", storeQuery);
+        }
         return inlineParams;
     }
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/potential/PotentialStatisticsBaseQO.java

@@ -35,6 +35,16 @@ public class PotentialStatisticsBaseQO extends BasePageInfo {
     private String storeId;
 
     /**
+     * 导购搜索
+     */
+    private String clerkQuery;
+
+    /**
+     * 门店搜索
+     */
+    private String storeQuery;
+
+    /**
      * 门店id列表
      */
     private List<String> storeIdList;