APP社会救助更改

portal-server/src/main/java/com/zq/portal/dao/ShjzStatsDao.java

@@ -77,4 +77,6 @@ public interface ShjzStatsDao {
      * @return
      */
     List<StatsVo> getMonyNumStats(StatsReqVo vo);
+
+    List<StatsVo> getAreaTotalNumStats(StatsReqVo vo);
 }

portal-server/src/main/java/com/zq/portal/service/ShjzStatsService.java

@@ -354,24 +354,20 @@ public class ShjzStatsService {
         // 金额
         List<StatsVo> monyStats = shjzStatsDao.getMonyNumStats(vo);
         //总人数
-        List<StatsVo> enjoyNum = shjzStatsDao.getAreaUnderNumStats(vo);
+        List<StatsVo>  stats= shjzStatsDao.getAreaTotalNumStats(vo);
 
-        Map<String, Map<String, Object>> map = new HashMap<>();
-
-        //总农村低保人数
-        List<StatsVo>  villageTotal= enjoyNum.stream().filter(statsVo -> "0".equals(statsVo.getType())).collect(Collectors.toList());
-        villageTotal.forEach(statsVo -> {
-            Map<String, Object> data = map.computeIfAbsent(statsVo.getCode(), k -> new HashMap<>());
-            data.put("villageTotal", statsVo.getNum());
-        });
-
-        //总城市低保人数
-        List<StatsVo>  cityTotal= enjoyNum.stream().filter(statsVo -> "1".equals(statsVo.getType())).collect(Collectors.toList());
-        cityTotal.forEach(statsVo -> {
-            Map<String, Object> data = map.computeIfAbsent(statsVo.getCode(), k -> new HashMap<>());
-            data.put("cityTotal", statsVo.getNum());
-        });
+        Map<String, Object> totalData = new HashMap<>();
+        for (StatsVo totalStat : stats) {
+            if ("0".equals(totalStat.getType())) {
+                totalData.put("villageTotal",totalStat.getNum());//农村低保
+            } else {
+                totalData.put("cityTotal",totalStat.getNum());//城市低保
+            }
+        }
+        totalData.put("areaCode", "0");
+        totalData.put("city", "");
 
+        Map<String, Map<String, Object>> map = new HashMap<>();
         // 添加城市低保人数
         List<StatsVo> cityPeopleNumStats = peopleNumStats.stream().filter(statsVo -> "城市低保".equals(statsVo.getType())).collect(Collectors.toList());
         cityPeopleNumStats.forEach(statsVo -> {
@@ -398,6 +394,7 @@ public class ShjzStatsService {
         });
 
         List<Map<String, Object>> dataList = new ArrayList<>();
+        dataList.add(totalData);
         // map数据转成list，提示添加key为区域码
         map.forEach((k, v) -> {
             SystemArea area = areaDao.selectById(SystemArea.patchZero(k));

portal-server/src/main/resources/mapper/ShjzStatsDao.xml

@@ -107,25 +107,17 @@
         </choose>
     </select>
 
-    <select id="getAreaUnderNumStats" resultType="com.zq.portal.vo.StatsVo">
+    <select id="getAreaTotalNumStats" resultType="com.zq.portal.vo.StatsVo">
         SELECT
-        LEFT(h.UNIT_ID, #{size}) 'code',
          h.ISCITY 'type',
         SUM( h.SURE_POPULATION ) 'num'
         FROM
         ENBUZ_APPLY_HOME h
         WHERE h.VP_STATE = 4
-        AND LEFT(h.UNIT_ID, #{size}) IS NOT NULL
-        <if test="subAreaCode != null and subAreaCode != ''">
-            AND h.UNIT_ID LIKE CONCAT(#{subAreaCode}, '%')
-        </if>
-        <if test="type != null and type != ''">
-            AND h.ISCITY = #{type}
-        </if>
-        AND DATE_FORMAT( h.PERMIT_DATE, "%Y-%m-%d" ) &lt;= #{date}
-        AND DATE_FORMAT( h.STOP_DATE, "%Y-%m-%d" ) >= #{date}
+        AND DATE_FORMAT( h.PERMIT_DATE, "%Y-%m-%d" ) &lt;= '2021-12-01'
+        AND DATE_FORMAT( h.STOP_DATE, "%Y-%m-%d" ) >= '2021-12-01'
+        AND h.ISCITY IN(0,1)
         GROUP BY
-        LEFT(h.UNIT_ID, #{size}),
         type
     </select>
 
@@ -209,10 +201,9 @@
         FROM
         mon_pay p
         WHERE
-        p.pmonth >= DATE_FORMAT( NOW(), '%Y%m%d' )
-        AND p.pmonth &lt;= DATE_FORMAT( NOW(), '%Y%m%d' )
-        AND p.vp_state = 4
-        AND p.pay_state = 2
+        p.pay_state = 2
+        AND DATE_FORMAT( p.pmonth, "%Y-%m-%d" ) &lt;= '2021-12-01'
+        AND DATE_FORMAT( p.pmonth, "%Y-%m-%d" ) >= '2021-12-01'
         AND CHAR_LENGTH (LEFT ( p.unit_id, #{size} )) = #{size}
         <if test="subAreaCode != null and subAreaCode != ''">
             AND p.unit_id LIKE CONCAT(#{subAreaCode}, '%')