|
@ -2616,10 +2616,13 @@ public class StatisticsAllService extends BaseService {
|
|
|
}
|
|
|
|
|
|
if (resultList != null) {
|
|
|
String signTaskNum = systemDictService.getDictValueNoRedis("SIGN_TASKNUM", year);//目标量
|
|
|
String signRegulationNum = systemDictService.getDictValueNoRedis("SIGN_TEAM_REGULATION_NUM", year);//调控量
|
|
|
DecimalFormat df = new DecimalFormat("0.0000");
|
|
|
for (Map<String, Object> map : resultList) {
|
|
|
map.put("amount", map.get("amount") != null ? Long.valueOf(map.get("amount").toString()) : 0L);
|
|
|
|
|
|
map.put("signTaskNum",signTaskNum);//目标量
|
|
|
map.put("signRegulationNum",signRegulationNum);//调控量
|
|
|
if (!low_level.equals("1")) {
|
|
|
PopulationBase peopleNum = getPopulationBase(map.get("code").toString(), year);
|
|
|
if (peopleNum != null) {
|