From 859e283bf874dc1ad711a48cb0c393580852af75 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 28 Dec 2021 15:21:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=8A=BD=E5=8F=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=95=B0=E6=8D=AE=E9=83=A8=E5=88=86=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20objectid=E6=9C=89=E9=92=88=E5=AF=B9=E6=80=A7?= =?UTF-8?q?=E7=9A=84=E5=A4=84=E7=90=86=E6=95=B0=E6=8D=AE=20extractProjectP?= =?UTF-8?q?eriodData,extractProjectCategory=E9=83=A8=E5=88=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FactOriginProjectCategoryDailyDao.java | 10 +- .../extract/FactOriginProjectLogDailyDao.java | 254 +++++++++------- .../FactOriginProjectMainDailyDao.java | 279 ++++++++++-------- .../com/epmet/dao/project/ProjectDao.java | 22 +- .../epmet/dao/project/ProjectProcessDao.java | 88 +++--- ...OriginProjectCategoryDailyServiceImpl.java | 13 +- .../impl/ProjectExtractServiceImpl.java | 6 +- .../project/ProjectProcessService.java | 4 +- .../epmet/service/project/ProjectService.java | 2 +- .../impl/ProjectProcessServiceImpl.java | 5 +- .../project/impl/ProjectServiceImpl.java | 4 +- .../FactOriginProjectCategoryDailyDao.xml | 3 + .../resources/mapper/project/ProjectDao.xml | 3 + .../mapper/project/ProjectProcessDao.xml | 3 + 14 files changed, 386 insertions(+), 310 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java index e520998bda..8a8549098e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java @@ -34,7 +34,7 @@ import java.util.List; @Mapper public interface FactOriginProjectCategoryDailyDao extends BaseDao { - void deleteOldData(@Param("customerId") String customerId,@Param("dateId") String dateId); + void deleteOldData(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param("projectId") String projectId); /** * @param customerId @@ -42,16 +42,16 @@ public interface FactOriginProjectCategoryDailyDao extends BaseDao selectListProjectCategoryGridDailyDTO(@Param("customerId") String customerId,@Param("subCount")Integer subCount,@Param("projectType")String projectType); + List selectListProjectCategoryGridDailyDTO(@Param("customerId") String customerId, @Param("subCount") Integer subCount, @Param("projectType") String projectType); /** - * @Description 查询客户下，组织直接立项的，各项目分类下的项目数量【筛选组织创建的项目，fact_origin_project_main_daily表gridId为空】 + * @Description 查询客户下，组织直接立项的，各项目分类下的项目数量【筛选组织创建的项目，fact_origin_project_main_daily表gridId为空】 * @Param orgIds * @author zxc * @date 2021/4/13 下午4:36 */ - List selectListProjectCategoryByOrg(@Param("orgIds")List orgIds,@Param("customerId") String customerId, - @Param("subCount") Integer subCount,@Param("projectType")String projectType); + List selectListProjectCategoryByOrg(@Param("orgIds") List orgIds, @Param("customerId") String customerId, + @Param("subCount") Integer subCount, @Param("projectType") String projectType); int deleteByProjectIds(@Param("list") List list); } 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 48d1beddaa..15aee4e27c 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 @@ -36,96 +36,101 @@ import java.util.List; public interface FactOriginProjectLogDailyDao extends BaseDao { /** * 机关被吹哨次数 - * @author zhaoqifeng - * @date 2020/9/18 14:46 + * * @param customerId * @param monthId * @param level * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/18 14:46 */ List selectAgencyTransferCount(@Param("customerId") String customerId, @Param("monthId") String monthId, - @Param("level")String level); + @Param("level") String level); /** - * @Description 查询未被退回的项目数 - * @param customerId - * @param monthId - * @author zxc - * @date 2020/9/18 2:50 下午 - */ - List selectNotReturnProject(@Param("customerId") String customerId,@Param("monthId") String monthId,@Param("actionCode") String actionCode,@Param("orgType") String orgType); + * @param customerId + * @param monthId + * @Description 查询未被退回的项目数 + * @author zxc + * @date 2020/9/18 2:50 下午 + */ + List selectNotReturnProject(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("actionCode") String actionCode, @Param("orgType") String orgType); - List selectNotReturn(@Param("customerId")String customerId,@Param("monthId")String monthId); + List selectNotReturn(@Param("customerId") String customerId, @Param("monthId") String monthId); /** - * @Description 查询项目评价信息 - * @param customerId - * @param monthId - * @author zxc - * @date 2020/9/18 3:28 下午 - */ - List selectProjectEvaluate(@Param("customerId") String customerId,@Param("monthId") String monthId); + * @param customerId + * @param monthId + * @Description 查询项目评价信息 + * @author zxc + * @date 2020/9/18 3:28 下午 + */ + List selectProjectEvaluate(@Param("customerId") String customerId, @Param("monthId") String monthId); /** - * @Description 网格项目自治率查询 - * @param customerId - * @param monthId - * @author zxc - * @date 2020/9/18 5:25 下午 - */ - List selectProjectAutoNoMy(@Param("customerId") String customerId,@Param("monthId") String monthId); - /** - * @Description 网格项目自治率查询 最新版 - * @Param customerId - * @Param monthId - * @author zxc - * @date 2021/4/12 上午10:46 - */ - List selectProjectAutoNoMyPlus(@Param("customerId") String customerId,@Param("monthId") String monthId); + * @param customerId + * @param monthId + * @Description 网格项目自治率查询 + * @author zxc + * @date 2020/9/18 5:25 下午 + */ + List selectProjectAutoNoMy(@Param("customerId") String customerId, @Param("monthId") String monthId); + + /** + * @Description 网格项目自治率查询 最新版 + * @Param customerId + * @Param monthId + * @author zxc + * @date 2021/4/12 上午10:46 + */ + List selectProjectAutoNoMyPlus(@Param("customerId") String customerId, @Param("monthId") String monthId); /** - * 根据日期删除数据 - * @author zhaoqifeng - * @date 2020/9/18 17:32 + * 根据日期删除数据 + * * @param customerId - * @param date - * @param projectId + * @param date + * @param projectId * @return void - */ - void deleteByDate(@Param("customerId") String customerId, @Param("date") String date, String projectId); + * @author zhaoqifeng + * @date 2020/9/18 17:32 + */ + void deleteByDate(@Param("customerId") String customerId, @Param("date") String date, @Param("projectId") String projectId); /** - * 办结项目满意度 - * @author zhaoqifeng - * @date 2020/9/20 16:44 - * @param customerId - * @param monthId - * @param level - * @return java.util.List - */ + * 办结项目满意度 + * + * @param customerId + * @param monthId + * @param level + * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/20 16:44 + */ List selectSatisfaction(@Param("customerId") String customerId, @Param("monthId") String monthId, - @Param("level")String level); + @Param("level") String level); /** * 区直部门被吹哨次数 - * @author zhaoqifeng - * @date 2020/9/18 14:46 + * * @param customerId * @param monthId * @param level * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/18 14:46 */ List selectDepTransferCount(@Param("customerId") String customerId, @Param("monthId") String monthId, - @Param("level")String level); + @Param("level") String level); /** - * @Description 查询各项目处理了多少机关 * @param agencies * @return + * @Description 查询各项目处理了多少机关 * @author wangc * @date 2020.09.20 23:46 - **/ - List selectProjectParticipatedAgency(@Param("agencies") List agencies, @Param("customerId") String customerId,@Param("dimId") String dimId); + **/ + List selectProjectParticipatedAgency(@Param("agencies") List agencies, @Param("customerId") String customerId, @Param("dimId") String dimId); /*** * @Description 评价周期内被吹哨项目数 @@ -135,8 +140,9 @@ public interface FactOriginProjectLogDailyDao extends BaseDao * @author wangc * @date 2020.10.15 11:20 - */ - List selectAgencyWhistledCount(@Param("agencies") List agencies, @Param("customerId") String customerId,@Param("dimId") String dimId); + */ + List selectAgencyWhistledCount(@Param("agencies") List agencies, @Param("customerId") String customerId, @Param("dimId") String dimId); + /*** * @Description 评价周期内被吹哨且被办结(无论是哪一级办结)的项目数 * @param agencies @@ -145,175 +151,192 @@ public interface FactOriginProjectLogDailyDao extends BaseDao * @author wangc * @date 2020.10.16 10:43 - */ - List selectWhistledAgencyClosedProjectCount(@Param("agencies") List agencies, @Param("customerId") String customerId,@Param("dimId") String dimId); + */ + List selectWhistledAgencyClosedProjectCount(@Param("agencies") List agencies, @Param("customerId") String customerId, @Param("dimId") String dimId); + /*** * @Description 查询机关办结次数 * @param agencies * @return java.util.List * @author wangc * @date 2020.10.14 10:27 - */ - List selectAgencyHandledProjectCount(@Param("agencies") List agencies,@Param("customerId") String customerId,@Param("dimId") String dimId); + */ + List selectAgencyHandledProjectCount(@Param("agencies") List agencies, @Param("customerId") String customerId, @Param("dimId") String dimId); + /** - * @Description 查询评价周期内各级别机关办结的项目Id * @param customerId * @param dimId * @return java.util.List + * @Description 查询评价周期内各级别机关办结的项目Id * @author wangc * @date 2020.10.15 17:29 - */ - List selectProjectIdHandledByAgency(@Param("customerId") String customerId,@Param("dimId") String dimId); + */ + List selectProjectIdHandledByAgency(@Param("customerId") String customerId, @Param("dimId") String dimId); /** - * @Description 计算每个办结项目的总耗时 * @param projectIds * @return java.util.List + * @Description 计算每个办结项目的总耗时 * @author wangc * @date 2020.10.15 17:32 - */ + */ List selectProjectCostTime(@Param("projectIds") List projectIds); + /** * 网格项目响应度 - * @author zhaoqifeng - * @date 2020/9/25 10:01 + * * @param customerId * @param monthId * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/25 10:01 */ List selectGridResponse(@Param("customerId") String customerId, @Param("monthId") String monthId); /** * 组织项目响应度 - * @author zhaoqifeng - * @date 2020/9/25 10:01 + * * @param customerId * @param dateId * @param level * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/25 10:01 */ List selectOrgResponseDaily(@Param("customerId") String customerId, @Param("dateId") String dateId, - @Param("level")String level); + @Param("level") String level); /** * 网格项目响应度 - * @author zhaoqifeng - * @date 2020/9/25 10:01 + * * @param customerId * @param dateId * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/25 10:01 */ List selectGridResponseDaily(@Param("customerId") String customerId, @Param("dateId") String dateId); /** * 组织项目响应度 - * @author zhaoqifeng - * @date 2020/9/25 10:01 + * * @param customerId * @param monthId * @param level * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/25 10:01 */ - List selectOrgResponse(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("level")String level); + List selectOrgResponse(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("level") String level); /** * 网格满意率 - * @author zhaoqifeng - * @date 2020/9/27 15:52 + * * @param customerId * @param monthId * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/27 15:52 */ List selectGridSatisfaction(@Param("customerId") String customerId, @Param("monthId") String monthId); /** * 组织满意率 - * @author zhaoqifeng - * @date 2020/9/27 15:52 + * * @param customerId * @param monthId * @param level * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/27 15:52 */ List selectOrgSatisfaction(@Param("customerId") String customerId, @Param("monthId") String monthId, - @Param("level")String level); + @Param("level") String level); /** * 网格满意率 - * @author zhaoqifeng - * @date 2020/9/27 15:52 + * * @param customerId * @param dateId * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/27 15:52 */ List selectGridSatisfactionDaily(@Param("customerId") String customerId, @Param("dateId") String dateId); /** * 组织满意率 - * @author zhaoqifeng - * @date 2020/9/27 15:52 + * * @param customerId * @param level * @param dateId * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/27 15:52 */ - List selectOrgSatisfactionDaily(@Param("customerId") String customerId, @Param("level")String level, @Param("dateId") String dateId); + List selectOrgSatisfactionDaily(@Param("customerId") String customerId, @Param("level") String level, @Param("dateId") String dateId); /** * 获取部门办结项目数 - * @author zhaoqifeng - * @date 2020/10/16 17:09 + * * @param customerId * @param monthId * @return java.util.List + * @author zhaoqifeng + * @date 2020/10/16 17:09 */ List selectDeptClosedProject(@Param("customerId") String customerId, @Param("monthId") String monthId); /** * 部门办结项目满意度 - * @author zhaoqifeng - * @date 2020/9/20 16:44 + * * @param customerId * @param monthId * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/20 16:44 */ List selectDeptSatisfaction(@Param("customerId") String customerId, @Param("monthId") String monthId); /** * 网格结案率统计 - * @author zhaoqifeng - * @date 2020/9/20 16:44 + * * @param customerId * @param monthId * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/20 16:44 */ List selectGridClosed(@Param("customerId") String customerId, @Param("monthId") String monthId); + List selectAgencyClosed(@Param("customerId") String customerId, @Param("monthId") String monthId); /** * 网格自治率统计--按天 - * @author zhaoqifeng - * @date 2021/5/24 17:53 + * * @param customerId * @param dateId * @return java.util.List + * @author zhaoqifeng + * @date 2021/5/24 17:53 */ List selectGridSelfDaily(@Param("customerId") String customerId, @Param("dateId") String dateId); /** * 组织网格自治率统计--按天 - * @author zhaoqifeng - * @date 2021/5/24 17:53 + * * @param customerId * @param dateId * @return java.util.List + * @author zhaoqifeng + * @date 2021/5/24 17:53 */ List selectAgencyGridSelfDaily(@Param("customerId") String customerId, @Param("dateId") String dateId); /** - * @return java.util.List * @param projectId + * @return java.util.List * @author yinzuomei * @description 根据项目id， 查询处理明细 * @Date 2021/5/27 12:58 @@ -321,8 +344,8 @@ public interface FactOriginProjectLogDailyDao extends BaseDao selectListByProjectId(String projectId); /** - * @return com.epmet.dto.extract.FactOriginProjectLogDailyDTO * @param projectId + * @return com.epmet.dto.extract.FactOriginProjectLogDailyDTO * @author yinzuomei * @description 查询某一个项目的结案操作明细 * @Date 2021/5/27 12:58 @@ -331,56 +354,67 @@ public interface FactOriginProjectLogDailyDao extends BaseDao + * @author zhaoqifeng + * @date 2021/7/5 17:00 */ List getProjectResponseCount(@Param("customerId") String customerId, @Param("dateId") String dateId); + /** * 项目响应增量 - * @author zhaoqifeng - * @date 2021/7/5 17:01 + * * @param customerId * @param dateId * @return java.util.List + * @author zhaoqifeng + * @date 2021/7/5 17:01 */ List getProjectResponseIncr(@Param("customerId") String customerId, @Param("dateId") String dateId); + /** * 项目吹哨数 - * @author zhaoqifeng - * @date 2021/7/5 17:01 + * * @param customerId * @param dateId * @return java.util.List + * @author zhaoqifeng + * @date 2021/7/5 17:01 */ List getProjectTransferCount(@Param("customerId") String customerId, @Param("dateId") String dateId); + /** * 项目吹哨数增量 - * @author zhaoqifeng - * @date 2021/7/5 17:01 + * * @param customerId * @param dateId * @return java.util.List + * @author zhaoqifeng + * @date 2021/7/5 17:01 */ List getProjectTransferIncr(@Param("customerId") String customerId, @Param("dateId") String dateId); + /** * 项目结案数 - * @author zhaoqifeng - * @date 2021/7/5 17:01 + * * @param customerId * @param dateId * @return java.util.List + * @author zhaoqifeng + * @date 2021/7/5 17:01 */ List getProjectClosedCount(@Param("customerId") String customerId, @Param("dateId") String dateId); + /** * 项目结案数增量 - * @author zhaoqifeng - * @date 2021/7/5 17:01 + * * @param customerId * @param dateId * @return java.util.List + * @author zhaoqifeng + * @date 2021/7/5 17:01 */ List getProjectClosedIncr(@Param("customerId") String customerId, @Param("dateId") String dateId); } 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 01ab059698..dad541fcfb 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 @@ -47,55 +47,59 @@ public interface FactOriginProjectMainDailyDao extends BaseDao + * @author zhaoqifeng + * @date 2020/9/17 14:32 */ List getProjectByCustomer(@Param("customerId") String customerId); /** * 获取未结案的项目 - * @author zhaoqifeng - * @date 2020/9/17 14:32 + * * @param customerId * @param projectId * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/17 14:32 */ - List getPendingList(@Param("customerId") String customerId, String projectId); + List getPendingList(@Param("customerId") String customerId, @Param("projectId") String projectId); /** * 项目超期数 - * @author zhaoqifeng - * @date 2020/9/18 16:28 + * * @param customerId * @param monthId * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/18 16:28 */ List selectOverdueCount(@Param("customerId") String customerId, @Param("monthId") String monthId); /** - * @Description 网格办结项目数 * @param gridIds * @param monthId * @param status + * @Description 网格办结项目数 * @author zxc * @date 2020/9/18 2:06 下午 */ - List selectGridClosedProject(@Param("gridIds") List gridIds,@Param("monthId") String monthId,@Param("status") String status); + List selectGridClosedProject(@Param("gridIds") List gridIds, @Param("monthId") String monthId, @Param("status") String status); - List selectTransferRightRatio(@Param("customerId")String customerId, @Param("monthId")String monthId); + List selectTransferRightRatio(@Param("customerId") String customerId, @Param("monthId") String monthId); /** * 根据日期删除数据 - * @author zhaoqifeng - * @date 2020/9/18 17:32 + * * @param customerId * @param date * @param projectId * @return void + * @author zhaoqifeng + * @date 2020/9/18 17:32 */ - void deleteByDate(@Param("customerId") String customerId, @Param("date") String date, String projectId); + void deleteByDate(@Param("customerId") String customerId, @Param("date") String date, @Param("projectId") String projectId); /** * @param customerId @@ -107,287 +111,294 @@ public interface FactOriginProjectMainDailyDao extends BaseDao selectShiftProjectCount(@Param("customerId") String customerId, @Param("monthId") String monthId); /** - * @return java.lang.Integer * @param customerId * @param monthId * @param topicIdList + * @return java.lang.Integer * @author yinzuomei * @description 9、自建群活跃度——议题转项目率 用 * @Date 2020/9/20 22:27 **/ - Integer selectCountByPartyUser(@Param("customerId") String customerId, @Param("monthId")String monthId, @Param("list")List topicIdList); + Integer selectCountByPartyUser(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("list") List topicIdList); /** - * @return java.lang.Integer * @param customerId * @param gridId * @param communityId - * @param closedStatus :resolved unresolved + * @param closedStatus :resolved unresolved * @param projectStatus :pending closed - * @param isParty 是否是党员 1:是 + * @param isParty 是否是党员 1:是 + * @return java.lang.Integer * @author yinzuomei * @description 具体某个网格或者社区内的项目 * @Date 2020/9/23 18:18 **/ - Integer getGridOrCommunityClosedProjectTotal(@Param("customerId")String customerId, - @Param("gridId") String gridId, - @Param("communityId") String communityId, - @Param("closedStatus") String closedStatus, - @Param("projectStatus") String projectStatus, - @Param("isParty")String isParty); + Integer getGridOrCommunityClosedProjectTotal(@Param("customerId") String customerId, + @Param("gridId") String gridId, + @Param("communityId") String communityId, + @Param("closedStatus") String closedStatus, + @Param("projectStatus") String projectStatus, + @Param("isParty") String isParty); /** - * @return int - * @param customerId - * @param agencyPath - * @param closedStatus :resolved unresolved + * @param customerId + * @param agencyPath + * @param closedStatus :resolved unresolved * @param projectStatus :pending closed - * @param isParty 是否是党员 1:是 - * @author yinzuomei - * @description 组织下：已解决项目 or 已结案项目总数 - * @Date 2020/9/24 17:38 - **/ + * @param isParty 是否是党员 1:是 + * @return int + * @author yinzuomei + * @description 组织下：已解决项目 or 已结案项目总数 + * @Date 2020/9/24 17:38 + **/ int getAgencyClosedProjectTotal(@Param("customerId") String customerId, - @Param("agencyPath")String agencyPath, - @Param("closedStatus")String closedStatus, + @Param("agencyPath") String agencyPath, + @Param("closedStatus") String closedStatus, @Param("projectStatus") String projectStatus, @Param("isParty") String isParty); /** * 组织自治项目数 - * @author zhaoqifeng - * @date 2020/9/25 15:16 + * * @param customerId * @param monthId * @param level * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/25 15:16 */ - List getSelfProject(@Param("customerId") String customerId, @Param("monthId")String monthId, + List getSelfProject(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("level") String level); /** * 组织自治项目数 - * @author zhaoqifeng - * @date 2020/9/25 15:16 + * * @param customerId * @param dateId * @param level * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/25 15:16 */ - List getSelfProjectDaily(@Param("customerId") String customerId, @Param("dateId")String dateId, - @Param("level") String level); + List getSelfProjectDaily(@Param("customerId") String customerId, @Param("dateId") String dateId, + @Param("level") String level); /** * 组织解决项目数 - * @author zhaoqifeng - * @date 2020/9/25 15:16 + * * @param customerId * @param monthId * @param level * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/25 15:16 */ - List getResolveProject(@Param("customerId") String customerId, @Param("monthId")String monthId, - @Param("level") String level); + List getResolveProject(@Param("customerId") String customerId, @Param("monthId") String monthId, + @Param("level") String level); /** * 组织解决项目数 - * @author zhaoqifeng - * @date 2020/9/25 15:16 + * * @param customerId * @param dateId * @param level * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/25 15:16 */ - List getResolveProjectDaily(@Param("customerId") String customerId, @Param("dateId")String dateId, - @Param("level") String level); + List getResolveProjectDaily(@Param("customerId") String customerId, @Param("dateId") String dateId, + @Param("level") String level); /** * 网格解决项目数 - * @author zhaoqifeng - * @date 2020/9/25 15:16 + * * @param customerId * @param monthId * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/25 15:16 */ - List getGridResolveProject(@Param("customerId") String customerId, @Param("monthId")String monthId); + List getGridResolveProject(@Param("customerId") String customerId, @Param("monthId") String monthId); /** * 网格解决项目数 - * @author zhaoqifeng - * @date 2020/9/25 15:16 + * * @param customerId * @param dateId * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/25 15:16 */ - List getGridResolveProjectDaily(@Param("customerId") String customerId, @Param("dateId")String dateId); + List getGridResolveProjectDaily(@Param("customerId") String customerId, @Param("dateId") String dateId); /** - * @Description 查询难点赌点的基本信息，要排除之前已经结案过的项目 * @param customerId - * @return java.util.List + * @Description 查询难点赌点的基本信息，要排除之前已经结案过的项目 * @author wangc * @date 2020.09.28 10:19 - */ - List selectDifficultyBaseInfo(@Param("customerId")String customerId,@Param("thresholdValue") Integer thresholdValue); + */ + List selectDifficultyBaseInfo(@Param("customerId") String customerId, @Param("thresholdValue") Integer thresholdValue); /** - * @Description 查询评价周期内新立的项目，是为了增量新增难点赌点的图片库 * @param customerId * @return java.util.List + * @Description 查询评价周期内新立的项目，是为了增量新增难点赌点的图片库 * @author wangc * @date 2020.09.28 11:15 - */ - List selectNewProject(@Param("customerId") String customerId, @Param("list")List list); + */ + List selectNewProject(@Param("customerId") String customerId, @Param("list") List list); /** * 网格解决项目数 - * @author zhaoqifeng - * @date 2020/9/25 15:16 + * * @param customerId * @param monthId * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/25 15:16 */ - List getGridProjectCount(@Param("customerId") String customerId, @Param("monthId")String monthId); + List getGridProjectCount(@Param("customerId") String customerId, @Param("monthId") String monthId); /** * 组织解决项目数 - * @author zhaoqifeng - * @date 2020/9/25 15:16 + * * @param customerId * @param monthId * @param level * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/25 15:16 */ - List getOrgProjectCount(@Param("customerId") String customerId, @Param("monthId")String monthId, - @Param("level") String level); + List getOrgProjectCount(@Param("customerId") String customerId, @Param("monthId") String monthId, + @Param("level") String level); /** - * @Description 查询项目总数 + * @Description 查询项目总数 * @Param customerId * @Param dateId * @author zxc * @date 2021/1/28 下午4:01 */ - List selectProjectTotal(@Param("customerId")String customerId, @Param("dateId")String dateId, @Param("monthId")String monthId); + List selectProjectTotal(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param("monthId") String monthId); /** - * @Description 组织查询项目总数 + * @Description 组织查询项目总数 * @Param orgIds * @Param dateId * @Param monthId * @author zxc * @date 2021/4/13 上午9:31 */ - List selectProjectTotalByOrg(@Param("orgIds")List orgIds, @Param("dateId")String dateId, @Param("monthId")String monthId); + List selectProjectTotalByOrg(@Param("orgIds") List orgIds, @Param("dateId") String dateId, @Param("monthId") String monthId); /** - * @Description 查询已解决项目数 + * @Description 查询已解决项目数 * @Param customerId * @Param dateId * @author zxc * @date 2021/1/28 下午4:15 */ - List selectResolvedNum(@Param("customerId")String customerId, @Param("dateId")String dateId); + List selectResolvedNum(@Param("customerId") String customerId, @Param("dateId") String dateId); /** - * @Description 组织查询已解决项目数 + * @Description 组织查询已解决项目数 * @Param orgIds * @Param dateId * @author zxc * @date 2021/4/13 上午9:41 */ - List selectResolvedNumByOrg(@Param("orgIds")List orgIds, @Param("dateId")String dateId); + List selectResolvedNumByOrg(@Param("orgIds") List orgIds, @Param("dateId") String dateId); /** - * @Description 查询 满意度评价次数 + * @Description 查询 满意度评价次数 * @Param customerId * @Param dateId * @author zxc * @date 2021/1/29 上午9:10 */ - List selectEvaluateCount(@Param("customerId")String customerId, @Param("dateId")String dateId, @Param("activeCodes") List activeCodes); + List selectEvaluateCount(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param("activeCodes") List activeCodes); /** - * @Description 组织 查询 满意度评价次数 + * @Description 组织 查询 满意度评价次数 * @Param orgIds * @Param dateId * @Param activeCodes * @author zxc * @date 2021/4/13 上午9:56 */ - List selectEvaluateCountByOrg(@Param("orgIds")List orgIds, @Param("dateId")String dateId, @Param("activeCodes")List activeCodes); + List selectEvaluateCountByOrg(@Param("orgIds") List orgIds, @Param("dateId") String dateId, @Param("activeCodes") List activeCodes); /** - * @Description 查询本月新增项目数 + * @Description 查询本月新增项目数 * @Param customerId * @Param monthId * @author zxc * @date 2021/1/29 下午2:31 */ - List selectProjectIncr(@Param("customerId")String customerId, @Param("monthId")String monthId); + List selectProjectIncr(@Param("customerId") String customerId, @Param("monthId") String monthId); /** - * @Description 组织查询本月新增项目数 + * @Description 组织查询本月新增项目数 * @Param orgIds * @Param monthId * @author zxc * @date 2021/4/16 上午9:21 */ - List selectProjectIncrByOrg(@Param("orgIds") List orgIds, @Param("monthId")String monthId); + List selectProjectIncrByOrg(@Param("orgIds") List orgIds, @Param("monthId") String monthId); /** - * @Description 根据状态查询项目数 + * @Description 根据状态查询项目数 * @Param customerId * @Param monthId * @Param status * @author zxc * @date 2021/1/29 下午3:25 */ - List selectProjectCount(@Param("customerId")String customerId, @Param("monthId")String monthId, @Param("status") String status); + List selectProjectCount(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("status") String status); /** - * @Description 组织根据状态查询项目数 + * @Description 组织根据状态查询项目数 * @Param orgIds * @Param monthId * @Param status * @author zxc * @date 2021/4/16 上午9:26 */ - List selectProjectCountByOrg(@Param("orgIds") List orgIds, @Param("monthId")String monthId, @Param("status") String status); + List selectProjectCountByOrg(@Param("orgIds") List orgIds, @Param("monthId") String monthId, @Param("status") String status); /** - * @Description 本月新增结案项目数 + * @Description 本月新增结案项目数 * @Param customerId * @Param monthId * @author zxc * @date 2021/2/1 上午9:25 */ - List selectClosedIncr(@Param("customerId")String customerId, @Param("monthId")String monthId); + List selectClosedIncr(@Param("customerId") String customerId, @Param("monthId") String monthId); /** - * @Description 组织本月新增结案项目数 + * @Description 组织本月新增结案项目数 * @Param orgIds * @Param monthId * @author zxc * @date 2021/4/16 上午9:35 */ - List selectClosedIncrByOrg(@Param("orgIds") List orgIds, @Param("monthId")String monthId); + List selectClosedIncrByOrg(@Param("orgIds") List orgIds, @Param("monthId") String monthId); /** + * @param customerId + * @param dateId + * @return java.util.List * @Description 初始化screen_project_data数据 * 如果是dateId不为空，则查询前一天的数据 * 否则全查（适用于首次初始化的场景） - * + *

* 这是只查询指定天新增的项目，对于需要更新状态的项目，对历史数据（流转中的项目）进行遍历查询 - * @param customerId - * @param dateId - * @return java.util.List * @author wangc * @date 2021.03.04 22:56 - */ - List initNewScreenProjectData(@Param("customerId")String customerId,@Param("dateId") String dateId,@Param("dataEndTime")String dataEndTime, @Param("projectId") String projectId); + */ + List initNewScreenProjectData(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param("dataEndTime") String dataEndTime, @Param("projectId") String projectId); /** * desc: 获取难点堵点项目数据 @@ -416,41 +427,45 @@ public interface FactOriginProjectMainDailyDao extends BaseDao + * @author zhaoqifeng + * @date 2021/5/17 15:02 */ List selectPartyMemberProjectStaticByAgency(@Param("customerId") String customerId, @Param("dateId") String dateId); /** * 获取组织级别党员发布话题转项目统计 - * @author zhaoqifeng - * @date 2021/5/17 15:03 + * * @param customerId * @param dateId * @return java.util.List + * @author zhaoqifeng + * @date 2021/5/17 15:03 */ List selectPartyMemberProjectStaticByGrid(@Param("customerId") String customerId, @Param("dateId") String dateId); /** * 获取组织级别党员发布话题结案统计 - * @author zhaoqifeng - * @date 2021/5/17 15:02 + * * @param customerId * @param dateId * @return java.util.List + * @author zhaoqifeng + * @date 2021/5/17 15:02 */ List selectPartyMemberClosedProjectStaticByAgency(@Param("customerId") String customerId, @Param("dateId") String dateId); /** * 获取组织级别党员发布话题结案统计 - * @author zhaoqifeng - * @date 2021/5/17 15:03 + * * @param customerId * @param dateId * @return java.util.List + * @author zhaoqifeng + * @date 2021/5/17 15:03 */ List selectPartyMemberClosedProjectStaticByGrid(@Param("customerId") String customerId, @Param("dateId") String dateId); @@ -467,69 +482,73 @@ public interface FactOriginProjectMainDailyDao extends BaseDao selectGroupByGrid(@Param("customerId")String customerId, - @Param("gridIds")List gridIds, - @Param("projectStatus")String projectStatus, - @Param("origin")String origin, - @Param("isResolved")String isResolved); + List selectGroupByGrid(@Param("customerId") String customerId, + @Param("gridIds") List gridIds, + @Param("projectStatus") String projectStatus, + @Param("origin") String origin, + @Param("isResolved") String isResolved); /** * 获取组织已结案项目 - * @author zhaoqifeng - * @date 2021/5/26 15:11 + * * @param customerId * @param dateId * @param closedStatus * @return java.util.List + * @author zhaoqifeng + * @date 2021/5/26 15:11 */ List selectAgencyClosedProjectCount(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param( "closedStatus") String closedStatus, @Param("origin") String origin); /** * 组织结案项目统计 - * @author zhaoqifeng - * @date 2021/5/27 14:51 + * * @param customerId * @param dateId * @return java.util.List + * @author zhaoqifeng + * @date 2021/5/27 14:51 */ List selectAgencyClosedProjectStaticDaily(@Param("customerId") String customerId, @Param("dateId") String dateId); /** * 当前网格内已结案的项目 * - * @author zhaoqifeng - * @date 2021/5/26 15:09 * @param customerId * @param gridId * @param projectStatus 状态:待处理 pending，结案closed - * @param origin 项目来源 来源：议题issue 组织agency - * @param isResolved unresolved,resolved + * @param origin 项目来源 来源：议题issue 组织agency + * @param isResolved unresolved,resolved * @return com.epmet.entity.evaluationindex.extract.GovernProjectInfoDTO + * @author zhaoqifeng + * @date 2021/5/26 15:09 */ - List getGridClosedProjectList(@Param("customerId")String customerId, + List getGridClosedProjectList(@Param("customerId") String customerId, @Param("gridId") String gridId, - @Param("projectStatus")String projectStatus, + @Param("projectStatus") String projectStatus, @Param("origin") String origin, - @Param("isResolved")String isResolved); + @Param("isResolved") String isResolved); /** * 获取项目立项数 - * @author zhaoqifeng - * @date 2021/7/5 14:49 + * * @param customerId * @param dateId * @return java.util.List + * @author zhaoqifeng + * @date 2021/7/5 14:49 */ - List getMemberProjectCountIncr(@Param("customerId")String customerId, @Param("dateId") String dateId); + List getMemberProjectCountIncr(@Param("customerId") String customerId, @Param("dateId") String dateId); /** * 获取项目立项数 - * @author zhaoqifeng - * @date 2021/7/5 14:49 + * * @param customerId * @param dateId * @return java.util.List + * @author zhaoqifeng + * @date 2021/7/5 14:49 */ - List getMemberProjectCount(@Param("customerId")String customerId, @Param("dateId") String dateId); + List getMemberProjectCount(@Param("customerId") String customerId, @Param("dateId") String dateId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java index 66e0bb895c..f090c31a71 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java @@ -99,7 +99,7 @@ public interface ProjectDao extends BaseDao { * @author zhaoqifeng * @date 2020/9/15 16:13 */ - List selectProjectInfo(@Param("customerId") String customerId, @Param("date") String date, String projectId); + List selectProjectInfo(@Param("customerId") String customerId, @Param("date") String date, @Param("projectId") String projectId); /** * 获取用户可滞留天数 @@ -140,7 +140,8 @@ public interface ProjectDao extends BaseDao { List getProjectCategoryData(@Param("customerId") String customerId, @Param("dateId") String dateId); - List selectProjectCategoryData(@Param("customerId") String customerId, @Param("dateId") String dateId); + List selectProjectCategoryData(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param("projectId") String projectId); + /** * 获取项目满意度 * @@ -150,7 +151,7 @@ public interface ProjectDao extends BaseDao { * @author zhaoqifeng * @date 2021/5/21 10:06 */ - List selectProjectSatisfaction(@Param("customerId") String customerId, String projectId); + List selectProjectSatisfaction(@Param("customerId") String customerId, @Param("projectId") String projectId); /** * 根据key查找value @@ -172,8 +173,8 @@ public interface ProjectDao extends BaseDao { * @param projectId * @return 得分 */ - BigDecimal selectProjectSatisfactionScore(@Param("customerId")String customerId, - @Param("projectId")String projectId); + BigDecimal selectProjectSatisfactionScore(@Param("customerId") String customerId, + @Param("projectId") String projectId); /** * 查询当天（dateId）有评价记录的项目id @@ -182,7 +183,7 @@ public interface ProjectDao extends BaseDao { * @param dateId * @return */ - List selectEvaluateProjectIds(@Param("customerId") String customerId, @Param("dateId")String dateId); + List selectEvaluateProjectIds(@Param("customerId") String customerId, @Param("dateId") String dateId); /** * 可根据状态筛选项目id @@ -191,14 +192,15 @@ public interface ProjectDao extends BaseDao { * @param projectStatus 状态:待处理 pending，结案closed * @return */ - List selectClosedProjectIds(@Param("customerId")String customerId, - @Param("origin")String origin, - @Param("projectStatus")String projectStatus); + List selectClosedProjectIds(@Param("customerId") String customerId, + @Param("origin") String origin, + @Param("projectStatus") String projectStatus); /** * 获取已转项目事件事件 + * * @param customerId * @return */ - List getEventList(@Param("customerId")String customerId); + List getEventList(@Param("customerId") String customerId); } 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 2c46c7d883..559e02070a 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 @@ -46,144 +46,152 @@ public interface ProjectProcessDao extends BaseDao { /** * @param projectEntity * @Author sun - * @Description 查询客户项目处理进展表中是创建项目和结案两种进展的有效数据(创建日期截取yyyy-mm-dd格式字段值) + * @Description 查询客户项目处理进展表中是创建项目和结案两种进展的有效数据(创建日期截取yyyy - mm - dd格式字段值) **/ List selectProcessList(ProjectEntity projectEntity); /** * 根据客户查询项目处理进展 - * @author zhaoqifeng - * @date 2020/9/16 15:18 + * * @param customerId * @param date * @param projectId * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/16 15:18 */ - List selectProcessListByCustomer(@Param("customerId") String customerId, @Param("date") String date, String projectId); + List selectProcessListByCustomer(@Param("customerId") String customerId, @Param("date") String date, @Param("projectId") String projectId); /** * 根据客户查询响应节点 - * @author zhaoqifeng - * @date 2020/9/16 15:18 + * * @param customerId * @param date * @param projectId * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/16 15:18 */ - List selectResponseProcessList(@Param("customerId") String customerId, @Param("date") String date, String projectId); + List selectResponseProcessList(@Param("customerId") String customerId, @Param("date") String date, @Param("projectId") String projectId); /** * 查询各个节点的受理人 - * @author zhaoqifeng - * @date 2020/9/17 10:54 + * * @param customerId * @param date * @param projectId * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/17 10:54 */ - List selectProcessStaffByCustomer(@Param("customerId") String customerId, @Param("date") String date, String projectId); + List selectProcessStaffByCustomer(@Param("customerId") String customerId, @Param("date") String date, @Param("projectId") String projectId); /** * 获取满意度评价记录 - * @author zhaoqifeng - * @date 2020/9/17 14:44 + * * @param customerId * @param date * @param projectId * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/17 14:44 */ - List selectSatisfactionRecordByCustomer(@Param("customerId") String customerId, @Param("date") String date, String projectId); + List selectSatisfactionRecordByCustomer(@Param("customerId") String customerId, @Param("date") String date, @Param("projectId") String projectId); /** * 获取已结案的项目列表 - * @author zhaoqifeng - * @date 2020/9/17 14:44 + * * @param customerId * @param date * @param projectId * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/17 14:44 */ - List selectClosedProjectList(@Param("customerId") String customerId, @Param("date") String date, String projectId); + List selectClosedProjectList(@Param("customerId") String customerId, @Param("date") String date, @Param("projectId") String projectId); + /** - * @Description 查询项目-机关各个节点历时详情 * @param customerId - * @param projectStatus 项目状态 pending closed 如果是null则全查 + * @param projectStatus 项目状态 pending closed 如果是null则全查 * @param dateId * @return + * @Description 查询项目-机关各个节点历时详情 * @author wangc * @date 2020.09.17 09:43 - **/ - List selectProjectOrgPeriod(@Param("customerId") String customerId,@Param("projectStatus")String projectStatus,@Param("dateId") String dateId); + **/ + List selectProjectOrgPeriod(@Param("customerId") String customerId, @Param("projectStatus") String projectStatus, @Param("dateId") String dateId); /** - * @Description 根据项目业务改造，在数据抽取时，直接查询出项目节点的耗时 * @param * @return java.util.List + * @Description 根据项目业务改造，在数据抽取时，直接查询出项目节点的耗时 * @author wangc * @date 2020.10.23 11:13 - */ - List selectProjectOrgPeriodDirectly(@Param("customerId") String customerId,@Param("projectStatus")String projectStatus,@Param("dateId") String dateId); + */ + List selectProjectOrgPeriodDirectly(@Param("customerId") String customerId, @Param("projectId") String projectId); /** - * @Description 查询项目-机关各个节点的响应列表 * @param projects * @return + * @Description 查询项目-机关各个节点的响应列表 * @author wangc * @date 2020.09.17 17:56 - **/ + **/ List selectResponseTrace(@Param("projects") List projects); /** - * @Description 查询项目的节点 * @param projects * @return java.util.List + * @Description 查询项目的节点 * @author wangc * @date 2020.10.23 17:02 - */ + */ List selectProjectProcess(@Param("projects") List projects); /** * 获取办结组织 - * @author zhaoqifeng - * @date 2020/9/18 18:01 + * * @param customerId * @param date * @param projectId * @return java.util.List + * @author zhaoqifeng + * @date 2020/9/18 18:01 */ - List selectFinishOrg(@Param("customerId") String customerId, @Param("date") String date, String projectId); + List selectFinishOrg(@Param("customerId") String customerId, @Param("date") String date, @Param("projectId") String projectId); /** - * @Description 查找项目最近一次操作说明 * @param list * @return java.util.List + * @Description 查找项目最近一次操作说明 * @author wangc * @date 2020.09.28 14:45 - */ - List selectLatestOperation(@Param("list") List list,@Param("customerId") String customerId); + */ + List selectLatestOperation(@Param("list") List list, @Param("customerId") String customerId); /** - * @Description 查找指定日期结案的项目 * @param customerId * @param dateId * @return java.util.List + * @Description 查找指定日期结案的项目 * @author wangc * @date 2021.03.09 10:49 - */ + */ List selectClosedProjectOnAppointedDay(@Param("customerId") String customerId, @Param("dateId") String dateId); - List selectClosedProjectByProjectIds(@Param("list")List list); + List selectClosedProjectByProjectIds(@Param("list") List list); + /** - * @Description 统计新增项目节点以及被流转到的指向部门 * @param customerId * @param dateId * @param dataEndTime * @return java.util.List + * @Description 统计新增项目节点以及被流转到的指向部门 * @author wangc * @date 2021.03.09 16:25 - */ + */ List selectProjectProcessAndDirection(@Param("customerId") String customerId, @Param("dateId") String dateId, - @Param("dataEndTime")String dataEndTime, @Param("projectId") String projectId ); + @Param("dataEndTime") String dataEndTime, @Param("projectId") String projectId); - List selectProcessAttachment(@Param("list")List list); + List selectProcessAttachment(@Param("list") List list); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java index 28a57a5b3c..845fac75c6 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java @@ -24,7 +24,6 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.constant.DataSourceConstant; import com.epmet.constant.PingYinConstant; -import com.epmet.constant.PingYinConstants; import com.epmet.dao.evaluationindex.extract.FactOriginProjectCategoryDailyDao; import com.epmet.dto.ProjectCategoryDTO; import com.epmet.dto.extract.form.ExtractOriginFormDTO; @@ -70,6 +69,7 @@ public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl entities = new ArrayList<>(); Integer count = baseDao.selectCount(new QueryWrapper().eq("customer_id",customerId)); //如果count = 0 初始化该customer所有数据 @@ -78,7 +78,7 @@ public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl projectCategoryData = projectService.getProjectCategoryData(customerId, dateString); - List projectCategoryData = projectService.queryProjectCategoryData(customerId, dateString); + List projectCategoryData = projectService.queryProjectCategoryData(customerId, dateString, projectId); HashSet projectIdSet=new HashSet<>(); if (!CollectionUtils.isEmpty(projectCategoryData)){ projectCategoryData.forEach(data->{ @@ -103,13 +103,13 @@ public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl projectIdList = new ArrayList(projectIdSet); - List> partionList= ListUtils.partition(projectIdList, 100); + List> partionList= ListUtils.partition(projectIdList, NumConstant.ONE_HUNDRED); partionList.forEach(list->{ baseDao.deleteByProjectIds(list); }); } //2、先删除后增 - delAndInsert(customerId,dateString,entities); + delAndInsert(customerId,dateString,entities,projectId); } } } @@ -119,13 +119,14 @@ public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl result){ - baseDao.deleteOldData(customerId, dateId); + public void delAndInsert(String customerId, String dateId, List result, String projectId){ + baseDao.deleteOldData(customerId, dateId, projectId); insertBatch(result); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java index 14e5748e31..3c860e4d37 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java @@ -433,7 +433,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService { @Override public void extractProjectPeriodData(ExtractOriginFormDTO param) { List extractData = - projectProcessService.getProjectPeriodDirectly(param.getCustomerId(), param.getDateId()); + projectProcessService.getProjectPeriodDirectly(param.getCustomerId(), param.getObjectId()); List formattingData = new LinkedList<>(); extractData.forEach(original -> { FactOriginProjectOrgPeriodDailyEntity dest @@ -474,7 +474,9 @@ public class ProjectExtractServiceImpl implements ProjectExtractService { formattingData.add(dest); }); if (!CollectionUtils.isEmpty(formattingData)) { - factOriginProjectOrgPeriodDailyDao.deleteByProjectIds(null, param.getCustomerId()); + List projectList = new ArrayList<>(); + projectList.add(param.getObjectId()); + factOriginProjectOrgPeriodDailyDao.deleteByProjectIds(projectList, param.getCustomerId()); Lists.partition(formattingData, NumConstant.ONE_HUNDRED) .forEach(part -> factOriginProjectOrgPeriodDailyDao.insertBatch(part)); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java index 37e18e3332..7dd28b1519 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java @@ -106,12 +106,12 @@ public interface ProjectProcessService extends BaseService /** * @Description 直接从项目业务改造获取项目节点耗时信息 * @param customerId - * @param date + * @param projectId * @return java.util.List * @author wangc * @date 2020.10.23 09:10 */ - List getProjectPeriodDirectly(String customerId, String date); + List getProjectPeriodDirectly(String customerId, String projectId); /** * 获取办结组织 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java index 0c1810df1c..6b844a3481 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java @@ -156,7 +156,7 @@ public interface ProjectService extends BaseService { */ List getProjectCategoryData(String customerId, String dateId); - List queryProjectCategoryData(String customerId, String dateId); + List queryProjectCategoryData(String customerId, String dateId, String projectId); /** * 获取项目满意度 * @author zhaoqifeng diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java index 26410d073c..6844c930e9 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java @@ -96,13 +96,14 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl * @author wangc * @date 2020.10.23 09:10 */ @Override - public List getProjectPeriodDirectly( String customerId, String date) { - return baseDao.selectProjectOrgPeriodDirectly(customerId,null,null); + public List getProjectPeriodDirectly(String customerId, String projectId) { + return baseDao.selectProjectOrgPeriodDirectly(customerId, projectId); } @Override diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java index dd03758d43..990480fa2c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java @@ -162,8 +162,8 @@ public class ProjectServiceImpl extends BaseServiceImpl queryProjectCategoryData(String customerId, String dateId) { - return baseDao.selectProjectCategoryData(customerId,dateId); + public List queryProjectCategoryData(String customerId, String dateId, String projectId) { + return baseDao.selectProjectCategoryData(customerId,dateId,projectId); } /** * 获取项目满意度 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml index e0cfcc7fe7..d2fa192b64 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml @@ -9,6 +9,9 @@ fact_origin_project_category_daily WHERE CUSTOMER_ID = #{customerId} + + AND PROJECT_ID = #{projectId} + AND DATE_FORMAT(CREATED_TIME,'%Y%m%d') = #{dateId} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml index b882cef8c0..715b37f605 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml @@ -161,6 +161,9 @@ from `project_category` pc where pc.del_flag = '0' + + AND pc.PROJECT_ID = #{projectId} + and pc.customer_id = #{customerId} AND DATE_FORMAT(pc.CREATED_TIME,'%Y%m%d')=#{dateId} 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 fca822c242..9f8b72f16e 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 @@ -179,6 +179,9 @@ INNER JOIN PROJECT_ORG_RELATION relation ON staff.ID = relation.PROJECT_STAFF_ID AND relation.DEL_FLAG = '0' WHERE staff.DEL_FLAG = '0' + + AND staff.PROJECT_ID = #{projectId} + AND staff.CUSTOMER_ID = #{customerId}