Commit b53d9e55 by guojx

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

Feature 2023 01 目标配置

See merge request !947
parents 4dd66e06 7b3cfbef
......@@ -23,7 +23,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
......@@ -130,6 +132,11 @@ public class TargetController {
chartType = 1;
}
JSONObject jsonObject = getCommon(qo, false);
if (StringUtils.isBlank(qo.getTime())) {
SimpleDateFormat df = new SimpleDateFormat("yyyy");
qo.setTime(df.format(new Date()));
}
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");
return DataTargetHttpUtils.response(res);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment