From 5045c664b25955f22e205baa8bf4d681aee35745 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 26 May 2021 17:47:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9F=BA=E5=B1=82=E6=B2=BB=E7=90=86-?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=9A=84=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E6=8C=89=E5=A4=A9=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/OrgStatisticsResultDTO.java | 1 + .../extract/FactOriginIssueMainDailyDao.java | 11 ++++++++ .../FactOriginProjectMainDailyDao.java | 12 +++++++++ .../extract/FactOriginTopicMainDailyDao.java | 14 ++++++++++ .../todata/FactAgencyGovernDailyService.java | 25 +++++++---------- .../FactOriginIssueMainDailyService.java | 11 ++++++++ .../FactOriginProjectMainDailyService.java | 12 +++++++++ .../FactOriginTopicMainDailyService.java | 14 ++++++++++ .../FactAgencyGovernDailyServiceImpl.java | 27 +++++++++++++++++++ .../FactOriginIssueMainDailyServiceImpl.java | 19 +++++++++++++ ...FactOriginProjectMainDailyServiceImpl.java | 20 ++++++++++++++ .../FactOriginTopicMainDailyServiceImpl.java | 21 +++++++++++++++ .../extract/FactOriginIssueMainDailyDao.xml | 15 +++++++++++ .../extract/FactOriginProjectMainDailyDao.xml | 16 +++++++++++ .../extract/FactOriginTopicMainDailyDao.xml | 16 +++++++++++ .../mapper/project/ProjectProcessDao.xml | 27 ++++++++----------- 16 files changed, 230 insertions(+), 31 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/OrgStatisticsResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/OrgStatisticsResultDTO.java index d7fca3b15d..f57927f65d 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/OrgStatisticsResultDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/OrgStatisticsResultDTO.java @@ -15,6 +15,7 @@ public class OrgStatisticsResultDTO implements Serializable { private static final long serialVersionUID = 9221060553279124719L; private String customerId; private String agencyId; + private String level; private String orgId; private Integer count; private Integer sum; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java index ee2e78aaa3..ba3ddbce69 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java @@ -227,6 +227,17 @@ public interface FactOriginIssueMainDailyDao extends BaseDao selectPartyMemberIssueStaticByGrid(@Param("customerId") String customerId, @Param("dateId") String dateId); + /** + * 获取组织关闭议题数 + * @author zhaoqifeng + * @date 2021/5/25 17:18 + * @param customerId + * @param dateId + * @param closedStatus + * @return java.util.List + */ + List selectAgencyClosedIssueCount(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param("closedStatus") String closedStatus); + /** * 3、当前网格内，议题关闭已解决数 * 4、当前网格内，议题关闭无需解决数 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java index 0403e29bc2..d5042bbb7b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java @@ -465,4 +465,16 @@ public interface FactOriginProjectMainDailyDao extends BaseDao + */ + List selectAgencyClosedProjectCount(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param( + "closedStatus") String closedStatus, @Param("origin") String origin); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java index 96ecdef6c6..eb9339e5eb 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java @@ -177,4 +177,18 @@ public interface FactOriginTopicMainDailyDao extends BaseDao + */ + List selectAgencyClosedTopicCount(@Param("customerId") String customerId, @Param("dateId") String dateId, + @Param("closedStatus") String closedStatus, @Param("shiftIssue") Integer shiftIssue); + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactAgencyGovernDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactAgencyGovernDailyService.java index 2c0050903c..0504164079 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactAgencyGovernDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactAgencyGovernDailyService.java @@ -27,20 +27,15 @@ import com.epmet.entity.evaluationindex.extract.FactAgencyGovernDailyEntity; * @since v1.0.0 2021-05-24 */ public interface FactAgencyGovernDailyService extends BaseService { - // 问题解决总数：当前组织下，话题关闭（已解决+无需解决）总数、议题关闭（已解决+无需解决）总数和项目结案（议题转为项目的结案数+项目立项结案数）总数之和 - // 党群自治占比：当前组织下，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的） - // 网格自治占比：当前组织下，所有网格内结案项目数与问题解决总数之比（未出网格） - // 参考：fact_index_govrn_ablity_grid_monthly的SELF_SOLVE_PROJECT_COUNT计算 - // 社区解决占比：当前组织下，由社区结案的项目数与问题解决总数之比 - // 区直部门解决占比：当前组织下，由区级部门结案的项目数与问题解决总数之比 - // 街道解决占比：当前组织下，由街道结案的项目数与问题解决总数之比 - // 自下而上的项目解决：结案时操作人所代表的的处理部门（可以是网格、街道、组织） - // 自上而下的项目解决：向下吹哨，谁立项谁解决（后期在讨论哪样更合理） - // - // 究竟是谁解决！！： - // A社区→A街道→B社区（结案）——A街道解决（自下而上吹（饱含立项往上吹/从话题来的项目），看往上吹的最高层级） - // A社区→B社区→C社区（结案）——C社区解决（平级协助解决，看最后结案） - // A街道→A社区→B社区（结案）——A街道解决（自上而下吹，谁立项谁解决） - // 注：A社区→A街道→（退回）A社区→B社区（结案），A街道不算处理项目，仍是平级协助解决，看最后谁结案 + + /** + * 治理指数-组织相关 + * @author zhaoqifeng + * @date 2021/5/25 14:10 + * @param customerId + * @param dateId + * @return void + */ + void extractFactAgencyGovernDaily(String customerId, String dateId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginIssueMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginIssueMainDailyService.java index 648891b0cc..cf25f79ebb 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginIssueMainDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginIssueMainDailyService.java @@ -136,4 +136,15 @@ public interface FactOriginIssueMainDailyService extends BaseService queryGridIssueValue(String customerId, List gridIds, String issueStatus, String resolveType); + + /** + * 获取组织关闭议题数 + * @author zhaoqifeng + * @date 2021/5/25 17:09 + * @param customerId + * @param dateId + * @param closedStatus + * @return java.util.Map + */ + Map getAgencyClosedIssueCount(String customerId, String dateId, String closedStatus); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java index 215aa74756..9445559627 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java @@ -436,4 +436,16 @@ public interface FactOriginProjectMainDailyService extends BaseService queryGridProjectValue(String customerId, List gridIds, String projectStatus, String origin, String isResolved); + + /** + * 获取组织关闭项目数 + * @author zhaoqifeng + * @date 2021/5/26 15:09 + * @param customerId + * @param dateId + * @param closedStatus + * @param origin + * @return java.util.Map + */ + Map getAgencyClosedProjectCount(String customerId, String dateId, String closedStatus, String origin); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicMainDailyService.java index 2cae521855..7486daa191 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicMainDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicMainDailyService.java @@ -138,4 +138,18 @@ public interface FactOriginTopicMainDailyService extends BaseService queryGridTopicValue(String customerId, List gridIds, String topicStatus, String closedStatus, String shiftIssue); + + + /** + * 获取组织已关闭话题数 + * @author zhaoqifeng + * @date 2021/5/25 15:02 + * @param customerId + * @param dateId + * @param closedStatus + * @param shiftIssue + * @return java.util.List + */ + Map getAgencyClosedTopicCount(String customerId, String dateId, String closedStatus, Integer shiftIssue); + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java index e40ffd49bd..5603dfde68 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java @@ -33,5 +33,32 @@ import org.springframework.stereotype.Service; public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl implements FactAgencyGovernDailyService { + /** + * 治理指数-组织相关 + * + * @param customerId + * @param dateId + * @return void + * @author zhaoqifeng + * @date 2021/5/25 14:10 + */ + @Override + public void extractFactAgencyGovernDaily(String customerId, String dateId) { + // 问题解决总数：当前组织下，话题关闭（已解决+无需解决）总数、议题关闭（已解决+无需解决）总数和项目结案（议题转为项目的结案数+项目立项结案数）总数之和 + // 党群自治占比：当前组织下，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的） + // 网格自治占比：当前组织下，所有网格内结案项目数与问题解决总数之比（未出网格） + // 参考：fact_index_govrn_ablity_grid_monthly的SELF_SOLVE_PROJECT_COUNT计算 + // 社区解决占比：当前组织下，由社区结案的项目数与问题解决总数之比 + // 区直部门解决占比：当前组织下，由区级部门结案的项目数与问题解决总数之比 + // 街道解决占比：当前组织下，由街道结案的项目数与问题解决总数之比 + // 自下而上的项目解决：结案时操作人所代表的的处理部门（可以是网格、街道、组织） + // 自上而下的项目解决：向下吹哨，谁立项谁解决（后期在讨论哪样更合理） + // + // 究竟是谁解决！！： + // A社区→A街道→B社区（结案）——A街道解决（自下而上吹（饱含立项往上吹/从话题来的项目），看往上吹的最高层级） + // A社区→B社区→C社区（结案）——C社区解决（平级协助解决，看最后结案） + // A街道→A社区→B社区（结案）——A街道解决（自上而下吹，谁立项谁解决） + // 注：A社区→A街道→（退回）A社区→B社区（结案），A街道不算处理项目，仍是平级协助解决，看最后谁结案 + } } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginIssueMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginIssueMainDailyServiceImpl.java index 09a040e630..c9db796c53 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginIssueMainDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginIssueMainDailyServiceImpl.java @@ -186,4 +186,23 @@ public class FactOriginIssueMainDailyServiceImpl extends BaseServiceImpl queryGridIssueValue(String customerId, List gridIds, String issueStatus, String resolveType) { return baseDao.selectGroupByGridId(customerId,gridIds,issueStatus,resolveType); } + + /** + * 获取组织关闭议题数 + * + * @param customerId + * @param dateId + * @param closedStatus + * @return java.util.Map + * @author zhaoqifeng + * @date 2021/5/25 17:09 + */ + @Override + public Map getAgencyClosedIssueCount(String customerId, String dateId, String closedStatus) { + List list = baseDao.selectAgencyClosedIssueCount(customerId, dateId, closedStatus); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyMap(); + } + return list.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getAgencyId, Function.identity())); + } } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java index 58d625f999..e31ea6fbaf 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java @@ -658,5 +658,25 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl + * @author zhaoqifeng + * @date 2021/5/26 15:09 + */ + @Override + public Map getAgencyClosedProjectCount(String customerId, String dateId, String closedStatus, String origin) { + List list = baseDao.selectAgencyClosedProjectCount(customerId, dateId, closedStatus, origin); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyMap(); + } + return list.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getAgencyId, Function.identity())); + } + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java index 39eeffea2c..d535012b15 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java @@ -377,4 +377,25 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl queryGridTopicValue(String customerId, List gridIds, String topicStatus, String closedStatus, String shiftIssue) { return baseDao.selectTopicGroupByGridId(customerId,gridIds,topicStatus,closedStatus,shiftIssue); } + /** + * 获取组织已关闭话题数 + * + * @param customerId + * @param dateId + * @param closedStatus + * @param shiftIssue + * @return java.util.List + * @author zhaoqifeng + * @date 2021/5/25 15:02 + */ + @Override + public Map getAgencyClosedTopicCount(String customerId, String dateId, String closedStatus, Integer shiftIssue) { + List list = baseDao.selectAgencyClosedTopicCount(customerId, dateId, closedStatus,shiftIssue); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyMap(); + } + return list.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getAgencyId, Function.identity())); + } + + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml index e6c00c33af..12da80a473 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml @@ -343,4 +343,19 @@ m.CUSTOMER_ID, m.GRID_ID + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml index c76cfb8128..f17dc573ef 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml @@ -947,4 +947,20 @@ m.CUSTOMER_ID, m.GRID_ID + diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml index 49b0c96151..9ad06cd4b5 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml @@ -228,4 +228,20 @@ GROUP BY m.CUSTOMER_ID,m.GRID_ID + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml index e9079abc3b..3d4c8a5c8b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml @@ -238,23 +238,18 @@ FROM ( SELECT - ps.PROJECT_ID, - ps.ORG_ID_PATH, - ps.GRID_ID, - ps.DEPARTMENT_ID - FROM - project_process pp - INNER JOIN project_staff ps ON pp.STAFF_ID = ps.STAFF_ID - AND pp.DEPARTMENT_NAME = ps.DEPARTMENT_NAME - AND pp.PROJECT_ID = ps.PROJECT_ID - AND ps.IS_HANDLE = 'handle' - AND pp.CREATED_TIME = ps.UPDATED_TIME - AND ps.CUSTOMER_ID = #{customerId} + PROJECT_ID, + ORG_ID_PATH, + GRID_ID, + DEPARTMENT_ID + FROM + project_process WHERE - pp.OPERATION = 'close' - - AND DATE_FORMAT(pp.CREATED_TIME , '%Y%m%d') = #{date} - + OPERATION = 'close' + AND CUSTOMER_ID = #{customerId} + + AND DATE_FORMAT(CREATED_TIME , '%Y%m%d') = #{date} + ) a LEFT JOIN ( From 4fddf998fb6f5327a70841051240121f43a46dad Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 27 May 2021 09:23:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=97=E5=88=86=E8=AF=B4=E6=98=8E=20?= =?UTF-8?q?=E4=BF=9D=E7=95=99=E5=88=86=E6=95=B0=E4=BF=9D=E7=95=99=E4=B8=80?= =?UTF-8?q?=E4=BD=8D=E5=B0=8F=E6=95=B0=EF=BC=8C=E6=9D=83=E9=87=8D=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E6=95=B4=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/index/impl/IndexExplainServiceImpl.java | 2 +- .../resources/mapper/fact/FactIndexAgencySubScoreDao.xml | 2 +- .../resources/mapper/fact/FactIndexCommunitySubScoreDao.xml | 2 +- .../main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml | 5 +++-- .../main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml | 3 ++- .../main/resources/mapper/fact/FactIndexGridSubScoreDao.xml | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java index a08c32bc6e..5c8ceaf757 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java @@ -214,7 +214,7 @@ public class IndexExplainServiceImpl implements IndexExplainService { if (StringUtils.isNotBlank(score.getQuantity())) { tb.setQuantity(score.getQuantity()); } - tb.setWeight(score.getWeight().multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%"); + tb.setWeight(score.getWeight().multiply(new BigDecimal(NumConstant.ONE_HUNDRED)) + "%"); } } } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml index 954ce4c772..d1b1dafeea 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml @@ -45,7 +45,7 @@ SELECT fact.index_code, IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value, - round(fact.score,2) AS score, + round(fact.score,1) AS score, round(fact.WEIGHT,2) AS weight FROM fact_index_agency_sub_score fact diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml index 01b7bedf74..784ab0ccc7 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml @@ -46,7 +46,7 @@ fact.index_code, IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value, IF(fact.SAMPLE_COUNT='',0,IFNULL(fact.SAMPLE_COUNT,0)) AS quantity, - round(fact.score,2) AS score, + round(fact.score,1) AS score, round(fact.WEIGHT,2) AS weight FROM fact_index_community_sub_score fact diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml index acf9b5a874..84ea0eca60 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml @@ -30,8 +30,9 @@ SELECT id, customer_id, agency_id, grid_id, year_id, month_id, user_id, COUNT(*) quantity, - ROUND(AVG(score),2) score, - index_code, all_parent_index_code, weight + ROUND(AVG(score),1) score, + index_code, all_parent_index_code, + ROUND(weight,2) weight FROM fact_index_cpc_sub_score WHERE ALL_PARENT_INDEX_CODE = #{allParentIndexCode} AND CUSTOMER_ID = #{customerId} diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml index af7d01495b..45cb19fced 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexDeptSubScoreDao.xml @@ -11,7 +11,8 @@ origin_value, index_code, all_parent_index_code, weight, COUNT(*) quantity, - ROUND(AVG(score),2) score + ROUND(AVG(score),1) score, + round(weight,2) AS weight FROM fact_index_dept_sub_score WHERE ALL_PARENT_INDEX_CODE = #{allParentIndexCode} diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml index e7b23aebcc..5bbc687e50 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml @@ -45,7 +45,7 @@ SELECT fact.index_code, IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value, - round(fact.score,2) AS score, + round(fact.score,1) AS score, round(fact.WEIGHT,2) AS weight FROM fact_index_grid_sub_score fact