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

Feature 2023 01 目标配置

See merge request !932

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

@@ -232,10 +232,12 @@ public class TargetController {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("entId", qo.getEnterpriseId());
         jsonObject.put("enterpriseId", qo.getEnterpriseId());
-        jsonObject.put("year", qo.getTime());
         jsonObject.put("yearDate", qo.getTime());
-
-        jsonObject.put("month", qo.getTime());
+        if (qo.getTimeType() == 1) {
+            jsonObject.put("year", qo.getTime());
+        } else {
+            jsonObject.put("month", qo.getTime());
+        }
         jsonObject.put("monthDate", qo.getTime());
         jsonObject.put("storeId", getStoreIdList(qo, true).stream().collect(Collectors.joining(",")));
         return jsonObject;