|
@ -4429,7 +4429,8 @@ public class StatisticsService extends BaseService {
|
|
|
if (total == null) {
|
|
|
return null;
|
|
|
}
|
|
|
result.put("resultList", getCoutList(rely, total, onRely));
|
|
|
|
|
|
result.put("resultList", statisticsAllService.translateTeamLeaderName(getCoutList(rely, total, onRely)));
|
|
|
return result;
|
|
|
}
|
|
|
|
|
@ -4640,7 +4641,11 @@ public class StatisticsService extends BaseService {
|
|
|
|
|
|
String sql = "select * from wlyy_people_num where code=? and year=? ";
|
|
|
List<PopulationBase> peopleNum = jdbcTemplate.query(sql, new BeanPropertyRowMapper(PopulationBase.class), code, year);
|
|
|
return peopleNum.get(0);
|
|
|
if (peopleNum != null && peopleNum.size() > 0) {
|
|
|
return peopleNum.get(0);
|
|
|
} else {
|
|
|
return null;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|