目标跟进公用参数调整

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

@@ -190,16 +190,14 @@ public class TargetController {
 
     private JSONObject getCommon(QueryDataStatisticsCommonQO qo, boolean app) {
         JSONObject jsonObject = new JSONObject();
-        if (app) {
-            jsonObject.put("entId", qo.getEnterpriseId());
-            jsonObject.put("monthDate", qo.getTime());
+        jsonObject.put("entId", qo.getEnterpriseId());
+        jsonObject.put("enterpriseId", qo.getEnterpriseId());
+        if (qo.getTimeType() == 1) {
+            jsonObject.put("year", qo.getTime());
+            jsonObject.put("yearDate", qo.getTime());
         } else {
-            jsonObject.put("enterpriseId", qo.getEnterpriseId());
-            if (qo.getTimeType() == 1) {
-                jsonObject.put("year", qo.getTime());
-            } else {
-                jsonObject.put("month", qo.getTime());
-            }
+            jsonObject.put("month", qo.getTime());
+            jsonObject.put("monthDate", qo.getTime());
         }
         if (StringUtils.isBlank(qo.getStoreId())) {
             List<String> storeIdList = storeAuthUtils.queryClerkStoreIds(qo.getClerkId(), qo.getWxEnterpriseId());