Skip to content

C
civil-bigdata
Commit a4845504 by landerliang@163.com
Options

更改

parent 87dcc62a
Showing with 71 additions and 71 deletions
common-utils/src/main/java/com/zq/common/entity/VShjzStats.java
...@@ -14,62 +14,38 @@ import java.util.Date; ...@@ -14,62 +14,38 @@ import java.util.Date;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@Builder @Builder
@TableName(value = "v_enbuz_apply_home") @TableName(value = "v_shjz_total")
public class VShjzStats { public class VShjzStats {
/** /**
* ID * ID
*/ */
@TableId @TableId
@ApiModelProperty("ID") @ApiModelProperty("ID")
private String applyHid; private Long id;
/** /**
* 户信息表Id * 区划ID
*/
@ApiModelProperty("户信息表Id")
private String homehisId;
/**
* 户ID
*/
@ApiModelProperty("户ID")
private String hhId;
/**
* 最后更新日期
*/
@ApiModelProperty("最后更新日期")
private Date permitDate;
/**
* 户救助类别字典
*/
@ApiModelProperty("户救助类别字典")
private String ensureType;
/**
* 户救助细类字典值
*/ */
@ApiModelProperty("户救助细类字典值") @ApiModelProperty("区划ID")
private String ensureTypeC; private Long unitId;
/** /**
* 区划ID * 年份
*/ */
@ApiModelProperty("区划ID") @ApiModelProperty("年份")
private String unitId; private String year;
/** /**
* 区域编码 * 救助类型
*/ */
@ApiModelProperty("区域编码") @ApiModelProperty("救助类型")
private String iscity; private String helpType;
/** /**
* 户救助金额 * 低保总数
*/ */
@ApiModelProperty("户救助金额") @ApiModelProperty("低保总数")
private Double aidamount; private String total;
/** /**
* createTime * createTime
......
portal-server/src/main/java/com/zq/portal/dao/VShjzAchieveDao.java
...@@ -2,6 +2,7 @@ package com.zq.portal.dao; ...@@ -2,6 +2,7 @@ package com.zq.portal.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zq.common.entity.VShjzAchieve; import com.zq.common.entity.VShjzAchieve;
import com.zq.common.entity.VShjzStats;
import com.zq.portal.vo.StatsVo; import com.zq.portal.vo.StatsVo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
...@@ -16,7 +17,7 @@ import java.util.Map; ...@@ -16,7 +17,7 @@ import java.util.Map;
* @since 2021-06-26 10:28:36 * @since 2021-06-26 10:28:36
*/ */
@Repository @Repository
public interface VShjzAchieveDao extends BaseMapper<VShjzAchieve> { public interface VShjzAchieveDao extends BaseMapper<VShjzStats> {
List<Map<String, Object>> getFivesYearStats(@Param("date") String date); List<Map<String, Object>> getFivesYearStats(@Param("date") String date);
......
portal-server/src/main/java/com/zq/portal/service/ShjzStatsService.java
...@@ -82,9 +82,9 @@ public class ShjzStatsService { ...@@ -82,9 +82,9 @@ public class ShjzStatsService {
BigDecimal villageToatlAmount = BigDecimal.ZERO; BigDecimal villageToatlAmount = BigDecimal.ZERO;
BigDecimal cityToatlAmount = BigDecimal.ZERO; BigDecimal cityToatlAmount = BigDecimal.ZERO;
for (Map<String, Object> fivesYearStat : fivesYearStats) { for (Map<String, Object> fivesYearStat : fivesYearStats) {
if ("城市低保".equals(fivesYearStat.get("iscity").toString())) { if ("城市低保".equals(fivesYearStat.get("helpType").toString())) {
cityToatlAmount = getFivesYearTotalNum(cityToatlAmount, fivesYearStat); cityToatlAmount = getFivesYearTotalNum(cityToatlAmount, fivesYearStat);
} else if ("农村低保".equals(fivesYearStat.get("iscity").toString())) { } else if ("农村低保".equals(fivesYearStat.get("helpType").toString())) {
villageToatlAmount = getFivesYearTotalNum(villageToatlAmount, fivesYearStat); villageToatlAmount = getFivesYearTotalNum(villageToatlAmount, fivesYearStat);
} }
} }
...@@ -150,9 +150,9 @@ public class ShjzStatsService { ...@@ -150,9 +150,9 @@ public class ShjzStatsService {
BigDecimal villageToatlAmount = BigDecimal.ZERO; BigDecimal villageToatlAmount = BigDecimal.ZERO;
BigDecimal cityToatlAmount = BigDecimal.ZERO; BigDecimal cityToatlAmount = BigDecimal.ZERO;
for (Map<String, Object> fivesYearStat : fivesYearStats) { for (Map<String, Object> fivesYearStat : fivesYearStats) {
if ("城市低保".equals(fivesYearStat.get("iscity").toString())) { if ("城市低保".equals(fivesYearStat.get("helpType").toString())) {
cityToatlAmount = getThreeYearTotalNum(cityToatlAmount, fivesYearStat); cityToatlAmount = getThreeYearTotalNum(cityToatlAmount, fivesYearStat);
} else if ("农村低保".equals(fivesYearStat.get("iscity").toString())) { } else if ("农村低保".equals(fivesYearStat.get("helpType").toString())) {
villageToatlAmount = getThreeYearTotalNum(villageToatlAmount, fivesYearStat); villageToatlAmount = getThreeYearTotalNum(villageToatlAmount, fivesYearStat);
} }
} }
...@@ -181,13 +181,13 @@ public class ShjzStatsService { ...@@ -181,13 +181,13 @@ public class ShjzStatsService {
List<Map<String, Object>> fivesYearStats = vShjzAchieveDao.getFivesYearStats(DateUtil.today()); List<Map<String, Object>> fivesYearStats = vShjzAchieveDao.getFivesYearStats(DateUtil.today());
for (Map<String, Object> fivesYearStat : fivesYearStats) { for (Map<String, Object> fivesYearStat : fivesYearStats) {
if ("城市低保".equals(fivesYearStat.get("iscity").toString())) { if ("城市低保".equals(fivesYearStat.get("helpType").toString())) {
cityAmountList.add(fivesYearStat.get("s2017").toString()); cityAmountList.add(fivesYearStat.get("s2017").toString());
cityAmountList.add(fivesYearStat.get("s2018").toString()); cityAmountList.add(fivesYearStat.get("s2018").toString());
cityAmountList.add(fivesYearStat.get("s2019").toString()); cityAmountList.add(fivesYearStat.get("s2019").toString());
cityAmountList.add(fivesYearStat.get("s2020").toString()); cityAmountList.add(fivesYearStat.get("s2020").toString());
cityAmountList.add(fivesYearStat.get("s2021").toString()); cityAmountList.add(fivesYearStat.get("s2021").toString());
} else if ("农村低保".equals(fivesYearStat.get("iscity").toString())) { } else if ("农村低保".equals(fivesYearStat.get("helpType").toString())) {
villageAmountList.add(fivesYearStat.get("s2017").toString()); villageAmountList.add(fivesYearStat.get("s2017").toString());
villageAmountList.add(fivesYearStat.get("s2018").toString()); villageAmountList.add(fivesYearStat.get("s2018").toString());
villageAmountList.add(fivesYearStat.get("s2019").toString()); villageAmountList.add(fivesYearStat.get("s2019").toString());
...@@ -222,9 +222,9 @@ public class ShjzStatsService { ...@@ -222,9 +222,9 @@ public class ShjzStatsService {
BigDecimal villageToatlNum = BigDecimal.ZERO; BigDecimal villageToatlNum = BigDecimal.ZERO;
BigDecimal cityToatlNum = BigDecimal.ZERO; BigDecimal cityToatlNum = BigDecimal.ZERO;
for (Map<String, Object> fivesYearStat : fivesYearStats) { for (Map<String, Object> fivesYearStat : fivesYearStats) {
if ("城市低保".equals(fivesYearStat.get("iscity").toString())) { if ("城市低保".equals(fivesYearStat.get("helpType").toString())) {
cityToatlNum = getFivesYearTotalNum(cityToatlNum, fivesYearStat); cityToatlNum = getFivesYearTotalNum(cityToatlNum, fivesYearStat);
} else if ("农村低保".equals(fivesYearStat.get("iscity").toString())) { } else if ("农村低保".equals(fivesYearStat.get("helpType").toString())) {
villageToatlNum = getFivesYearTotalNum(villageToatlNum, fivesYearStat); villageToatlNum = getFivesYearTotalNum(villageToatlNum, fivesYearStat);
} }
} }
...@@ -253,11 +253,11 @@ public class ShjzStatsService { ...@@ -253,11 +253,11 @@ public class ShjzStatsService {
List<Map<String, Object>> fivesYearStats = vShjzAchieveDao.getFivesYearStats(DateUtil.today()); List<Map<String, Object>> fivesYearStats = vShjzAchieveDao.getFivesYearStats(DateUtil.today());
for (Map<String, Object> fivesYearStat : fivesYearStats) { for (Map<String, Object> fivesYearStat : fivesYearStats) {
if ("城市低保".equals(fivesYearStat.get("iscity").toString())) { if ("城市低保".equals(fivesYearStat.get("helpType").toString())) {
cityAmountList.add(fivesYearStat.get("s2019").toString()); cityAmountList.add(fivesYearStat.get("s2019").toString());
cityAmountList.add(fivesYearStat.get("s2020").toString()); cityAmountList.add(fivesYearStat.get("s2020").toString());
cityAmountList.add(fivesYearStat.get("s2021").toString()); cityAmountList.add(fivesYearStat.get("s2021").toString());
} else if ("农村低保".equals(fivesYearStat.get("iscity").toString())) { } else if ("农村低保".equals(fivesYearStat.get("helpType").toString())) {
villageAmountList.add(fivesYearStat.get("s2019").toString()); villageAmountList.add(fivesYearStat.get("s2019").toString());
villageAmountList.add(fivesYearStat.get("s2020").toString()); villageAmountList.add(fivesYearStat.get("s2020").toString());
villageAmountList.add(fivesYearStat.get("s2021").toString()); villageAmountList.add(fivesYearStat.get("s2021").toString());
...@@ -290,9 +290,9 @@ public class ShjzStatsService { ...@@ -290,9 +290,9 @@ public class ShjzStatsService {
BigDecimal villageToatlNum = BigDecimal.ZERO; BigDecimal villageToatlNum = BigDecimal.ZERO;
BigDecimal cityToatlNum = BigDecimal.ZERO; BigDecimal cityToatlNum = BigDecimal.ZERO;
for (Map<String, Object> fivesYearStat : fivesYearStats) { for (Map<String, Object> fivesYearStat : fivesYearStats) {
if ("城市低保".equals(fivesYearStat.get("iscity").toString())) { if ("城市低保".equals(fivesYearStat.get("helpType").toString())) {
cityToatlNum = getThreeYearTotalNum(cityToatlNum, fivesYearStat); cityToatlNum = getThreeYearTotalNum(cityToatlNum, fivesYearStat);
} else if ("农村低保".equals(fivesYearStat.get("iscity").toString())) { } else if ("农村低保".equals(fivesYearStat.get("helpType").toString())) {
villageToatlNum = getThreeYearTotalNum(villageToatlNum, fivesYearStat); villageToatlNum = getThreeYearTotalNum(villageToatlNum, fivesYearStat);
} }
} }
......
portal-server/src/main/resources/mapper/ShjzAchieveStatsMapper.xml
...@@ -3,38 +3,61 @@ ...@@ -3,38 +3,61 @@
<mapper namespace="com.zq.portal.dao.VShjzAchieveDao"> <mapper namespace="com.zq.portal.dao.VShjzAchieveDao">
<select id="getFivesYearStats" resultType="java.util.Map"> <select id="getFivesYearStats" resultType="java.util.Map">
SELECT iscity, SELECT help_type,
SUM(s_2017) 's2017', SUM(s_2018) 's2018', SUM(s_2019) 's2019', SUM(s_2020) 's2020', SUM(s_2021) 's2021' (select SUM(total) FROM v_shjz_total where AND `year`='2019') 's2019', (select SUM(total) FROM v_shjz_total where AND `year`='2020') 's2020', (select SUM(total) FROM v_shjz_total where AND `year`='2020') 's2021'
FROM `v_shjz_achieve` FROM `v_shjz_total`
WHERE DATE_FORMAT(create_time, '%Y-%m-%d') = WHERE DATE_FORMAT(create_time, '%Y-%m-%d') =
(SELECT DATE_FORMAT(create_time, '%Y-%m-%d') FROM v_shjz_achieve ORDER BY create_time DESC LIMIT 1) (SELECT DATE_FORMAT(createTime, '%Y-%m-%d') FROM v_shjz_total ORDER BY createTime DESC LIMIT 1)
GROUP BY GROUP BY
iscity help_type
<!-- SELECT iscity,-->
<!-- SUM(s_2017) 's2017', SUM(s_2018) 's2018', SUM(s_2019) 's2019', SUM(s_2020) 's2020', SUM(s_2021) 's2021'-->
<!-- FROM `v_shjz_achieve`-->
<!-- WHERE DATE_FORMAT(create_time, '%Y-%m-%d') =-->
<!-- (SELECT DATE_FORMAT(create_time, '%Y-%m-%d') FROM v_shjz_achieve ORDER BY create_time DESC LIMIT 1)-->
<!-- GROUP BY-->
<!-- iscity-->
</select> </select>
<select id="getStatsByYear" resultType="java.util.Map"> <select id="getStatsByYear" resultType="java.util.Map">
SELECT get_upunitname 'city', s_${year} 'achieveNum' SELECT u.city_name 'city', (select SUM(total) FROM v_shjz_total where AND `year`=${year}) 'achieveNum'
FROM `v_shjz_achieve` FROM `v_shjz_total` s
WHERE DATE_FORMAT(create_time, '%Y-%m-%d') = LEFT JOIN unit_code u ON s.unit_id=u.county_id
(SELECT DATE_FORMAT(create_time, '%Y-%m-%d') FROM v_shjz_achieve ORDER BY create_time DESC WHERE DATE_FORMAT(createTime, '%Y-%m-%d') =
(SELECT DATE_FORMAT(createTime, '%Y-%m-%d') FROM v_shjz_total ORDER BY createTime DESC
LIMIT 1) LIMIT 1)
AND iscity = '低保'
<!-- SELECT get_upunitname 'city', s_${year} 'achieveNum'-->
<!-- FROM `v_shjz_achieve`-->
<!-- WHERE DATE_FORMAT(create_time, '%Y-%m-%d') =-->
<!-- (SELECT DATE_FORMAT(create_time, '%Y-%m-%d') FROM v_shjz_achieve ORDER BY create_time DESC-->
<!-- LIMIT 1)-->
<!-- AND iscity = '低保'-->
</select> </select>
<select id="getAreaYearShjzAchieveStats" resultType="com.zq.portal.vo.StatsVo"> <select id="getAreaYearShjzAchieveStats" resultType="com.zq.portal.vo.StatsVo">
SELECT unit_id 'code', get_upunitname 'name', iscity 'type', s_2017 + s_2018 + s_2019 + s_2020 + s_2021 'num' SELECT u.city_id 'code', u.city_name 'name', s.help_type 'type', (select SUM(total) FROM v_shjz_total) 'num'
FROM `v_shjz_achieve` FROM `v_shjz_total` s
WHERE unit_id != '45' AND DATE_FORMAT(create_time, '%Y-%m-%d') = LEFT JOIN unit_code u ON s.unit_id=u.county_id
(SELECT DATE_FORMAT(create_time, '%Y-%m-%d') FROM v_shjz_achieve ORDER BY create_time DESC LIMIT 1) WHERE unit_id != '45' AND DATE_FORMAT(createTime, '%Y-%m-%d') =
ORDER BY unit_id (SELECT DATE_FORMAT(createTime, '%Y-%m-%d') FROM v_shjz_total ORDER BY createTime DESC LIMIT 1)
ORDER BY u.city_id
<!-- SELECT unit_id 'code', get_upunitname 'name', iscity 'type', s_2017 + s_2018 + s_2019 + s_2020 + s_2021 'num'-->
<!-- FROM `v_shjz_achieve`-->
<!-- WHERE unit_id != '45' AND DATE_FORMAT(create_time, '%Y-%m-%d') =-->
<!-- (SELECT DATE_FORMAT(create_time, '%Y-%m-%d') FROM v_shjz_achieve ORDER BY create_time DESC LIMIT 1)-->
<!-- ORDER BY unit_id-->
</select> </select>
<select id="getAreaNameList" resultType="java.lang.String"> <select id="getAreaNameList" resultType="java.lang.String">
SELECT get_upunitname 'name' SELECT u.city_name 'name'
FROM `v_shjz_achieve` FROM `v_shjz_total` s
WHERE unit_id != '45' LEFT JOIN unit_code u ON s.unit_id=u.county_id
GROUP BY get_upunitname WHERE s.unit_id != '45'
ORDER BY unit_id GROUP BY u.city_name
ORDER BY s.unit_id
</select> </select>
</mapper> </mapper>
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