Skip to content

C
civil-bigdata
Commit 9dcfbe2d by 袁伟铭
Options

修改社会救助

parent ef0ae1a5
Showing with 58 additions and 4 deletions
portal-server/src/main/java/com/zq/portal/service/ShjzStatsService.java
...@@ -417,6 +417,7 @@ public class ShjzStatsService { ...@@ -417,6 +417,7 @@ public class ShjzStatsService {
} }
vo.setSubAreaCode(systemArea.subAreaCode()); vo.setSubAreaCode(systemArea.subAreaCode());
vo.setSize(SystemArea.getNextLevelLength(systemArea.getType())); vo.setSize(SystemArea.getNextLevelLength(systemArea.getType()));
vo.setDate(DateUtil.beginOfMonth(DateUtil.lastMonth()).toDateStr());
List<StatsVo> statsList = shjzStatsDao.getEnjoyNum(vo); List<StatsVo> statsList = shjzStatsDao.getEnjoyNum(vo);
EnbuzStats enbuzStats = new EnbuzStats(); EnbuzStats enbuzStats = new EnbuzStats();
...@@ -503,6 +504,7 @@ public class ShjzStatsService { ...@@ -503,6 +504,7 @@ public class ShjzStatsService {
vo.setSubAreaCode(systemArea.subAreaCode()); vo.setSubAreaCode(systemArea.subAreaCode());
// SQL分组区域长度 // SQL分组区域长度
vo.setSize(SystemArea.getNextLevelLength(systemArea.getType())); vo.setSize(SystemArea.getNextLevelLength(systemArea.getType()));
vo.setDate(DateUtil.beginOfMonth(DateUtil.lastMonth()).toDateStr());
List<StatsVo> cityStatsList = new ArrayList<>(); List<StatsVo> cityStatsList = new ArrayList<>();
List<StatsVo> villageStatsList = new ArrayList<>(); List<StatsVo> villageStatsList = new ArrayList<>();
...@@ -609,6 +611,35 @@ public class ShjzStatsService { ...@@ -609,6 +611,35 @@ public class ShjzStatsService {
* @param vo * @param vo
* @return * @return
*/ */
// public Object getFivesYearEnjoyStats(StatsReqVo vo) {
// SystemArea systemArea = areaDao.selectById(SystemArea.patchZero(vo.getAreaCode()));
// if (systemArea.getCode().startsWith("450110")) {
// systemArea.setCode("450122" + systemArea.getCode().substring(6));
// }
// vo.setSubAreaCode(systemArea.subAreaCode());
//
// List<StatsVo> statsList = shjzStatsDao.getFivesYearEnjoyStats(vo);
// Map<String, List<StatsVo>> listMap = statsList.stream().collect(Collectors.groupingBy(s -> s.getDate().substring(0, 4)));
// List<StatsVo> cityList = new ArrayList<>();
// List<StatsVo> villageList = new ArrayList<>();
// listMap.forEach((key, statsVoList) -> {
// cityList.add(statsVoList.stream().filter(statsVo -> statsVo.getType().equals("城市低保")).max(Comparator.comparing(StatsVo::getDate)).orElse(new StatsVo()));
// villageList.add(statsVoList.stream().filter(statsVo -> statsVo.getType().equals("农村低保")).max(Comparator.comparing(StatsVo::getDate)).orElse(new StatsVo()));
// });
//
//
// List<String> dateList = statsList.stream().map(s -> s.getDate().substring(0, 4)).distinct().sorted(String::compareTo).collect(Collectors.toList());
// List<String> cityNumList = cityList.stream().sorted(Comparator.comparing(StatsVo::getDate)).map(statsVo -> NumberUtil.toStr(statsVo.getNum(), "0")).collect(Collectors.toList());
// List<String> villageNumList = villageList.stream().sorted(Comparator.comparing(StatsVo::getDate)).map(statsVo -> NumberUtil.toStr(statsVo.getNum(), "0")).collect(Collectors.toList());
//
// Map<String, Object> returnData = new HashMap<>();
// returnData.put("dateList", dateList);
// returnData.put("cityNumList", cityNumList);
// returnData.put("villageNumList", villageNumList);
//
// redisUtils.setObj(PortalCacheKeys.getFivesYearEnbuzEnjoyStatsKey(vo), returnData);
// return returnData;
// }
public Object getFivesYearEnjoyStats(StatsReqVo vo) { public Object getFivesYearEnjoyStats(StatsReqVo vo) {
SystemArea systemArea = areaDao.selectById(SystemArea.patchZero(vo.getAreaCode())); SystemArea systemArea = areaDao.selectById(SystemArea.patchZero(vo.getAreaCode()));
if (systemArea.getCode().startsWith("450110")) { if (systemArea.getCode().startsWith("450110")) {
......
portal-server/src/main/resources/mapper/ShjzStatsDao.xml
...@@ -59,8 +59,8 @@ ...@@ -59,8 +59,8 @@
<if test="subAreaCode != null and subAreaCode != ''"> <if test="subAreaCode != null and subAreaCode != ''">
AND h.UNIT_ID LIKE CONCAT(#{subAreaCode}, '%') AND h.UNIT_ID LIKE CONCAT(#{subAreaCode}, '%')
</if> </if>
AND DATE_FORMAT( h.PERMIT_DATE, "%Y-%m-%d" ) &lt;= '2021-07-01' AND DATE_FORMAT( h.PERMIT_DATE, "%Y-%m-%d" ) &lt;= #{date}
AND DATE_FORMAT( h.STOP_DATE, "%Y-%m-%d" ) >= '2021-07-01' AND DATE_FORMAT( h.STOP_DATE, "%Y-%m-%d" ) >= #{date}
GROUP BY GROUP BY
ISCITY ISCITY
</select> </select>
...@@ -127,13 +127,36 @@ ...@@ -127,13 +127,36 @@
<if test="subAreaCode != null and subAreaCode != ''"> <if test="subAreaCode != null and subAreaCode != ''">
AND h.UNIT_ID LIKE CONCAT(#{subAreaCode}, '%') AND h.UNIT_ID LIKE CONCAT(#{subAreaCode}, '%')
</if> </if>
AND DATE_FORMAT( h.PERMIT_DATE, "%Y-%m-%d" ) &lt;= '2021-07-01' AND DATE_FORMAT( h.PERMIT_DATE, "%Y-%m-%d" ) &lt;= #{date}
AND DATE_FORMAT( h.STOP_DATE, "%Y-%m-%d" ) >= '2021-07-01' AND DATE_FORMAT( h.STOP_DATE, "%Y-%m-%d" ) >= #{date}
GROUP BY GROUP BY
LEFT(h.UNIT_ID, #{size}), LEFT(h.UNIT_ID, #{size}),
ISCITY ISCITY
</select> </select>
<!--
SELECT DATE_FORMAT(h.PERMIT_DATE, "%Y-%m") 'date',
( CASE h.ISCITY
WHEN 0 THEN '农村低保'
WHEN 1 THEN '城市低保'
WHEN 6 THEN '特困供养'
WHEN 10 THEN '农村低收入'
WHEN 11 THEN '城市低收入'
WHEN 21 THEN '住房救助'
WHEN 31 THEN '城市特困'
ELSE '其他' END ) 'type',
SUM( h.SURE_POPULATION ) 'num'
FROM ENBUZ_APPLY_HOME h
WHERE h.VP_STATE = 4
AND h.ISCITY IN(0, 1)
AND DATE_FORMAT( h.PERMIT_DATE, "%Y" ) > DATE_FORMAT(NOW(), "%Y" ) - 5
AND DATE_FORMAT( h.PERMIT_DATE, "%Y" ) &lt;= DATE_FORMAT(NOW(), "%Y" )
AND DATE_FORMAT( h.PERMIT_DATE, "%Y-%m" ) &lt;= DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 MONTH), "%Y-%m")
AND h.UNIT_ID LIKE CONCAT('45', '%')
GROUP BY
DATE_FORMAT( h.PERMIT_DATE, "%Y-%m" ),
ISCITY
-->
<select id="getFivesYearEnjoyStats" resultType="com.zq.portal.vo.StatsVo"> <select id="getFivesYearEnjoyStats" resultType="com.zq.portal.vo.StatsVo">
SELECT LEFT(date, 4) 'year', type, SUM(num) 'num' FROM ( SELECT DATE_FORMAT(h.PERMIT_DATE, "%Y-%m") 'date', SELECT LEFT(date, 4) 'year', type, SUM(num) 'num' FROM ( SELECT DATE_FORMAT(h.PERMIT_DATE, "%Y-%m") 'date',
( CASE h.ISCITY ( CASE h.ISCITY
......
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