luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

实时抽取项目数据部分 添加 objectid有针对性的处理数据 extractProjectPeriodData,extractProjectCategory部分修改完毕

master
jianjun 4 years ago
parent
876c967e07
commit
859e283bf8
14 changed files with 386 additions and 310 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java
  2. 254
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
  3. 279
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
  4. 22
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java
  5. 88
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java
  6. 13
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java
  7. 6
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
  8. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java
  9. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
  10. 5
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java
  11. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
  12. 3
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml
  13. 3
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
  14. 3
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml

10
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java
View File

@ -34,7 +34,7 @@ import java.util.List;
@Mapper
public interface FactOriginProjectCategoryDailyDao extends BaseDao<FactOriginProjectCategoryDailyEntity> {
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<FactOriginPro
* @description 计算当前客户下，各个网格内，各项目分类下项目数量
* @Date 2021/3/23 9:58
**/
List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryGridDailyDTO(@Param("customerId") String customerId,@Param("subCount")Integer subCount,@Param("projectType")String projectType);
List<ScreenProjectCategoryGridDailyDTO> 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<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(@Param("orgIds")List<String> orgIds,@Param("customerId") String customerId,
@Param("subCount") Integer subCount,@Param("projectType")String projectType);
List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(@Param("orgIds") List<String> orgIds, @Param("customerId") String customerId,
@Param("subCount") Integer subCount, @Param("projectType") String projectType);
int deleteByProjectIds(@Param("list") List<String> list);
}

254
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
View File

@ -36,96 +36,101 @@ import java.util.List;
public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectLogDailyEntity> {
/**
* 机关被吹哨次数
* @author zhaoqifeng
* @date 2020/9/18 14:46
*
* @param customerId
* @param monthId
* @param level
* @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/18 14:46
*/
List<OrgStatisticsResultDTO> 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<NotReturnProjectResultDTO> 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<NotReturnProjectResultDTO> selectNotReturnProject(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("actionCode") String actionCode, @Param("orgType") String orgType);
List<TransferRightRatioResultDTO> selectNotReturn(@Param("customerId")String customerId,@Param("monthId")String monthId);
List<TransferRightRatioResultDTO> selectNotReturn(@Param("customerId") String customerId, @Param("monthId") String monthId);
/**
* @Description 查询项目评价信息
* @param customerId
* @param monthId
* @author zxc
* @date 2020/9/18 3:28 下午
*/
List<ProjectEvaluateResultDTO> selectProjectEvaluate(@Param("customerId") String customerId,@Param("monthId") String monthId);
* @param customerId
* @param monthId
* @Description 查询项目评价信息
* @author zxc
* @date 2020/9/18 3:28 下午
*/
List<ProjectEvaluateResultDTO> selectProjectEvaluate(@Param("customerId") String customerId, @Param("monthId") String monthId);
/**
* @Description 网格项目自治率查询
* @param customerId
* @param monthId
* @author zxc
* @date 2020/9/18 5:25 下午
*/
List<AutoNoMyResultDTO> selectProjectAutoNoMy(@Param("customerId") String customerId,@Param("monthId") String monthId);
/**
* @Description 网格项目自治率查询 最新版
* @Param customerId
* @Param monthId
* @author zxc
* @date 2021/4/12 上午10:46
*/
List<AutoNoMyResultDTO> selectProjectAutoNoMyPlus(@Param("customerId") String customerId,@Param("monthId") String monthId);
* @param customerId
* @param monthId
* @Description 网格项目自治率查询
* @author zxc
* @date 2020/9/18 5:25 下午
*/
List<AutoNoMyResultDTO> selectProjectAutoNoMy(@Param("customerId") String customerId, @Param("monthId") String monthId);
/**
* @Description 网格项目自治率查询 最新版
* @Param customerId
* @Param monthId
* @author zxc
* @date 2021/4/12 上午10:46
*/
List<AutoNoMyResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
*/
* 办结项目满意度
*
* @param customerId
* @param monthId
* @param level
* @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/20 16:44
*/
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/18 14:46
*/
List<OrgStatisticsResultDTO> 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<ProjectParticipatedAgencyResultDTO> selectProjectParticipatedAgency(@Param("agencies") List<String> agencies, @Param("customerId") String customerId,@Param("dimId") String dimId);
**/
List<ProjectParticipatedAgencyResultDTO> selectProjectParticipatedAgency(@Param("agencies") List<String> agencies, @Param("customerId") String customerId, @Param("dimId") String dimId);
/***
* @Description 评价周期内被吹哨项目数
@ -135,8 +140,9 @@ public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectL
* @return java.util.List<com.epmet.dto.extract.result.ProjectParticipatedAgencyResultDTO>
* @author wangc
* @date 2020.10.15 11:20
*/
List<ProjectParticipatedAgencyResultDTO> selectAgencyWhistledCount(@Param("agencies") List<String> agencies, @Param("customerId") String customerId,@Param("dimId") String dimId);
*/
List<ProjectParticipatedAgencyResultDTO> selectAgencyWhistledCount(@Param("agencies") List<String> agencies, @Param("customerId") String customerId, @Param("dimId") String dimId);
/***
* @Description 评价周期内被吹哨且被办结(无论是哪一级办结)的项目数
* @param agencies
@ -145,175 +151,192 @@ public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectL
* @return java.util.List<com.epmet.dto.extract.result.ProjectParticipatedAgencyResultDTO>
* @author wangc
* @date 2020.10.16 10:43
*/
List<ProjectParticipatedAgencyResultDTO> selectWhistledAgencyClosedProjectCount(@Param("agencies") List<String> agencies, @Param("customerId") String customerId,@Param("dimId") String dimId);
*/
List<ProjectParticipatedAgencyResultDTO> selectWhistledAgencyClosedProjectCount(@Param("agencies") List<String> agencies, @Param("customerId") String customerId, @Param("dimId") String dimId);
/***
* @Description 查询机关办结次数
* @param agencies
* @return java.util.List<com.epmet.dto.extract.result.ProjectParticipatedAgencyResultDTO>
* @author wangc
* @date 2020.10.14 10:27
*/
List<ProjectParticipatedAgencyResultDTO> selectAgencyHandledProjectCount(@Param("agencies") List<String> agencies,@Param("customerId") String customerId,@Param("dimId") String dimId);
*/
List<ProjectParticipatedAgencyResultDTO> selectAgencyHandledProjectCount(@Param("agencies") List<String> agencies, @Param("customerId") String customerId, @Param("dimId") String dimId);
/**
* @Description 查询评价周期内各级别机关办结的项目Id
* @param customerId
* @param dimId
* @return java.util.List<com.epmet.dto.extract.result.ProjectParticipatedAgencyResultDTO>
* @Description 查询评价周期内各级别机关办结的项目Id
* @author wangc
* @date 2020.10.15 17:29
*/
List<ProjectParticipatedAgencyResultDTO> selectProjectIdHandledByAgency(@Param("customerId") String customerId,@Param("dimId") String dimId);
*/
List<ProjectParticipatedAgencyResultDTO> selectProjectIdHandledByAgency(@Param("customerId") String customerId, @Param("dimId") String dimId);
/**
* @Description 计算每个办结项目的总耗时
* @param projectIds
* @return java.util.List<com.epmet.dto.extract.result.ProjectParticipatedAgencyResultDTO>
* @Description 计算每个办结项目的总耗时
* @author wangc
* @date 2020.10.15 17:32
*/
*/
List<ProjectParticipatedAgencyResultDTO> selectProjectCostTime(@Param("projectIds") List<String> projectIds);
/**
* 网格项目响应度
* @author zhaoqifeng
* @date 2020/9/25 10:01
*
* @param customerId
* @param monthId
* @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/25 10:01
*/
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/25 10:01
*/
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/25 10:01
*/
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/25 10:01
*/
List<OrgStatisticsResultDTO> selectOrgResponse(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("level")String level);
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/27 15:52
*/
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/27 15:52
*/
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/27 15:52
*/
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/27 15:52
*/
List<OrgStatisticsResultDTO> selectOrgSatisfactionDaily(@Param("customerId") String customerId, @Param("level")String level, @Param("dateId") String dateId);
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/10/16 17:09
*/
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/20 16:44
*/
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/20 16:44
*/
List<OrgStatisticsResultDTO> selectGridClosed(@Param("customerId") String customerId, @Param("monthId") String monthId);
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2021/5/24 17:53
*/
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2021/5/24 17:53
*/
List<OrgStatisticsResultDTO> selectAgencyGridSelfDaily(@Param("customerId") String customerId, @Param("dateId") String dateId);
/**
* @return java.util.List<com.epmet.dto.extract.FactOriginProjectLogDailyDTO>
* @param projectId
* @return java.util.List<com.epmet.dto.extract.FactOriginProjectLogDailyDTO>
* @author yinzuomei
* @description 根据项目id， 查询处理明细
* @Date 2021/5/27 12:58
@ -321,8 +344,8 @@ public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectL
List<FactOriginProjectLogDailyDTO> 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<FactOriginProjectL
/**
* 项目响应数
* @author zhaoqifeng
* @date 2021/7/5 17:00
*
* @param customerId
* @param dateId
* @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2021/7/5 17:00
*/
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2021/7/5 17:01
*/
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2021/7/5 17:01
*/
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2021/7/5 17:01
*/
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2021/7/5 17:01
*/
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2021/7/5 17:01
*/
List<OrgStatisticsResultDTO> getProjectClosedIncr(@Param("customerId") String customerId, @Param("dateId") String dateId);
}

279
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
View File

@ -47,55 +47,59 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
/**
* 获取客户下项目
* @author zhaoqifeng
* @date 2020/9/17 14:32
*
* @param customerId
* @return java.util.List<com.epmet.dto.extract.FactOriginProjectMainDailyDTO>
* @author zhaoqifeng
* @date 2020/9/17 14:32
*/
List<FactOriginProjectMainDailyDTO> getProjectByCustomer(@Param("customerId") String customerId);
/**
* 获取未结案的项目
* @author zhaoqifeng
* @date 2020/9/17 14:32
*
* @param customerId
* @param projectId
* @return java.util.List<com.epmet.dto.extract.FactOriginProjectMainDailyDTO>
* @author zhaoqifeng
* @date 2020/9/17 14:32
*/
List<FactOriginProjectMainDailyDTO> getPendingList(@Param("customerId") String customerId, String projectId);
List<FactOriginProjectMainDailyDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/18 16:28
*/
List<OrgStatisticsResultDTO> 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<GridProjectClosedTotalResultDTO> selectGridClosedProject(@Param("gridIds") List<String> gridIds,@Param("monthId") String monthId,@Param("status") String status);
List<GridProjectClosedTotalResultDTO> selectGridClosedProject(@Param("gridIds") List<String> gridIds, @Param("monthId") String monthId, @Param("status") String status);
List<TransferRightRatioResultDTO> selectTransferRightRatio(@Param("customerId")String customerId, @Param("monthId")String monthId);
List<TransferRightRatioResultDTO> 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<FactOriginProject
List<CpcIndexCommonDTO> 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<String> topicIdList);
Integer selectCountByPartyUser(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("list") List<String> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/25 15:16
*/
List<OrgStatisticsResultDTO> getSelfProject(@Param("customerId") String customerId, @Param("monthId")String monthId,
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/25 15:16
*/
List<OrgStatisticsResultDTO> getSelfProjectDaily(@Param("customerId") String customerId, @Param("dateId")String dateId,
@Param("level") String level);
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/25 15:16
*/
List<OrgStatisticsResultDTO> getResolveProject(@Param("customerId") String customerId, @Param("monthId")String monthId,
@Param("level") String level);
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/25 15:16
*/
List<OrgStatisticsResultDTO> getResolveProjectDaily(@Param("customerId") String customerId, @Param("dateId")String dateId,
@Param("level") String level);
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/25 15:16
*/
List<OrgStatisticsResultDTO> getGridResolveProject(@Param("customerId") String customerId, @Param("monthId")String monthId);
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/25 15:16
*/
List<OrgStatisticsResultDTO> getGridResolveProjectDaily(@Param("customerId") String customerId, @Param("dateId")String dateId);
List<OrgStatisticsResultDTO> getGridResolveProjectDaily(@Param("customerId") String customerId, @Param("dateId") String dateId);
/**
* @Description 查询难点赌点的基本信息，要排除之前已经结案过的项目
* @param customerId
* @return java.util.List<com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity>
* @Description 查询难点赌点的基本信息，要排除之前已经结案过的项目
* @author wangc
* @date 2020.09.28 10:19
*/
List<ScreenDifficultyDataEntity> selectDifficultyBaseInfo(@Param("customerId")String customerId,@Param("thresholdValue") Integer thresholdValue);
*/
List<ScreenDifficultyDataEntity> selectDifficultyBaseInfo(@Param("customerId") String customerId, @Param("thresholdValue") Integer thresholdValue);
/**
* @Description 查询评价周期内新立的项目，是为了增量新增难点赌点的图片库
* @param customerId
* @return java.util.List<java.lang.String>
* @Description 查询评价周期内新立的项目，是为了增量新增难点赌点的图片库
* @author wangc
* @date 2020.09.28 11:15
*/
List<ProjectSourceMapFormDTO > selectNewProject(@Param("customerId") String customerId, @Param("list")List<String> list);
*/
List<ProjectSourceMapFormDTO> selectNewProject(@Param("customerId") String customerId, @Param("list") List<String> list);
/**
* 网格解决项目数
* @author zhaoqifeng
* @date 2020/9/25 15:16
*
* @param customerId
* @param monthId
* @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/25 15:16
*/
List<OrgStatisticsResultDTO> getGridProjectCount(@Param("customerId") String customerId, @Param("monthId")String monthId);
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2020/9/25 15:16
*/
List<OrgStatisticsResultDTO> getOrgProjectCount(@Param("customerId") String customerId, @Param("monthId")String monthId,
@Param("level") String level);
List<OrgStatisticsResultDTO> 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<ProjectTotalResultDTO> selectProjectTotal(@Param("customerId")String customerId, @Param("dateId")String dateId, @Param("monthId")String monthId);
List<ProjectTotalResultDTO> 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<ProjectTotalResultDTO> selectProjectTotalByOrg(@Param("orgIds")List<String> orgIds, @Param("dateId")String dateId, @Param("monthId")String monthId);
List<ProjectTotalResultDTO> selectProjectTotalByOrg(@Param("orgIds") List<String> orgIds, @Param("dateId") String dateId, @Param("monthId") String monthId);
/**
* @Description 查询已解决项目数
* @Description 查询已解决项目数
* @Param customerId
* @Param dateId
* @author zxc
* @date 2021/1/28 下午4:15
*/
List<ResolvedNumResultDTO> selectResolvedNum(@Param("customerId")String customerId, @Param("dateId")String dateId);
List<ResolvedNumResultDTO> selectResolvedNum(@Param("customerId") String customerId, @Param("dateId") String dateId);
/**
* @Description 组织查询已解决项目数
* @Description 组织查询已解决项目数
* @Param orgIds
* @Param dateId
* @author zxc
* @date 2021/4/13 上午9:41
*/
List<ResolvedNumResultDTO> selectResolvedNumByOrg(@Param("orgIds")List<String> orgIds, @Param("dateId")String dateId);
List<ResolvedNumResultDTO> selectResolvedNumByOrg(@Param("orgIds") List<String> orgIds, @Param("dateId") String dateId);
/**
* @Description 查询 满意度评价次数
* @Description 查询 满意度评价次数
* @Param customerId
* @Param dateId
* @author zxc
* @date 2021/1/29 上午9:10
*/
List<EvaluateTotalResultDTO> selectEvaluateCount(@Param("customerId")String customerId, @Param("dateId")String dateId, @Param("activeCodes") List<String> activeCodes);
List<EvaluateTotalResultDTO> selectEvaluateCount(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param("activeCodes") List<String> activeCodes);
/**
* @Description 组织 查询 满意度评价次数
* @Description 组织 查询 满意度评价次数
* @Param orgIds
* @Param dateId
* @Param activeCodes
* @author zxc
* @date 2021/4/13 上午9:56
*/
List<EvaluateTotalResultDTO> selectEvaluateCountByOrg(@Param("orgIds")List<String> orgIds, @Param("dateId")String dateId, @Param("activeCodes")List<String> activeCodes);
List<EvaluateTotalResultDTO> selectEvaluateCountByOrg(@Param("orgIds") List<String> orgIds, @Param("dateId") String dateId, @Param("activeCodes") List<String> activeCodes);
/**
* @Description 查询本月新增项目数
* @Description 查询本月新增项目数
* @Param customerId
* @Param monthId
* @author zxc
* @date 2021/1/29 下午2:31
*/
List<ProjectIncrResultDTO> selectProjectIncr(@Param("customerId")String customerId, @Param("monthId")String monthId);
List<ProjectIncrResultDTO> selectProjectIncr(@Param("customerId") String customerId, @Param("monthId") String monthId);
/**
* @Description 组织查询本月新增项目数
* @Description 组织查询本月新增项目数
* @Param orgIds
* @Param monthId
* @author zxc
* @date 2021/4/16 上午9:21
*/
List<ProjectIncrResultDTO> selectProjectIncrByOrg(@Param("orgIds") List<String> orgIds, @Param("monthId")String monthId);
List<ProjectIncrResultDTO> selectProjectIncrByOrg(@Param("orgIds") List<String> orgIds, @Param("monthId") String monthId);
/**
* @Description 根据状态查询项目数
* @Description 根据状态查询项目数
* @Param customerId
* @Param monthId
* @Param status
* @author zxc
* @date 2021/1/29 下午3:25
*/
List<UnClosedTotalResultDTO> selectProjectCount(@Param("customerId")String customerId, @Param("monthId")String monthId, @Param("status") String status);
List<UnClosedTotalResultDTO> 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<UnClosedTotalResultDTO> selectProjectCountByOrg(@Param("orgIds") List<String> orgIds, @Param("monthId")String monthId, @Param("status") String status);
List<UnClosedTotalResultDTO> selectProjectCountByOrg(@Param("orgIds") List<String> orgIds, @Param("monthId") String monthId, @Param("status") String status);
/**
* @Description 本月新增结案项目数
* @Description 本月新增结案项目数
* @Param customerId
* @Param monthId
* @author zxc
* @date 2021/2/1 上午9:25
*/
List<ClosedIncrResultDTO> selectClosedIncr(@Param("customerId")String customerId, @Param("monthId")String monthId);
List<ClosedIncrResultDTO> selectClosedIncr(@Param("customerId") String customerId, @Param("monthId") String monthId);
/**
* @Description 组织本月新增结案项目数
* @Description 组织本月新增结案项目数
* @Param orgIds
* @Param monthId
* @author zxc
* @date 2021/4/16 上午9:35
*/
List<ClosedIncrResultDTO> selectClosedIncrByOrg(@Param("orgIds") List<String> orgIds, @Param("monthId")String monthId);
List<ClosedIncrResultDTO> selectClosedIncrByOrg(@Param("orgIds") List<String> orgIds, @Param("monthId") String monthId);
/**
* @param customerId
* @param dateId
* @return java.util.List<com.epmet.dto.screen.ScreenProjectDataDTO>
* @Description 初始化screen_project_data数据
* 如果是dateId不为空，则查询前一天的数据
* 否则全查（适用于首次初始化的场景）
*
* <p>
* 这是只查询指定天新增的项目，对于需要更新状态的项目，对历史数据（流转中的项目）进行遍历查询
* @param customerId
* @param dateId
* @return java.util.List<com.epmet.dto.screen.ScreenProjectDataDTO>
* @author wangc
* @date 2021.03.04 22:56
*/
List<ScreenProjectDataDTO> initNewScreenProjectData(@Param("customerId")String customerId,@Param("dateId") String dateId,@Param("dataEndTime")String dataEndTime, @Param("projectId") String projectId);
*/
List<ScreenProjectDataDTO> 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<FactOriginProject
/**
* 获取组织级别党员发布话题转项目统计
* @author zhaoqifeng
* @date 2021/5/17 15:02
*
* @param customerId
* @param dateId
* @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2021/5/17 15:02
*/
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2021/5/17 15:03
*/
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2021/5/17 15:02
*/
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2021/5/17 15:03
*/
List<OrgStatisticsResultDTO> selectPartyMemberClosedProjectStaticByGrid(@Param("customerId") String customerId, @Param("dateId") String dateId);
@ -467,69 +482,73 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
* @param isResolved unresolved,resolved
* @return com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO
*/
List<GovernGridTotalCommonDTO> selectGroupByGrid(@Param("customerId")String customerId,
@Param("gridIds")List<String> gridIds,
@Param("projectStatus")String projectStatus,
@Param("origin")String origin,
@Param("isResolved")String isResolved);
List<GovernGridTotalCommonDTO> selectGroupByGrid(@Param("customerId") String customerId,
@Param("gridIds") List<String> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2021/5/26 15:11
*/
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2021/5/27 14:51
*/
List<OrgStatisticsResultDTO> 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<GovernProjectInfoDTO> getGridClosedProjectList(@Param("customerId")String customerId,
List<GovernProjectInfoDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2021/7/5 14:49
*/
List<OrgStatisticsResultDTO> getMemberProjectCountIncr(@Param("customerId")String customerId, @Param("dateId") String dateId);
List<OrgStatisticsResultDTO> 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<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
* @author zhaoqifeng
* @date 2021/7/5 14:49
*/
List<OrgStatisticsResultDTO> getMemberProjectCount(@Param("customerId")String customerId, @Param("dateId") String dateId);
List<OrgStatisticsResultDTO> getMemberProjectCount(@Param("customerId") String customerId, @Param("dateId") String dateId);
}

22
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java
View File

@ -99,7 +99,7 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
* @author zhaoqifeng
* @date 2020/9/15 16:13
*/
List<ProjectDTO> selectProjectInfo(@Param("customerId") String customerId, @Param("date") String date, String projectId);
List<ProjectDTO> selectProjectInfo(@Param("customerId") String customerId, @Param("date") String date, @Param("projectId") String projectId);
/**
* 获取用户可滞留天数
@ -140,7 +140,8 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
List<com.epmet.dto.ProjectCategoryDTO> getProjectCategoryData(@Param("customerId") String customerId, @Param("dateId") String dateId);
List<com.epmet.dto.ProjectCategoryDTO> selectProjectCategoryData(@Param("customerId") String customerId, @Param("dateId") String dateId);
List<com.epmet.dto.ProjectCategoryDTO> selectProjectCategoryData(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param("projectId") String projectId);
/**
* 获取项目满意度
*
@ -150,7 +151,7 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
* @author zhaoqifeng
* @date 2021/5/21 10:06
*/
List<ProjectPointDTO> selectProjectSatisfaction(@Param("customerId") String customerId, String projectId);
List<ProjectPointDTO> selectProjectSatisfaction(@Param("customerId") String customerId, @Param("projectId") String projectId);
/**
* 根据key查找value
@ -172,8 +173,8 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
* @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<ProjectEntity> {
* @param dateId
* @return
*/
List<String> selectEvaluateProjectIds(@Param("customerId") String customerId, @Param("dateId")String dateId);
List<String> selectEvaluateProjectIds(@Param("customerId") String customerId, @Param("dateId") String dateId);
/**
* 可根据状态筛选项目id
@ -191,14 +192,15 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
* @param projectStatus 状态:待处理 pending，结案closed
* @return
*/
List<String> selectClosedProjectIds(@Param("customerId")String customerId,
@Param("origin")String origin,
@Param("projectStatus")String projectStatus);
List<String> selectClosedProjectIds(@Param("customerId") String customerId,
@Param("origin") String origin,
@Param("projectStatus") String projectStatus);
/**
* 获取已转项目事件事件
*
* @param customerId
* @return
*/
List<ResiEventDTO> getEventList(@Param("customerId")String customerId);
List<ResiEventDTO> getEventList(@Param("customerId") String customerId);
}

88
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java
View File

@ -46,144 +46,152 @@ public interface ProjectProcessDao extends BaseDao<ProjectProcessEntity> {
/**
* @param projectEntity
* @Author sun
* @Description 查询客户项目处理进展表中是创建项目和结案两种进展的有效数据(创建日期截取yyyy-mm-dd格式字段值)
* @Description 查询客户项目处理进展表中是创建项目和结案两种进展的有效数据(创建日期截取yyyy - mm - dd格式字段值)
**/
List<ProjectProcessEntity> selectProcessList(ProjectEntity projectEntity);
/**
* 根据客户查询项目处理进展
* @author zhaoqifeng
* @date 2020/9/16 15:18
*
* @param customerId
* @param date
* @param projectId
* @return java.util.List<com.epmet.entity.project.ProjectProcessEntity>
* @author zhaoqifeng
* @date 2020/9/16 15:18
*/
List<ProcessInfoDTO> selectProcessListByCustomer(@Param("customerId") String customerId, @Param("date") String date, String projectId);
List<ProcessInfoDTO> 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<com.epmet.entity.project.ProjectProcessEntity>
* @author zhaoqifeng
* @date 2020/9/16 15:18
*/
List<ProcessInfoDTO> selectResponseProcessList(@Param("customerId") String customerId, @Param("date") String date, String projectId);
List<ProcessInfoDTO> 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<com.epmet.dto.project.ProcessInfoDTO>
* @author zhaoqifeng
* @date 2020/9/17 10:54
*/
List<ProcessInfoDTO> selectProcessStaffByCustomer(@Param("customerId") String customerId, @Param("date") String date, String projectId);
List<ProcessInfoDTO> 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<com.epmet.dto.project.ProcessInfoDTO>
* @author zhaoqifeng
* @date 2020/9/17 14:44
*/
List<ProcessInfoDTO> selectSatisfactionRecordByCustomer(@Param("customerId") String customerId, @Param("date") String date, String projectId);
List<ProcessInfoDTO> 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<java.lang.String>
* @author zhaoqifeng
* @date 2020/9/17 14:44
*/
List<ProjectProcessEntity> selectClosedProjectList(@Param("customerId") String customerId, @Param("date") String date, String projectId);
List<ProjectProcessEntity> 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<ProjectOrgPeriodResultDTO> selectProjectOrgPeriod(@Param("customerId") String customerId,@Param("projectStatus")String projectStatus,@Param("dateId") String dateId);
**/
List<ProjectOrgPeriodResultDTO> selectProjectOrgPeriod(@Param("customerId") String customerId, @Param("projectStatus") String projectStatus, @Param("dateId") String dateId);
/**
* @Description 根据项目业务改造，在数据抽取时，直接查询出项目节点的耗时
* @param
* @return java.util.List<com.epmet.dto.project.result.ProjectOrgPeriodResultDTO>
* @Description 根据项目业务改造，在数据抽取时，直接查询出项目节点的耗时
* @author wangc
* @date 2020.10.23 11:13
*/
List<ProjectOrgPeriodResultDTO> selectProjectOrgPeriodDirectly(@Param("customerId") String customerId,@Param("projectStatus")String projectStatus,@Param("dateId") String dateId);
*/
List<ProjectOrgPeriodResultDTO> selectProjectOrgPeriodDirectly(@Param("customerId") String customerId, @Param("projectId") String projectId);
/**
* @Description 查询项目-机关各个节点的响应列表
* @param projects
* @return
* @Description 查询项目-机关各个节点的响应列表
* @author wangc
* @date 2020.09.17 17:56
**/
**/
List<ProjectOrgRelationWhenResponseResultDTO> selectResponseTrace(@Param("projects") List<String> projects);
/**
* @Description 查询项目的节点
* @param projects
* @return java.util.List<com.epmet.dto.project.result.ProjectOrgRelationWhenResponseResultDTO>
* @Description 查询项目的节点
* @author wangc
* @date 2020.10.23 17:02
*/
*/
List<ProjectOrgRelationWhenResponseResultDTO> selectProjectProcess(@Param("projects") List<String> projects);
/**
* 获取办结组织
* @author zhaoqifeng
* @date 2020/9/18 18:01
*
* @param customerId
* @param date
* @param projectId
* @return java.util.List<com.epmet.dto.project.FinishOrgDTO>
* @author zhaoqifeng
* @date 2020/9/18 18:01
*/
List<FinishOrgDTO> selectFinishOrg(@Param("customerId") String customerId, @Param("date") String date, String projectId);
List<FinishOrgDTO> selectFinishOrg(@Param("customerId") String customerId, @Param("date") String date, @Param("projectId") String projectId);
/**
* @Description 查找项目最近一次操作说明
* @param list
* @return java.util.List<com.epmet.dto.project.result.ProjectLatestOperationResultDTO>
* @Description 查找项目最近一次操作说明
* @author wangc
* @date 2020.09.28 14:45
*/
List<ProjectLatestOperationResultDTO> selectLatestOperation(@Param("list") List<String> list,@Param("customerId") String customerId);
*/
List<ProjectLatestOperationResultDTO> selectLatestOperation(@Param("list") List<String> list, @Param("customerId") String customerId);
/**
* @Description 查找指定日期结案的项目
* @param customerId
* @param dateId
* @return java.util.List<com.epmet.dto.ProjectProcessDTO>
* @Description 查找指定日期结案的项目
* @author wangc
* @date 2021.03.09 10:49
*/
*/
List<ProjectProcessDTO> selectClosedProjectOnAppointedDay(@Param("customerId") String customerId, @Param("dateId") String dateId);
List<ProjectProcessDTO> selectClosedProjectByProjectIds(@Param("list")List<String> list);
List<ProjectProcessDTO> selectClosedProjectByProjectIds(@Param("list") List<String> list);
/**
* @Description 统计新增项目节点以及被流转到的指向部门
* @param customerId
* @param dateId
* @param dataEndTime
* @return java.util.List<com.epmet.dto.screen.ScreenProjectProcessDTO>
* @Description 统计新增项目节点以及被流转到的指向部门
* @author wangc
* @date 2021.03.09 16:25
*/
*/
List<ScreenProjectProcessDTO> 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<ScreenProjectProcessAttachmentDTO> selectProcessAttachment(@Param("list")List<String> list);
List<ScreenProjectProcessAttachmentDTO> selectProcessAttachment(@Param("list") List<String> list);
}

13
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java
View File

@ -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<F
public void extractProjectCategory(ExtractOriginFormDTO extractOriginFormDTO) {
String dateString = extractOriginFormDTO.getDateId();
String customerId = extractOriginFormDTO.getCustomerId();
String projectId = extractOriginFormDTO.getObjectId();
List<FactOriginProjectCategoryDailyEntity> entities = new ArrayList<>();
Integer count = baseDao.selectCount(new QueryWrapper<FactOriginProjectCategoryDailyEntity>().eq("customer_id",customerId));
//如果count = 0 初始化该customer所有数据
@ -78,7 +78,7 @@ public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl<F
}
// 原来一个项目有多个分类，现在几个分类可能会对上同一个省里的编码，所以去重一下，插入到fact_origin_project_category表
// List<ProjectCategoryDTO> projectCategoryData = projectService.getProjectCategoryData(customerId, dateString);
List<ProjectCategoryDTO> projectCategoryData = projectService.queryProjectCategoryData(customerId, dateString);
List<ProjectCategoryDTO> projectCategoryData = projectService.queryProjectCategoryData(customerId, dateString, projectId);
HashSet<String> projectIdSet=new HashSet<>();
if (!CollectionUtils.isEmpty(projectCategoryData)){
projectCategoryData.forEach(data->{
@ -103,13 +103,13 @@ public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl<F
//1、这些项目可能之前已经有分类，先删除
if(!CollectionUtils.isEmpty(projectIdSet)){
List<String> projectIdList = new ArrayList<String>(projectIdSet);
List<List<String>> partionList= ListUtils.partition(projectIdList, 100);
List<List<String>> 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<F
* @param customerId
* @param dateId
* @param result
* @param projectId
* @return void
* @Author liushaowen
* @Date 2021/3/22 17:01
*/
@Transactional(rollbackFor = Exception.class)
public void delAndInsert(String customerId,String dateId,List<FactOriginProjectCategoryDailyEntity> result){
baseDao.deleteOldData(customerId, dateId);
public void delAndInsert(String customerId, String dateId, List<FactOriginProjectCategoryDailyEntity> result, String projectId){
baseDao.deleteOldData(customerId, dateId, projectId);
insertBatch(result);
}

6
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
View File

@ -433,7 +433,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
@Override
public void extractProjectPeriodData(ExtractOriginFormDTO param) {
List<ProjectOrgPeriodResultDTO> extractData =
projectProcessService.getProjectPeriodDirectly(param.getCustomerId(), param.getDateId());
projectProcessService.getProjectPeriodDirectly(param.getCustomerId(), param.getObjectId());
List<FactOriginProjectOrgPeriodDailyEntity> 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<String> projectList = new ArrayList<>();
projectList.add(param.getObjectId());
factOriginProjectOrgPeriodDailyDao.deleteByProjectIds(projectList, param.getCustomerId());
Lists.partition(formattingData, NumConstant.ONE_HUNDRED)
.forEach(part -> factOriginProjectOrgPeriodDailyDao.insertBatch(part));

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java
View File

@ -106,12 +106,12 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
/**
* @Description 直接从项目业务改造获取项目节点耗时信息
* @param customerId
* @param date
* @param projectId
* @return java.util.List<com.epmet.dto.project.result.ProjectOrgPeriodResultDTO>
* @author wangc
* @date 2020.10.23 09:10
*/
List<ProjectOrgPeriodResultDTO> getProjectPeriodDirectly(String customerId, String date);
List<ProjectOrgPeriodResultDTO> getProjectPeriodDirectly(String customerId, String projectId);
/**
* 获取办结组织

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
View File

@ -156,7 +156,7 @@ public interface ProjectService extends BaseService<ProjectEntity> {
*/
List<ProjectCategoryDTO> getProjectCategoryData(String customerId, String dateId);
List<ProjectCategoryDTO> queryProjectCategoryData(String customerId, String dateId);
List<ProjectCategoryDTO> queryProjectCategoryData(String customerId, String dateId, String projectId);
/**
* 获取项目满意度
* @author zhaoqifeng

5
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java
View File

@ -96,13 +96,14 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
* @param
* @param customerId
* @param date
* @param projectId
* @return java.util.List<com.epmet.dto.project.result.ProjectOrgPeriodResultDTO>
* @author wangc
* @date 2020.10.23 09:10
*/
@Override
public List<ProjectOrgPeriodResultDTO> getProjectPeriodDirectly( String customerId, String date) {
return baseDao.selectProjectOrgPeriodDirectly(customerId,null,null);
public List<ProjectOrgPeriodResultDTO> getProjectPeriodDirectly(String customerId, String projectId) {
return baseDao.selectProjectOrgPeriodDirectly(customerId, projectId);
}
@Override

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
View File

@ -162,8 +162,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
}
@Override
public List<com.epmet.dto.ProjectCategoryDTO> queryProjectCategoryData(String customerId, String dateId) {
return baseDao.selectProjectCategoryData(customerId,dateId);
public List<com.epmet.dto.ProjectCategoryDTO> queryProjectCategoryData(String customerId, String dateId, String projectId) {
return baseDao.selectProjectCategoryData(customerId,dateId,projectId);
}
/**
* 获取项目满意度

3
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml
View File

@ -9,6 +9,9 @@
fact_origin_project_category_daily
WHERE
CUSTOMER_ID = #{customerId}
<if test="projectId != null and projectId != ''">
AND PROJECT_ID = #{projectId}
</if>
<if test="dateId != null">
AND DATE_FORMAT(CREATED_TIME,'%Y%m%d') = #{dateId}
</if>

3
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
View File

@ -161,6 +161,9 @@
from
`project_category` pc
where pc.del_flag = '0'
<if test="projectId != null and projectId != ''">
AND pc.PROJECT_ID = #{projectId}
</if>
and pc.customer_id = #{customerId}
<if test="dateId != null">
AND DATE_FORMAT(pc.CREATED_TIME,'%Y%m%d')=#{dateId}

3
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
View File

@ -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'
<if test="projectId != null and projectId != ''">
AND staff.PROJECT_ID = #{projectId}
</if>
AND staff.CUSTOMER_ID = #{customerId}
<if test='null != projectStatus and "" != projectStatus'>

Write Preview
Loading…
Cancel
Save