From 1e0daa70fcd725148845b90b9b0cd44b6d731aa0 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 18 Sep 2020 18:04:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=BB=E7=90=86=E8=83=BD=E5=8A=9B=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/OrgStatisticsResultDTO.java | 20 ++++++++ .../extract/FactOriginProjectLogDailyDao.java | 21 +++++++- .../FactOriginProjectMainDailyDao.java | 19 +++++++ .../FactOriginProjectOrgPeriodDailyDao.java | 13 +++++ .../epmet/dao/project/ProjectProcessDao.java | 10 ++++ .../FactOriginProjectLogDailyService.java | 20 ++++++++ .../FactOriginProjectMainDailyService.java | 19 +++++++ .../FactOriginProjectLogDailyServiceImpl.java | 11 +++++ ...FactOriginProjectMainDailyServiceImpl.java | 11 +++++ .../impl/ProjectExtractServiceImpl.java | 2 + .../indexcoll/IndexCollCommunityService.java | 9 ++++ .../impl/IndexCollCommunityServiceImpl.java | 36 ++++++++++++++ .../extract/FactOriginProjectLogDailyDao.xml | 25 ++++++++++ .../extract/FactOriginProjectMainDailyDao.xml | 49 ++++++++++++++++++- .../FactOriginProjectOrgPeriodDailyDao.xml | 19 +++++++ .../mapper/project/ProjectProcessDao.xml | 25 ++++++++++ 16 files changed, 307 insertions(+), 2 deletions(-) create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/OrgStatisticsResultDTO.java 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 new file mode 100644 index 0000000000..2d70c0b254 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/OrgStatisticsResultDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.extract.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/9/18 14:39 + */ +@Data +public class OrgStatisticsResultDTO implements Serializable { + private static final long serialVersionUID = 9221060553279124719L; + private String customerId; + private String agencyId; + private Integer count; + private Integer sum; + private String ratio; +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java index 48f3a546a4..b142c32e60 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java @@ -18,6 +18,7 @@ package com.epmet.dao.evaluationindex.extract; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.extract.result.OrgStatisticsResultDTO; import com.epmet.dto.extract.result.NotReturnProjectResultDTO; import com.epmet.dto.extract.result.ProjectEvaluateResultDTO; import com.epmet.entity.evaluationindex.extract.FactOriginProjectLogDailyEntity; @@ -34,6 +35,15 @@ import java.util.List; */ @Mapper public interface FactOriginProjectLogDailyDao extends BaseDao { + /** + * 机关被吹哨次数 + * @author zhaoqifeng + * @date 2020/9/18 14:46 + * @param monthId + * @param level + * @return java.util.List + */ + List selectAgencyTransferCount(@Param("monthId") String monthId, @Param("level")String level); /** * @Description 查询未被退回的项目数 @@ -52,4 +62,13 @@ public interface FactOriginProjectLogDailyDao extends BaseDao selectProjectEvaluate(@Param("customerId") String customerId,@Param("monthId") String monthId); -} \ No newline at end of file + + /** + * 根据日期删除数据 + * @author zhaoqifeng + * @date 2020/9/18 17:32 + * @param date + * @return void + */ + void deleteByDate(@Param("date") String date); +} 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 2b2e581698..a8fef6685c 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 @@ -19,6 +19,7 @@ package com.epmet.dao.evaluationindex.extract; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.extract.FactOriginProjectMainDailyDTO; +import com.epmet.dto.extract.result.OrgStatisticsResultDTO; import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO; import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity; import org.apache.ibatis.annotations.Mapper; @@ -53,6 +54,15 @@ public interface FactOriginProjectMainDailyDao extends BaseDao getPendingList(@Param("customerId") String customerId); + /** + * 项目超期数 + * @author zhaoqifeng + * @date 2020/9/18 16:28 + * @param monthId + * @return java.util.List + */ + List selectOverdueCount(@Param("monthId") String monthId); + /** * @Description 网格办结项目数 * @param customerId @@ -62,4 +72,13 @@ public interface FactOriginProjectMainDailyDao extends BaseDao selectGridClosedProject(@Param("customerId") String customerId,@Param("monthId") String monthId,@Param("status") String status); + + /** + * 根据日期删除数据 + * @author zhaoqifeng + * @date 2020/9/18 17:32 + * @param date + * @return void + */ + void deleteByDate(@Param("date") String date); } \ 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 ca899b5865..ecb8faa448 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 @@ -49,6 +49,19 @@ public interface FactOriginProjectOrgPeriodDailyDao extends BaseDao + */ + 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/project/ProjectProcessDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java index fce4b95879..1c71121c1d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java @@ -102,4 +102,14 @@ public interface ProjectProcessDao extends BaseDao { * @date 2020.09.17 17:56 **/ List selectResponseTrace(@Param("projects") List projects); + + /** + * 获取办结组织 + * @author zhaoqifeng + * @date 2020/9/18 18:01 + * @param customerId + * @param date + * @return java.util.List + */ + List selectFinishOrg(@Param("customerId") String customerId, @Param("date") String date); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginProjectLogDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginProjectLogDailyService.java index 9a5975aa90..a10f53783a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginProjectLogDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginProjectLogDailyService.java @@ -20,6 +20,7 @@ package com.epmet.service.evaluationindex.extract; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.extract.FactOriginProjectLogDailyDTO; +import com.epmet.dto.extract.result.OrgStatisticsResultDTO; import com.epmet.dto.extract.result.NotReturnProjectResultDTO; import com.epmet.dto.extract.result.ProjectEvaluateResultDTO; import com.epmet.entity.evaluationindex.extract.FactOriginProjectLogDailyEntity; @@ -95,6 +96,16 @@ public interface FactOriginProjectLogDailyService extends BaseService + */ + List getAgencyTransferCount(String monthId, String level); + /** * @Description 查询未被退回的项目数 * @param customerId @@ -112,4 +123,13 @@ public interface FactOriginProjectLogDailyService extends BaseService selectProjectEvaluate(String customerId,String monthId); + + /** + * 根据日期删除数据 + * @author zhaoqifeng + * @date 2020/9/18 17:30 + * @param date + * @return void + */ + void deleteByDate(String date); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginProjectMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginProjectMainDailyService.java index 8b6c93d719..338418717b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginProjectMainDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginProjectMainDailyService.java @@ -20,6 +20,7 @@ package com.epmet.service.evaluationindex.extract; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.extract.FactOriginProjectMainDailyDTO; +import com.epmet.dto.extract.result.OrgStatisticsResultDTO; import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO; import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity; @@ -121,4 +122,22 @@ public interface FactOriginProjectMainDailyService extends BaseService selectGridClosedProject(String customerId,String monthId,String status); + + /** + * 项目超期数 + * @author zhaoqifeng + * @date 2020/9/18 16:29 + * @param monthId + * @return java.util.List + */ + List getOverdueCount(String monthId); + + /** + * 根据日期删除数据 + * @author zhaoqifeng + * @date 2020/9/18 17:30 + * @param date + * @return void + */ + void deleteByDate(String date); } \ 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/FactOriginProjectLogDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginProjectLogDailyServiceImpl.java index f51b327fe6..1cb438c8c3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginProjectLogDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginProjectLogDailyServiceImpl.java @@ -25,6 +25,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.evaluationindex.extract.FactOriginProjectLogDailyDao; import com.epmet.dto.extract.FactOriginProjectLogDailyDTO; +import com.epmet.dto.extract.result.OrgStatisticsResultDTO; import com.epmet.dto.extract.result.NotReturnProjectResultDTO; import com.epmet.dto.extract.result.ProjectEvaluateResultDTO; import com.epmet.entity.evaluationindex.extract.FactOriginProjectLogDailyEntity; @@ -99,6 +100,11 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl getAgencyTransferCount(String monthId, String level) { + return baseDao.selectAgencyTransferCount(monthId, level); + } + /** * @Description 查询未被退回的项目数 * @param customerId @@ -123,4 +129,9 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl getOverdueCount(String monthId) { + return baseDao.selectOverdueCount(monthId); + } + /** * @Description 网格办结项目数 * @param customerId @@ -120,4 +126,9 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl transferCount = factOriginProjectLogDailyService.getAgencyTransferCount(dimId.getMonthId(), "community"); + //社区项目响应度 + 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/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml index c812f10fc4..aa2d887e13 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml @@ -2,7 +2,32 @@ + + DELETE FROM + fact_origin_project_log_daily + + WHERE + DATE_ID = #{date} + + + + - + + DELETE FROM + fact_origin_project_main_daily + + WHERE + DATE_ID = #{date} + + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.xml index 175bf983b4..c047ea0541 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.xml @@ -44,6 +44,25 @@ + + insert into fact_origin_project_org_period_daily 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 480c2ccf9a..fae85f5561 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 @@ -141,4 +141,29 @@ ) ORDER BY process.STAFF_ID , process.CREATED_TIME ASC + \ No newline at end of file