From 1164b2807a2fc519d51242925d2a85481b4a7de0 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 2 Mar 2021 10:12:30 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=9D=9E=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ScreenProjectQuantityOrgMonthlyServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java index 960f863d95..3d06e12698 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java @@ -188,19 +188,19 @@ public class ScreenProjectQuantityOrgMonthlyServiceImpl extends BaseServiceImpl< if (!CollectionUtils.isEmpty(projectOrg)){ projectOrg.forEach(p -> { if (a.getAreaCode().equals(p.getAreaCode())){ - a.setClosedIncr(p.getClosedIncr()); - a.setProjectIncr(p.getProjectIncr()); - a.setProjectIncr(p.getProjectIncr()); + a.setClosedIncr(null == p.getClosedIncr() ? NumConstant.ZERO : p.getClosedIncr()); + a.setProjectIncr(null == p.getProjectIncr() ? NumConstant.ZERO : p.getProjectIncr()); + a.setProjectIncr(null == p.getProjectIncr() ? NumConstant.ZERO : p.getProjectIncr()); } }); } if (!CollectionUtils.isEmpty(projectGrandOrg)){ projectGrandOrg.forEach(p -> { if (a.getAreaCode().equals(p.getAreaCode())){ - a.setClosedTotal(p.getClosedTotal()); - a.setProjectTotal(p.getProjectTotal()); - a.setUnClosedTotal(p.getUnClosedTotal()); - a.setProjectIncr(p.getProjectIncr()); + a.setClosedTotal(null == p.getClosedTotal() ? NumConstant.ZERO : p.getClosedTotal()); + a.setProjectTotal(null == p.getProjectTotal() ? NumConstant.ZERO : p.getProjectTotal()); + a.setUnClosedTotal(null == p.getUnClosedTotal() ? NumConstant.ZERO : p.getUnClosedTotal()); + a.setProjectIncr(null == p.getProjectIncr() ? NumConstant.ZERO : p.getProjectIncr()); } }); } From fca8867d69670b3723cf9e77945e54d6a9cb6703 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 2 Mar 2021 10:48:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8F=8D=E5=8F=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/GrassrootsPartyDevServiceImpl.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java index 6285e007f4..6c94e983ec 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java @@ -12,6 +12,7 @@ import com.epmet.datareport.service.evaluationindex.screen.AgencyService; import com.epmet.datareport.service.evaluationindex.screen.GrassrootsPartyDevService; import com.epmet.datareport.utils.DateUtils; import com.epmet.datareport.utils.ModuleConstant; +import com.epmet.evaluationindex.screen.constant.ScreenConstant; import com.epmet.evaluationindex.screen.dto.form.BranchBuildRankFormDTO; import com.epmet.evaluationindex.screen.dto.form.BranchBuildTrendFormDTO; import com.epmet.evaluationindex.screen.dto.form.ParymemberFormDTO; @@ -78,7 +79,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService if(null == result.getPlatFormTotal() || NumConstant.ZERO == result.getPlatFormTotal()){ result.setPercentInPlatForm(convertPercentStr(BigDecimal.ZERO)); }else{ - result.setPercentInPlatForm(convertPercentStr(new BigDecimal((result.getPartyMemberTotal().doubleValue()/result.getPlatFormTotal().doubleValue())))); + result.setPercentInPlatForm(getRatio(result.getPartyMemberTotal(),result.getPlatFormTotal())); } return result; } @@ -96,11 +97,21 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService if(null == result.getPlatFormTotal() || NumConstant.ZERO == result.getPlatFormTotal()){ result.setPercentInPlatForm(convertPercentStr(BigDecimal.ZERO)); }else{ - result.setPercentInPlatForm(convertPercentStr(new BigDecimal((result.getPartyMemberTotal().doubleValue()/result.getPlatFormTotal().doubleValue())))); + result.setPercentInPlatForm(getRatio(result.getPartyMemberTotal(),result.getPlatFormTotal())); } return result; } + public String getRatio(Integer partyMemberTotal, Integer platFormTotal){ + if (null == partyMemberTotal || null == platFormTotal || partyMemberTotal == NumConstant.ZERO || platFormTotal == NumConstant.ZERO){ + return "0.00%"; + } + BigDecimal aDecimal = new BigDecimal(partyMemberTotal); + BigDecimal bDecimal = new BigDecimal(platFormTotal); + BigDecimal result = aDecimal.divide(bDecimal, NumConstant.FOUR, BigDecimal.ROUND_HALF_UP); + return result.multiply(NumConstant.ONE_HUNDRED_DECIMAL).setScale(NumConstant.TWO,BigDecimal.ROUND_HALF_UP).toPlainString().concat(ScreenConstant.RATIO); + } + /** * @Description 2、党员基本情况-年龄分布 * @NEI https://nei.netease.com/interface/detail/req/?pid=57068&id=321980 From 66e8f0b269aec787e613683a50a5839f03bb9033 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 2 Mar 2021 13:47:05 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B2=BB=E7=90=86=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=E6=A6=9C=E5=8D=95=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/screen/ScreenGovernRankDataDao.xml | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml index f98257b0a0..35130ae0b1 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml @@ -27,7 +27,7 @@ \ No newline at end of file From 3f927a1359b102c79d4c64f900f37deb115660f7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 2 Mar 2021 13:56:20 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E7=BE=A4=E4=BC=97=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3sql?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml index 0db5e467e1..2a5f09786e 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml @@ -29,7 +29,7 @@ FROM screen_customer_agency sca LEFT JOIN screen_party_link_masses_data md - ON ( sca.agency_id = md.ORG_ID AND md.del_flag = '0' ) + ON ( sca.agency_id = md.ORG_ID AND md.del_flag = '0' and md.org_type='agency') WHERE SCA.DEL_FLAG='0' AND sca.is_display = '1' @@ -47,7 +47,7 @@ FROM screen_customer_grid scg LEFT JOIN screen_party_link_masses_data md - ON ( scg.GRID_ID = md.ORG_ID AND md.del_flag = '0' ) + ON ( scg.GRID_ID = md.ORG_ID AND md.del_flag = '0' and md.org_type='grid' ) WHERE scg.DEL_FLAG='0' AND scg.GRID_ID in From dcf6cfafa1ea16cbbb9bfdc7a30a6ab0b36a6842 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 2 Mar 2021 14:53:49 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B2=BB=E7=90=86=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=E6=A6=9C=E5=8D=95=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/GovernCapacityResultDTO.java | 2 + .../mapper/screen/ScreenGovernRankDataDao.xml | 95 +++++++++++-------- 2 files changed, 55 insertions(+), 42 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityResultDTO.java index 95ab00a382..e749c0e218 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityResultDTO.java @@ -44,4 +44,6 @@ public class GovernCapacityResultDTO implements Serializable { * 当前agencyName的上一级组织名称 */ private String parentAgencyName; + + private String orgId; } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml index 35130ae0b1..5cd4094e36 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml @@ -6,6 +6,7 @@ (SELECT - rankData.ORG_NAME AS agencyName, - rankData.RESPONSE_RATIO, - rankData.RESOLVED_RATIO, - rankData.GOVERN_RATIO, - rankData.SATISFACTION_RATIO, - pa.AGENCY_NAME AS parentAgencyName - FROM - screen_govern_rank_data rankData - LEFT JOIN screen_customer_agency agency ON (rankData.org_id = agency.AGENCY_ID AND agency.DEL_FLAG = '0') - left join screen_customer_agency pa on(agency.PARENT_AREA_CODE=pa.AREA_CODE and pa.DEL_FLAG='0') - WHERE - rankData.DEL_FLAG = '0' - AND rankData.org_id in - - #{orgId} - - AND rankData.MONTH_ID =#{monthId} - ORDER BY - (rankData.RESPONSE_RATIO + rankData.RESOLVED_RATIO + rankData.GOVERN_RATIO + rankData.SATISFACTION_RATIO) DESC, - rankData.RESPONSE_RATIO DESC,rankData.RESOLVED_RATIO DESC,rankData.GOVERN_RATIO DESC,rankData.SATISFACTION_RATIO DESC) + agency.agency_id as orgId, + agency.AGENCY_NAME AS agencyName, + IFNULL(rankData.RESPONSE_RATIO,0) AS RESPONSE_RATIO, + IFNULL(rankData.RESOLVED_RATIO,0) AS RESOLVED_RATIO, + IFNULL(rankData.GOVERN_RATIO,0) AS GOVERN_RATIO, + IFNULL(rankData.SATISFACTION_RATIO,0) AS SATISFACTION_RATIO, + pa.AGENCY_NAME AS parentAgencyName + FROM screen_customer_agency agency + left join screen_customer_agency pa + on(agency.PARENT_AREA_CODE=pa.AREA_CODE + and pa.DEL_FLAG='0') + left join screen_govern_rank_data rankData + ON (agency.AGENCY_ID =rankData.org_id + AND rankData.DEL_FLAG = '0' + and rankData.org_type='agency') + WHERE + agency.DEL_FLAG = '0' + AND agency.agency_id in + + #{orgId} + + AND rankData.MONTH_ID =#{monthId} + ORDER BY + (rankData.RESPONSE_RATIO + rankData.RESOLVED_RATIO + rankData.GOVERN_RATIO + rankData.SATISFACTION_RATIO) DESC, + rankData.RESPONSE_RATIO DESC,rankData.RESOLVED_RATIO DESC,rankData.GOVERN_RATIO DESC,rankData.SATISFACTION_RATIO DESC + ) union - (SELECT - rankData.ORG_NAME AS agencyName, - rankData.RESPONSE_RATIO, - rankData.RESOLVED_RATIO, - rankData.GOVERN_RATIO, - rankData.SATISFACTION_RATIO, - ca.agency_name AS parentAgencyName - FROM - screen_govern_rank_data rankData - inner JOIN screen_customer_grid grid ON (rankData.org_id = grid.grid_id AND grid.DEL_FLAG = 0) - left join screen_customer_agency ca on (ca.agency_id = grid.parent_agency_id) - WHERE - rankData.DEL_FLAG = '0' - AND rankData.org_id in - - #{orgId} - - AND rankData.MONTH_ID =#{monthId} - ORDER BY - (rankData.RESPONSE_RATIO + rankData.RESOLVED_RATIO + rankData.GOVERN_RATIO + rankData.SATISFACTION_RATIO) DESC, - rankData.RESPONSE_RATIO DESC,rankData.RESOLVED_RATIO DESC,rankData.GOVERN_RATIO DESC,rankData.SATISFACTION_RATIO - DESC + ( + SELECT + grid.grid_id as orgId, + grid.GRID_NAME AS agencyName, + IFNULL(rankData.RESPONSE_RATIO,0) AS RESPONSE_RATIO, + IFNULL(rankData.RESOLVED_RATIO,0) AS RESOLVED_RATIO, + IFNULL(rankData.GOVERN_RATIO,0) AS GOVERN_RATIO, + IFNULL(rankData.SATISFACTION_RATIO,0) AS SATISFACTION_RATIO, + ca.agency_name AS parentAgencyName + FROM screen_customer_grid grid + left join screen_customer_agency ca + on (ca.agency_id = grid.parent_agency_id) + left join screen_govern_rank_data rankData + ON (grid.grid_id=rankData.org_id + AND grid.DEL_FLAG = 0 + and rankData.org_type='grid') + WHERE grid.DEL_FLAG = '0' + AND grid.GRID_ID in + + #{orgId} + + AND rankData.MONTH_ID =#{monthId} + ORDER BY + (rankData.RESPONSE_RATIO + rankData.RESOLVED_RATIO + rankData.GOVERN_RATIO + rankData.SATISFACTION_RATIO) DESC, + rankData.RESPONSE_RATIO DESC,rankData.RESOLVED_RATIO DESC,rankData.GOVERN_RATIO DESC,rankData.SATISFACTION_RATIO + DESC )