From 0006311ce2c9f99cb13e1d30c1f5ae4a9485bbc4 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Sat, 19 Sep 2020 17:50:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=9B=B8=E5=85=B3=20?= =?UTF-8?q?=E5=85=9A=E5=BB=BA=E8=83=BD=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/form/GridIssueCountResultDTO.java | 15 -- .../result/GridUserCountResultDTO.java | 15 -- .../PartyCreateGroupCountResultDTO.java | 25 +++ .../extract/result/PublishCountResultDTO.java | 25 +++ .../result/ShiftProjectCountResultDTO.java | 25 +++ .../com/epmet/controller/DemoController.java | 20 +++ .../extract/FactOriginGroupMainDailyDao.java | 15 +- .../extract/FactOriginIssueMainDailyDao.java | 11 ++ .../FactOriginProjectOrgPeriodDailyDao.java | 4 +- .../FactIndexGovrnAblityGridMonthlyDao.java | 17 ++ .../FactArticlePublishedGridDailyDao.java | 10 ++ ...tIndexGovernAbilityGridMonthlyService.java | 33 ++++ ...ctIndexPartyAbilityGridMonthlyService.java | 31 ++++ ...IndexServiceAbilityGridMonthlyService.java | 11 ++ .../extract/GroupExtractService.java | 14 ++ .../extract/IssueExtractService.java | 11 ++ .../extract/impl/CalGridIndexServiceImpl.java | 152 +++++++++++++++--- ...exGovernAbilityGridMonthlyServiceImpl.java | 37 +++++ ...dexPartyAbilityGridMonthlyServiceImpl.java | 37 +++++ ...xServiceAbilityGridMonthlyServiceImpl.java | 20 +++ .../extract/impl/GroupExtractServiceImpl.java | 19 +++ .../extract/impl/IssueExtractServiceImpl.java | 13 ++ .../impl/IndexCollCommunityServiceImpl.java | 4 +- .../FactArticlePublishedGridDailyService.java | 10 +- ...tArticlePublishedGridDailyServiceImpl.java | 13 ++ .../extract/FactOriginGroupMainDailyDao.xml | 38 ++--- .../extract/FactOriginIssueMainDailyDao.xml | 19 ++- .../FactIndexGovrnAblityGridMonthlyDao.xml | 60 +++++++ .../FactArticlePublishedGridDailyDao.xml | 12 ++ .../stats/user/FactRegUserGridMonthlyDao.xml | 5 +- 30 files changed, 628 insertions(+), 93 deletions(-) create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/PartyCreateGroupCountResultDTO.java create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/PublishCountResultDTO.java create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/ShiftProjectCountResultDTO.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexGovernAbilityGridMonthlyService.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexPartyAbilityGridMonthlyService.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexServiceAbilityGridMonthlyService.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexGovernAbilityGridMonthlyServiceImpl.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexPartyAbilityGridMonthlyServiceImpl.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexServiceAbilityGridMonthlyServiceImpl.java diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/GridIssueCountResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/GridIssueCountResultDTO.java index 6237f49117..207cd8e8df 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/GridIssueCountResultDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/GridIssueCountResultDTO.java @@ -27,19 +27,4 @@ public class GridIssueCountResultDTO implements Serializable { * 网格ID */ private String gridId; - - /** - * 月份ID - */ - private String monthId; - - /** - * 季度ID - */ - private String quarterId; - - /** - * 年度ID - */ - private String yearId; } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/GridUserCountResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/GridUserCountResultDTO.java index aa2b5da005..8b97bdc505 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/GridUserCountResultDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/GridUserCountResultDTO.java @@ -27,19 +27,4 @@ public class GridUserCountResultDTO implements Serializable { * 网格ID */ private String gridId; - - /** - * 月份ID - */ - private String monthId; - - /** - * 季度ID - */ - private String quarterId; - - /** - * 年度ID - */ - private String yearId; } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/PartyCreateGroupCountResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/PartyCreateGroupCountResultDTO.java new file mode 100644 index 0000000000..c95ae4bad3 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/PartyCreateGroupCountResultDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.extract.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2020/9/19 3:30 下午 + */ +@Data +public class PartyCreateGroupCountResultDTO implements Serializable { + + private static final long serialVersionUID = -4193777575465275095L; + + /** + * 网格ID + */ + private String gridId; + + /** + * 建群党员数 + */ + private Integer partyCreateGroupCount; +} diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/PublishCountResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/PublishCountResultDTO.java new file mode 100644 index 0000000000..2044dcd8fa --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/PublishCountResultDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.extract.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2020/9/19 2:41 下午 + */ +@Data +public class PublishCountResultDTO implements Serializable { + + private static final long serialVersionUID = -955208044108055887L; + + /** + * 网格ID + */ + private String gridId; + + /** + * 发文数量 + */ + private Integer publishCount; +} diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/ShiftProjectCountResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/ShiftProjectCountResultDTO.java new file mode 100644 index 0000000000..7519e32c48 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/ShiftProjectCountResultDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.extract.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2020/9/19 2:23 下午 + */ +@Data +public class ShiftProjectCountResultDTO implements Serializable { + + private static final long serialVersionUID = -262809191405218048L; + + /** + * 网格ID + */ + private String gridId; + + /** + * 网格 党员/群众 人均提出的议题转项目数 + */ + private Integer shiftProjectCount; +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java index 47122de6ad..848be0a8bb 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java @@ -26,6 +26,7 @@ import com.epmet.entity.stats.DimAgencyEntity; import com.epmet.entity.stats.DimCustomerEntity; import com.epmet.entity.stats.DimDateEntity; import com.epmet.service.StatsDemoService; +import com.epmet.service.evaluationindex.extract.CalGridIndexService; import com.epmet.service.evaluationindex.extract.FactOriginTopicMainDailyService; import com.epmet.service.evaluationindex.indexcal.*; import com.epmet.service.stats.DimAgencyService; @@ -533,4 +534,23 @@ public class DemoController { partymemberService.statsPartyMember(customerIdAndDateIdFormDTO); return new Result(); } + + @Autowired + private CalGridIndexService calGridIndexService; + + @PostMapping("gridparty") + public void gridParty(){ +// String customerId = "3ef7e4bb195eb9e622d68b52509aa940"; + String customerId = "epmettest"; + String monthId = "202008"; + calGridIndexService.calGridIndexPartyAbility(customerId,monthId); + } + + @PostMapping("gridgovern") + public void gridGovern(){ +// String customerId = "3ef7e4bb195eb9e622d68b52509aa940"; + String customerId = "epmettest"; + String monthId = "202008"; + calGridIndexService.calGridIndexGovernAbility(customerId,monthId); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMainDailyDao.java index 3a8aa67089..ff1c16d1ec 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMainDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMainDailyDao.java @@ -18,8 +18,12 @@ package com.epmet.dao.evaluationindex.extract; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.extract.result.PartyCreateGroupCountResultDTO; import com.epmet.entity.evaluationindex.extract.FactOriginGroupMainDailyEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 业务数据抽取-小组相关 @@ -29,5 +33,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface FactOriginGroupMainDailyDao extends BaseDao { - + + /** + * @Description 查询建群党员数 + * @param customerId + * @param monthId + * @author zxc + * @date 2020/9/19 3:49 下午 + */ + List selectPartyCreateGroupCount(@Param("customerId") String customerId,@Param("monthId") String monthId); + } \ No newline at end of file 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 ec13864713..475790cf49 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 @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.extract.form.GridIssueCountResultDTO; import com.epmet.dto.extract.form.IssueMainDailyFormDTO; import com.epmet.dto.extract.result.GridProjectCountResultDTO; +import com.epmet.dto.extract.result.ShiftProjectCountResultDTO; import com.epmet.entity.evaluationindex.extract.FactOriginIssueMainDailyEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -91,4 +92,14 @@ public interface FactOriginIssueMainDailyDao extends BaseDao> selectShiftProjectCount(@Param("customerId") String customerId,@Param("monthId") String monthId); + + /** + * @Description 查询网格 党员/群众 人均提出的议题转项目数 + * @param customerId + * @param monthId + * @param isParty + * @author zxc + * @date 2020/9/19 2:26 下午 + */ + List selectShiftProjectCountPlus(@Param("customerId") String customerId,@Param("monthId") String monthId,@Param("isParty") Integer isParty); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.java index ecb8faa448..9703dfa535 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.java @@ -60,8 +60,8 @@ public interface FactOriginProjectOrgPeriodDailyDao extends BaseDao */ - List selectResponsiveness(@Param("monthId") String monthId, @Param("level")String level, - @Param("orgType")String orgType); +// List selectResponsiveness(@Param("monthId") String monthId, @Param("level")String level, +// @Param("orgType")String orgType); void deleteByProjectId(@Param("list") List list); /** diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.java index 16a916edae..1d8b7eb7ba 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.java @@ -118,4 +118,21 @@ public interface FactIndexGovrnAblityGridMonthlyDao extends BaseDao selectAllGridInfoToParty(String customerId); + + /** + * @Description 批量插入治理能力 + * @param lists + * @author zxc + * @date 2020/9/19 4:28 下午 + */ + void insertGovernAbilityRecord(@Param("lists") List lists); + + /** + * @Description 删除治理能力旧纪录 + * @param customerId + * @param monthId + * @author zxc + * @date 2020/9/19 4:31 下午 + */ + void deleteOldGovernAbilityRecord(@Param("customerId")String customerId,@Param("monthId")String monthId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactArticlePublishedGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactArticlePublishedGridDailyDao.java index 24b8ca6115..ddd8ebd63f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactArticlePublishedGridDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactArticlePublishedGridDailyDao.java @@ -18,6 +18,7 @@ package com.epmet.dao.stats; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.extract.result.PublishCountResultDTO; import com.epmet.entity.stats.FactArticlePublishedAgencyDailyEntity; import com.epmet.entity.stats.FactArticlePublishedGridDailyEntity; import org.apache.ibatis.annotations.Mapper; @@ -51,4 +52,13 @@ public interface FactArticlePublishedGridDailyDao extends BaseDao selectArticlePublishCount(@Param("customerId")String customerId,@Param("monthId") String monthId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexGovernAbilityGridMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexGovernAbilityGridMonthlyService.java new file mode 100644 index 0000000000..a5d5e6bb9c --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexGovernAbilityGridMonthlyService.java @@ -0,0 +1,33 @@ +package com.epmet.service.evaluationindex.extract; + +import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 治理能力-网格相关事实表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-09-19 + */ +public interface FactIndexGovernAbilityGridMonthlyService{ + + /** + * @Description 批量插入治理能力 + * @param lists + * @author zxc + * @date 2020/9/19 4:28 下午 + */ + void insertGovernAbilityRecord(@Param("lists") List lists); + + /** + * @Description 删除治理能力旧纪录 + * @param customerId + * @param monthId + * @author zxc + * @date 2020/9/19 4:31 下午 + */ + void deleteOldGovernAbilityRecord(@Param("customerId")String customerId,@Param("monthId")String monthId); + +} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexPartyAbilityGridMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexPartyAbilityGridMonthlyService.java new file mode 100644 index 0000000000..198bcf57dc --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexPartyAbilityGridMonthlyService.java @@ -0,0 +1,31 @@ +package com.epmet.service.evaluationindex.extract; + +import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO; + +import java.util.List; + +/** + * 党建能力-网格相关事实表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-09-19 + */ +public interface FactIndexPartyAbilityGridMonthlyService{ + + /** + * @Description 网格党建能力插入 + * @param lists + * @author zxc + * @date 2020/9/19 10:32 上午 + */ + void insertPartyAbility(List lists); + + /** + * @Description 删除旧的党建能力记录 + * @param customerId + * @param monthId + * @author zxc + * @date 2020/9/19 10:45 上午 + */ + void deleteOldPartyAbility(String customerId,String monthId); +} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexServiceAbilityGridMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexServiceAbilityGridMonthlyService.java new file mode 100644 index 0000000000..793af948e6 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexServiceAbilityGridMonthlyService.java @@ -0,0 +1,11 @@ +package com.epmet.service.evaluationindex.extract; + +/** + * 服务能力-网格相关事实表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-09-19 + */ +public interface FactIndexServiceAbilityGridMonthlyService{ + +} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/GroupExtractService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/GroupExtractService.java index 33a2d6c7fa..e775660b9e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/GroupExtractService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/GroupExtractService.java @@ -1,9 +1,23 @@ package com.epmet.service.evaluationindex.extract; +import com.epmet.dto.extract.result.PartyCreateGroupCountResultDTO; + +import java.util.List; + /** * @Desc 业务数据抽取 - 组相关 * @Author wangc * @DateTime 2020/9/14 5:07 下午 */ public interface GroupExtractService { + + /** + * @Description 查询建群党员数 + * @param customerId + * @param monthId + * @author zxc + * @date 2020/9/19 3:49 下午 + */ + List selectPartyCreateGroupCount(String customerId,String monthId); + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/IssueExtractService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/IssueExtractService.java index 432b775ab9..55cf8cd348 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/IssueExtractService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/IssueExtractService.java @@ -3,6 +3,7 @@ package com.epmet.service.evaluationindex.extract; import com.epmet.dto.extract.form.ExtractFormDTO; import com.epmet.dto.extract.form.GridIssueCountResultDTO; import com.epmet.dto.extract.result.GridProjectCountResultDTO; +import com.epmet.dto.extract.result.ShiftProjectCountResultDTO; import java.util.List; @@ -69,4 +70,14 @@ public interface IssueExtractService { * @Date 2020/9/18 14:11 **/ List> selectShiftProjectCount(String customerId, String monthId); + + /** + * @Description 查询网格 党员/群众 人均提出的议题转项目数 + * @param customerId + * @param monthId + * @param isParty + * @author zxc + * @date 2020/9/19 2:26 下午 + */ + List selectShiftProjectCountPlus(String customerId, String monthId,Integer isParty); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java index 150217a7eb..0b574b6009 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java @@ -1,9 +1,8 @@ package com.epmet.service.evaluationindex.extract.impl; -import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; -import com.epmet.constant.DataSourceConstant; +import com.epmet.commons.tools.utils.DateUtils; import com.epmet.constant.ExtractConstant; import com.epmet.constant.ProjectEvaluateConstant; import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyDao; @@ -13,11 +12,13 @@ import com.epmet.dto.extract.form.GridIssueCountResultDTO; import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO; import com.epmet.dto.extract.result.*; import com.epmet.service.evaluationindex.extract.*; +import com.epmet.service.stats.FactArticlePublishedGridDailyService; import com.epmet.service.stats.user.FactRegUserGridMonthlyService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; @@ -33,15 +34,17 @@ import java.util.stream.Collectors; */ @Service @Slf4j -@DataSource(DataSourceConstant.EVALUATION_INDEX) +//@DataSource(DataSourceConstant.EVALUATION_INDEX) public class CalGridIndexServiceImpl implements CalGridIndexService { @Autowired private IssueExtractService issueExtractService; @Autowired - private FactIndexGovrnAblityGridMonthlyDao governAbilityDao; + private FactIndexGovernAbilityGridMonthlyService governAbilityGridMonthlyService; + @Autowired + private FactIndexPartyAbilityGridMonthlyService partyAbilityGridMonthlyService; @Autowired - private FactIndexPartyAblityGridMonthlyDao partyAbilityGridDao; + private FactIndexGovrnAblityGridMonthlyDao governAbilityDao; @Autowired private FactOriginProjectMainDailyService projectMainService; @Autowired @@ -50,6 +53,10 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { private FactRegUserGridMonthlyService userGridMonthlyService; @Autowired private FactOriginTopicMainDailyService topicMainService; + @Autowired + private FactArticlePublishedGridDailyService articlePublishedGridDailyService; + @Autowired + private GroupExtractService groupExtractService; /** * @Description 计算网格指标党建能力 @@ -70,11 +77,24 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { List partyCreateTopicCountList = topicMainService.selectCreateTopicCount(customerId, monthId, NumConstant.ONE); // 网格群众人均提出话题数 List massCreateTopicCountList = topicMainService.selectCreateTopicCount(customerId, monthId, NumConstant.ZERO); - - - - + // 网格党员人均提出的议题转项目数 + List partyShiftProjectCountList = issueExtractService.selectShiftProjectCountPlus(customerId, monthId, NumConstant.ONE); + // 网格群众人均提出的议题转项目数 + List massShiftProjectCountList = issueExtractService.selectShiftProjectCountPlus(customerId, monthId, NumConstant.ZERO); + // 网格的发文数量 + List publishCountList = articlePublishedGridDailyService.selectArticlePublishCount(customerId, monthId); + // 网格议题转项目率 + List gridIssueTotalList = issueExtractService.selectIssueTotal(customerId, monthId); + List gridProjectTotalList = issueExtractService.selectGridProjectCount(customerId, monthId, ExtractConstant.SHIFT_PROJECT); + List gridIssueShiftProjectRatio = getGridIssueShiftProjectRatio(gridIssueTotalList, gridProjectTotalList); + // 建群党员数 + List partyCreateGroupCountList = groupExtractService.selectPartyCreateGroupCount(customerId, monthId); + String quarterId = DateUtils.getQuarterId(monthId); + String yearId = DateUtils.getYearId(monthId); result.forEach(r -> { + r.setMonthId(monthId); + r.setQuarterId(quarterId); + r.setYearId(yearId); // 1. 网格群众用户数 , 网格党员用户数 if (!CollectionUtils.isEmpty(gridUserCountList)){ gridUserCountList.forEach(count -> { @@ -99,9 +119,48 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { } }); } + // 4. 网格党员人均提出的议题转项目数 + if (!CollectionUtils.isEmpty(partyShiftProjectCountList)){ + partyShiftProjectCountList.forEach(party -> { + if (r.getGridId().equals(party.getGridId())){ + r.setPartyAvgShiftProjectCount(party.getShiftProjectCount()); + } + }); + } + // 5. 网格群众人均提出的议题转项目数 + if (!CollectionUtils.isEmpty(massShiftProjectCountList)){ + massShiftProjectCountList.forEach(mass -> { + if (r.getGridId().equals(mass.getGridId())){ + r.setPartyAvgShiftProjectCount(mass.getShiftProjectCount()); + } + }); + } + // 6. 网格的发文数量 + if (!CollectionUtils.isEmpty(publishCountList)){ + publishCountList.forEach(publish -> { + if (r.getGridId().equals(publish.getGridId())){ + r.setPublishArticleCount(publish.getPublishCount()); + } + }); + } + // 7. 网格议题转项目率 + if (!CollectionUtils.isEmpty(gridIssueShiftProjectRatio)){ + gridIssueShiftProjectRatio.forEach(ratio -> { + if (r.getGridId().equals(ratio.getGridId())){ + r.setIssueToProjectRatio(ratio.getIssueToProjectRatio()); + } + }); + } + // 8. 建群党员数 + if (!CollectionUtils.isEmpty(partyCreateGroupCountList)){ + partyCreateGroupCountList.forEach(party -> { + if (r.getGridId().equals(party.getGridId())){ + r.setCreateGroupPartyCount(party.getPartyCreateGroupCount()); + } + }); + } }); - - + delAndInsertPartyAbility(result,customerId,monthId); return true; } @@ -124,15 +183,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { //网格总项目数 List gridProjectTotalList = issueExtractService.selectGridProjectCount(customerId, monthId, ExtractConstant.SHIFT_PROJECT); //网格议题转项目率 - if (!CollectionUtils.isEmpty(gridIssueTotalList) && !CollectionUtils.isEmpty(gridProjectTotalList)) { - gridProjectTotalList.forEach(project -> { - gridIssueTotalList.forEach(issue -> { - if (project.getGridId().equals(issue.getGridId())) { - project.setIssueToProjectRatio(getRound(new BigDecimal(project.getProjectTotal() / issue.getIssueTotal()))); - } - }); - }); - } + List gridIssueShiftProjectRatio = getGridIssueShiftProjectRatio(gridIssueTotalList, gridProjectTotalList); //网格自治项目数 从议题创建到项目关闭，包括处理人，自始至终没有出过议题所属网格 List projectAutoNoMyList = projectLogService.selectProjectAutoNoMy(customerId, monthId); Map autoMap = new HashMap<>(16); @@ -160,9 +211,9 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { List gridProjectClosedTotalList = projectMainService.selectGridClosedProject(customerId, monthId, ExtractConstant.CLOSED); //网格吹哨部门准确率 【没被退回的项目数/项目总数 】 List notReturnProjectList = projectLogService.selectNotReturnProject(customerId, monthId, ExtractConstant.RETURN_ACTION_CODE, ExtractConstant.GRID_ORG_TYPE); - if (!CollectionUtils.isEmpty(gridProjectTotalList) && !CollectionUtils.isEmpty(notReturnProjectList)){ + if (!CollectionUtils.isEmpty(gridIssueShiftProjectRatio) && !CollectionUtils.isEmpty(notReturnProjectList)){ notReturnProjectList.forEach(not -> { - gridProjectTotalList.forEach(total -> { + gridIssueShiftProjectRatio.forEach(total -> { if (not.getGridId().equals(total.getGridId())){ not.setTransferRightRatio(getRound(new BigDecimal(not.getNotReturnProject()/total.getProjectTotal()))); } @@ -202,8 +253,12 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { resultSatisfactionScore.put(gridId,getRound(new BigDecimal(allScore.get()/scoreMap.size()))); }); } - + String quarterId = DateUtils.getQuarterId(monthId); + String yearId = DateUtils.getYearId(monthId); result.forEach(r -> { + r.setMonthId(monthId); + r.setQuarterId(quarterId); + r.setYearId(yearId); // 1. 网格总议题数目，网格人均议题数目 if (!CollectionUtils.isEmpty(gridIssueTotalList)) { gridIssueTotalList.forEach(total -> { @@ -214,7 +269,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { } // 2. 网格总项目数，网格议题转项目率 if (!CollectionUtils.isEmpty(gridIssueTotalList)){ - gridProjectTotalList.forEach(projectTotal -> { + gridIssueShiftProjectRatio.forEach(projectTotal -> { if (r.getGridId().equals(projectTotal.getGridId())){ r.setProjectTotal(projectTotal.getProjectTotal()); r.setIssueToProjectRatio(projectTotal.getIssueToProjectRatio()); @@ -254,6 +309,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { }); } }); + delAndInsertGovernAbility(result,customerId,monthId); return true; } @@ -278,4 +334,52 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { public BigDecimal getRound(BigDecimal d){ return d.setScale(NumConstant.SIX, BigDecimal.ROUND_HALF_UP); } + + /** + * @Description + * @param gridIssueTotalList + * @param gridProjectTotalList + * @author zxc + * @date 2020/9/19 2:53 下午 + */ + public List getGridIssueShiftProjectRatio(List gridIssueTotalList,List gridProjectTotalList){ + if (!CollectionUtils.isEmpty(gridIssueTotalList) && !CollectionUtils.isEmpty(gridProjectTotalList)) { + gridProjectTotalList.forEach(project -> { + gridIssueTotalList.forEach(issue -> { + if (project.getGridId().equals(issue.getGridId())) { + project.setIssueToProjectRatio(getRound(new BigDecimal(project.getProjectTotal() / issue.getIssueTotal()))); + } + }); + }); + } + return gridProjectTotalList; + } + + /** + * @Description 删除并插入党建能力的记录 + * @param result + * @author zxc + * @date 2020/9/19 4:06 下午 + */ + @Transactional(rollbackFor = Exception.class) + public void delAndInsertPartyAbility(List result,String customerId,String monthId){ + if (!CollectionUtils.isEmpty(result)){ + partyAbilityGridMonthlyService.deleteOldPartyAbility(customerId, monthId); + partyAbilityGridMonthlyService.insertPartyAbility(result); + } + } + + /** + * @Description 删除并插入治理能力的记录 + * @param result + * @author zxc + * @date 2020/9/19 4:06 下午 + */ + @Transactional(rollbackFor = Exception.class) + public void delAndInsertGovernAbility(List result,String customerId,String monthId){ + if (!CollectionUtils.isEmpty(result)){ + governAbilityGridMonthlyService.deleteOldGovernAbilityRecord(customerId, monthId); + governAbilityGridMonthlyService.insertGovernAbilityRecord(result); + } + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexGovernAbilityGridMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexGovernAbilityGridMonthlyServiceImpl.java new file mode 100644 index 0000000000..64096f1935 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexGovernAbilityGridMonthlyServiceImpl.java @@ -0,0 +1,37 @@ +package com.epmet.service.evaluationindex.extract.impl; + +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.constant.DataSourceConstant; +import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyDao; +import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO; +import com.epmet.service.evaluationindex.extract.FactIndexGovernAbilityGridMonthlyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 治理能力-网格相关事实表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-09-19 + */ +@Service +@Slf4j +@DataSource(DataSourceConstant.EVALUATION_INDEX) +public class FactIndexGovernAbilityGridMonthlyServiceImpl implements FactIndexGovernAbilityGridMonthlyService { + + @Autowired + private FactIndexGovrnAblityGridMonthlyDao governAbilityDao; + + @Override + public void insertGovernAbilityRecord(List lists) { + governAbilityDao.insertGovernAbilityRecord(lists); + } + + @Override + public void deleteOldGovernAbilityRecord(String customerId, String monthId) { + governAbilityDao.deleteOldGovernAbilityRecord(customerId, monthId); + } +} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexPartyAbilityGridMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexPartyAbilityGridMonthlyServiceImpl.java new file mode 100644 index 0000000000..922e429ac9 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexPartyAbilityGridMonthlyServiceImpl.java @@ -0,0 +1,37 @@ +package com.epmet.service.evaluationindex.extract.impl; + +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.constant.DataSourceConstant; +import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityGridMonthlyDao; +import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO; +import com.epmet.service.evaluationindex.extract.FactIndexPartyAbilityGridMonthlyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 党建能力-网格相关事实表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-09-19 + */ +@Service +@Slf4j +@DataSource(DataSourceConstant.EVALUATION_INDEX) +public class FactIndexPartyAbilityGridMonthlyServiceImpl implements FactIndexPartyAbilityGridMonthlyService { + + @Autowired + private FactIndexPartyAblityGridMonthlyDao partyAbilityGridDao; + + @Override + public void insertPartyAbility(List lists) { + partyAbilityGridDao.insertPartyAbility(lists); + } + + @Override + public void deleteOldPartyAbility(String customerId, String monthId) { + partyAbilityGridDao.deleteOldPartyAbility(customerId, monthId); + } +} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexServiceAbilityGridMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexServiceAbilityGridMonthlyServiceImpl.java new file mode 100644 index 0000000000..3d5e2019e2 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexServiceAbilityGridMonthlyServiceImpl.java @@ -0,0 +1,20 @@ +package com.epmet.service.evaluationindex.extract.impl; + +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.constant.DataSourceConstant; +import com.epmet.service.evaluationindex.extract.FactIndexServiceAbilityGridMonthlyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * 服务能力-网格相关事实表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-09-19 + */ +@Service +@Slf4j +@DataSource(DataSourceConstant.EVALUATION_INDEX) +public class FactIndexServiceAbilityGridMonthlyServiceImpl implements FactIndexServiceAbilityGridMonthlyService { + +} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/GroupExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/GroupExtractServiceImpl.java index 039fda6047..56a3b46245 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/GroupExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/GroupExtractServiceImpl.java @@ -1,9 +1,14 @@ package com.epmet.service.evaluationindex.extract.impl; +import com.epmet.dao.evaluationindex.extract.FactOriginGroupMainDailyDao; +import com.epmet.dto.extract.result.PartyCreateGroupCountResultDTO; import com.epmet.service.evaluationindex.extract.GroupExtractService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Description 业务数据抽取 - 组相关 * @ClassName GroupExtractServiceImpl @@ -14,4 +19,18 @@ import org.springframework.stereotype.Service; @Slf4j public class GroupExtractServiceImpl implements GroupExtractService { + @Autowired + private FactOriginGroupMainDailyDao groupMainDailyDao; + + /** + * @Description 查询建群党员数 + * @param customerId + * @param monthId + * @author zxc + * @date 2020/9/19 3:49 下午 + */ + @Override + public List selectPartyCreateGroupCount(String customerId, String monthId) { + return groupMainDailyDao.selectPartyCreateGroupCount(customerId, monthId); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/IssueExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/IssueExtractServiceImpl.java index 33524d2e5b..46ae7c8557 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/IssueExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/IssueExtractServiceImpl.java @@ -293,4 +293,17 @@ public class IssueExtractServiceImpl implements IssueExtractService { public List> selectShiftProjectCount(String customerId, String monthId) { return issueMainDailyDao.selectShiftProjectCount(customerId,monthId); } + + /** + * @Description 查询网格 党员/群众 人均提出的议题转项目数 + * @param customerId + * @param monthId + * @param isParty + * @author zxc + * @date 2020/9/19 2:26 下午 + */ + @Override + public List selectShiftProjectCountPlus(String customerId, String monthId, Integer isParty) { + return issueMainDailyDao.selectShiftProjectCountPlus(customerId, monthId, isParty); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/IndexCollCommunityServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/IndexCollCommunityServiceImpl.java index eedd83e19d..4fcf0bcaff 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/IndexCollCommunityServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/IndexCollCommunityServiceImpl.java @@ -44,8 +44,8 @@ public class IndexCollCommunityServiceImpl implements IndexCollCommunityService //被吹哨次数统计 List transferCount = factOriginProjectLogDailyService.getAgencyTransferCount(dimId.getMonthId(), "community"); //社区项目响应度 - List responsiveness = factOriginProjectOrgPeriodDailyDao.selectResponsiveness(dimId.getMonthId(), "community", - "agency"); +// List responsiveness = factOriginProjectOrgPeriodDailyDao.selectResponsiveness(dimId.getMonthId(), "community", +// "agency"); //社区超期项目率 List overdueCount = factOriginProjectMainDailyService.getOverdueCount(dimId.getMonthId()); //社区办结项目满意度 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactArticlePublishedGridDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactArticlePublishedGridDailyService.java index d19038fa4e..f0b212f125 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactArticlePublishedGridDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactArticlePublishedGridDailyService.java @@ -18,6 +18,7 @@ package com.epmet.service.stats; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.extract.result.PublishCountResultDTO; import com.epmet.entity.stats.FactArticlePublishedAgencyDailyEntity; import com.epmet.entity.stats.FactArticlePublishedGridDailyEntity; @@ -55,5 +56,12 @@ public interface FactArticlePublishedGridDailyService extends BaseService values); - + /** + * @Description 查询网格下的文章发文数量 + * @param customerId + * @param monthId + * @author zxc + * @date 2020/9/19 2:44 下午 + */ + List selectArticlePublishCount(String customerId, String monthId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactArticlePublishedGridDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactArticlePublishedGridDailyServiceImpl.java index 9ad55d632f..2b2b77edce 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactArticlePublishedGridDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactArticlePublishedGridDailyServiceImpl.java @@ -23,6 +23,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.constant.DataSourceConstant; import com.epmet.dao.stats.FactArticlePublishedGridDailyDao; +import com.epmet.dto.extract.result.PublishCountResultDTO; import com.epmet.entity.stats.FactArticlePublishedAgencyDailyEntity; import com.epmet.entity.stats.FactArticlePublishedGridDailyEntity; import com.epmet.service.stats.FactArticlePublishedGridDailyService; @@ -67,4 +68,16 @@ public class FactArticlePublishedGridDailyServiceImpl extends BaseServiceImpl selectArticlePublishCount(String customerId, String monthId) { + return baseDao.selectArticlePublishCount(customerId, monthId); + } } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml index 0d7753a090..fd90cd5a18 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml @@ -3,31 +3,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + \ 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 f4de72303a..2e4884a8f6 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 @@ -72,10 +72,7 @@ SELECT COUNT( ID ) AS issueTotal, ROUND((COUNT(ID) / COUNT(DISTINCT(USER_ID))),0) AS avgIssueCount, - GRID_ID, - MONTH_ID, - QUARTER_ID, - YEAR_ID + GRID_ID FROM fact_origin_issue_main_daily WHERE @@ -134,4 +131,18 @@ GROUP BY T1.CREATE_TOPIC_USER_ID + + + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml index 401bc5931a..2343295520 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml @@ -187,4 +187,64 @@ DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} + + + + INSERT INTO fact_index_govrn_ablity_grid_monthly ( + ID, + CUSTOMER_ID, + AGENCY_ID, + GRID_ID, + MONTH_ID, + QUARTER_ID, + YEAR_ID, + ISSUE_TOTAL, + AVG_ISSUE_COUNT, + ISSUE_TO_PROJECT_RATIO, + PROJECT_TOTAL, + SELF_SOLVE_PROJECT_COUNT, + RESOLVE_PROJECT_COUNT, + TRANSFER_RIGHT_RATIO, + SATISFACTION_RATIO, + DEL_FLAG, + REVISION, + CREATED_BY, + CREATED_TIME, + UPDATED_BY, + UPDATED_TIME + ) + VALUES + + ( + REPLACE ( UUID(), '-', '' ), + #{item.customerId}, + #{item.agencyId}, + #{item.gridId}, + #{item.monthId}, + #{item.quarterId}, + #{item.yearId}, + #{item.issueTotal}, + #{item.avgIssueCount}, + #{item.issueToProjectRatio}, + #{item.projectTotal}, + #{item.selfSolveProjectCount}, + #{item.resolveProjectCount}, + #{item.transferRightRatio}, + #{item.satisfactionRatio}, + #{item.delFlag}, + #{item.revision}, + #{item.createdBy}, + NOW(), + #{item.updatedBy}, + NOW() + ) + + + + + + DELETE FROM fact_index_govrn_ablity_grid_monthly + WHERE CUSTOMER_ID = #{customerId} + AND MONTH_ID = #{monthId} + diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactArticlePublishedGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactArticlePublishedGridDailyDao.xml index b265d0b0c9..01af6f789d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactArticlePublishedGridDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactArticlePublishedGridDailyDao.xml @@ -41,5 +41,17 @@ DELETE FROM fact_article_published_grid_daily WHERE CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} AND DATE_ID = #{dateId,jdbcType=VARCHAR} + + + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactRegUserGridMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactRegUserGridMonthlyDao.xml index 38ce9ab106..42e736c90c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactRegUserGridMonthlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactRegUserGridMonthlyDao.xml @@ -111,10 +111,7 @@ SELECT REG_INCR, PARTYMEMBER_INCR, - GRID_ID, - MONTH_ID, - QUARTER_ID, - YEAR_ID + GRID_ID FROM fact_reg_user_grid_monthly WHERE