diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java index c265faa6..b778f578 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java @@ -110,13 +110,40 @@ public interface ScreenPublicDataDao extends BaseDao List getUserjoin(@Param("yearMonth")String yearMonth); /** - * @describe: 008、公众参与各类总数 + * @describe: 008、公众参与各类总数 - grid * @author wangtong * @date 2020/8/24 18:27 * @params [] * @return com.elink.esua.epdc.commons.tools.utils.Result */ - List publicpartitotaldata(); + List publicpartitotaldataForGrid(); + + /** + * @describe: 008、公众参与各类总数 - community_party + * @author wangtong + * @date 2020/8/24 18:27 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + List publicpartitotaldataForCommunityParty(); + + /** + * @describe: 008、公众参与各类总数 - street_party + * @author wangtong + * @date 2020/8/24 18:27 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + List publicpartitotaldataForStreetParty(); + + /** + * @describe: 008、公众参与各类总数 - district_party + * @author wangtong + * @date 2020/8/24 18:27 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + List publicpartitotaldataForDistrictParty(); /** * 009、基层治理-治理能力数据 * @Params: diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java index 346b206a..23840c1e 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java @@ -253,10 +253,16 @@ public class ScreenPublicDataServiceImpl extends BaseServiceImpl list = baseDao.publicpartitotaldata(); + List gridList = baseDao.publicpartitotaldataForGrid(); + List communityList = baseDao.publicpartitotaldataForCommunityParty(); + List streetList = baseDao.publicpartitotaldataForStreetParty(); + List districtList = baseDao.publicpartitotaldataForDistrictParty(); + gridList.addAll(communityList); + gridList.addAll(streetList); + gridList.addAll(districtList); // 将list转换为json格式 PublicpartitotaldataDTO result = new PublicpartitotaldataDTO(); - result.setDataList(list); + result.setDataList(gridList); String json = JSONObject.toJSONString(result); String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_PUBLIC_PARTY_TOTAL, json); log.info(body); diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml index f22707a0..262c057c 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml @@ -2297,7 +2297,7 @@ select gr.id as orgId, ) t - + + +