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

目标跟进核心指标趋势分月/累计

See merge request !948

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

@@ -131,11 +131,11 @@ public class TargetController {
         if (chartType == null) {
             chartType = 1;
         }
-        JSONObject jsonObject = getCommon(qo, false);
         if (StringUtils.isBlank(qo.getTime())) {
             SimpleDateFormat df = new SimpleDateFormat("yyyy");
             qo.setTime(df.format(new Date()));
         }
+        JSONObject jsonObject = getCommon(qo, false);
         jsonObject.put("targetYear", qo.getTime().substring(0, 4));
         Map<String, Object> res = DataTargetHttpUtils.http(DataTargetHttpUtils.getParamNoPage(jsonObject).toJSONString(),
                 chartType == 1 ? "data_mbr_target_chart" : "data_mbr_target_cumulate_chart");