elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop 

# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java
dev
jianjun 4 years ago
parent
ff1f7ea0f6 859e283bf8
commit
1f1cb6637e
41 changed files with 616 additions and 432 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. 5
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
  2. 4
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
  3. 1
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/QuestionnaireServiceImpl.java
  4. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/ExtractOriginFormDTO.java
  5. 2
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenCentralZoneDataFormDTO.java
  6. 10
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java
  7. 255
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
  8. 281
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
  9. 24
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java
  10. 97
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java
  11. 22
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java
  12. 9
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java
  13. 8
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
  14. 13
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java
  15. 6
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java
  16. 12
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
  17. 29
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
  18. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/ScreenExtractService.java
  19. 5
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
  20. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
  21. 6
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java
  22. 26
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java
  23. 9
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
  24. 35
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java
  25. 13
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
  26. 3
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml
  27. 5
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
  28. 13
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
  29. 3
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
  30. 11
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
  31. 32
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
  32. 1
      epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtAuthProcessor.java
  33. 1
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
  34. 9
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java
  35. 71
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
  36. 5
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java
  37. 4
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
  38. 3
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
  39. 3
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
  40. 1
      epmet-user/epmet-user-server/src/main/java/com/epmet/handler/ExcelDiceAddressListHandlerImpl.java
  41. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java

5
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
View File

@ -12,7 +12,6 @@ import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.constant.StrConstant;
import com.epmet.commons.tools.utils.DateUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
/**
* @author Mark sunlightcs@gmail.com
@ -509,10 +508,6 @@ public class RedisKeys {
return rootPrefix.concat("sys:cors");
}
public static String getProjectChangedMsgDistinceKey(String customerId) {
return rootPrefix.concat("project_changed:consume:").concat(customerId);
}
/**
* desc:获取防重复提交redis key
* @param key

4
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
View File

@ -410,7 +410,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
//单选
if(originalData.containsKey(key)){
Integer answer = (Integer) originalData.get(key);
if (null != answer && optionDTO.getValue() == answer) {
if (null != answer && optionDTO.getValue().equals(answer)) {
currentCount += 1;
}
}
@ -442,7 +442,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
//单选
if(originalData.containsKey(key)){
Integer answer = (Integer) originalData.get(key);
if (null != answer && optionDTO.getValue() == answer) {
if (null != answer && optionDTO.getValue().equals(answer)) {
currentCount += 1;
}
}

1
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/QuestionnaireServiceImpl.java
View File

@ -61,6 +61,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService, ResultDat
* @author wxz
* @date 2021.09.23 17:45:25
*/
@Override
public PermissionValidateResultDTO resiPermissionValidate(String projectKey, String userId, String gridId) {
PrUserProjectEntity project = prUserProjectService.getProjectEntityBykey(projectKey);

5
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/ExtractOriginFormDTO.java
View File

@ -34,4 +34,9 @@ public class ExtractOriginFormDTO implements Serializable {
* 结束时间
*/
private String endDate;
/**
* 操作对象Id
*/
private String objectId;
}

2
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenCentralZoneDataFormDTO.java
View File

@ -27,4 +27,6 @@ public class ScreenCentralZoneDataFormDTO implements Serializable {
private String startDate;
private String endDate;
private String projectId;
}

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);
}

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

@ -36,95 +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
* @return void
*/
void deleteByDate(@Param("customerId") String customerId, @Param("date") String date);
* @param date
* @param projectId
* @return void
* @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 评价周期内被吹哨项目数
@ -134,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
@ -144,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
@ -320,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
@ -330,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);
}

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

@ -47,53 +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);
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);
void deleteByDate(@Param("customerId") String customerId, @Param("date") String date, @Param("projectId") String projectId);
/**
* @param customerId
@ -105,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);
*/
List<ScreenProjectDataDTO> initNewScreenProjectData(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param("dataEndTime") String dataEndTime, @Param("projectId") String projectId);
/**
* desc: 获取难点堵点项目数据
@ -414,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);
@ -465,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);
}

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

@ -94,11 +94,12 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
*
* @param customerId
* @param date
* @param projectId
* @return java.util.List<com.epmet.dto.project.ProjectInfoDTO>
* @author zhaoqifeng
* @date 2020/9/15 16:13
*/
List<ProjectDTO> selectProjectInfo(@Param("customerId") String customerId, @Param("date") String date);
List<ProjectDTO> selectProjectInfo(@Param("customerId") String customerId, @Param("date") String date, @Param("projectId") String projectId);
/**
* 获取用户可滞留天数
@ -139,16 +140,18 @@ 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);
/**
* 获取项目满意度
*
* @param customerId
* @param projectId
* @return java.util.List<com.epmet.dto.ProjectSatisfactionStatisticsDTO>
* @author zhaoqifeng
* @date 2021/5/21 10:06
*/
List<ProjectPointDTO> selectProjectSatisfaction(@Param("customerId") String customerId);
List<ProjectPointDTO> selectProjectSatisfaction(@Param("customerId") String customerId, @Param("projectId") String projectId);
/**
* 根据key查找value
@ -170,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
@ -180,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
@ -189,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);
}

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

@ -46,137 +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);
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);
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);
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);
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);
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);
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 );
*/
List<ScreenProjectProcessDTO> selectProjectProcessAndDirection(@Param("customerId") String customerId, @Param("dateId") String dateId,
@Param("dataEndTime") String dataEndTime, @Param("projectId") String projectId);
List<ScreenProjectProcessAttachmentDTO> selectProcessAttachment(@Param("list")List<String> list);
}
List<ScreenProjectProcessAttachmentDTO> selectProcessAttachment(@Param("list") List<String> list);
}

22
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java
View File

@ -87,21 +87,12 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
redisUtils = SpringContextUtils.getBean(RedisUtils.class);
}
String redisKey = RedisKeys.getProjectChangedMsgDistinceKey(msgObj.getCustomerId());
if (redisUtils.get(redisKey) == null) {
// 该线程启动消费之后，其他线程再收到该客户id的消费请求，则不消费
redisUtils.set(redisKey, msg, 30);
try {
consumeMessage(msgObj);
} catch (Exception e) {
// 如果消费失败了，清楚该key，收到消息之后可以继续消费
redisUtils.delete(redisKey);
throw e;
}
log.info("消费了项目变动消息,customer id:{}", msgObj.getCustomerId());
} else {
log.info("该客户的项目变动消息刚刚消费，请等待30秒,customer id:{}", msgObj.getCustomerId());
try {
consumeMessage(msgObj);
} catch (Exception e) {
throw e;
}
log.info("消费了项目变动消息,customer id:{}", msgObj.getCustomerId());
if (org.apache.commons.lang.StringUtils.isNotBlank(pendingMsgLabel)) {
try {
@ -136,6 +127,7 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
String dateId = DimIdGenerator.getDateDimId(new Date());
extractOriginFormDTO.setDateId(dateId);
extractOriginFormDTO.setObjectId(msgObj.getProjectId());
Future<?> aBoolean = SpringContextUtils.getBean(FactOriginExtractService.class).submitProjectRelationData(extractOriginFormDTO,null);
try {
Object o = aBoolean.get();
@ -150,7 +142,7 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
// 【screen_project_process_attachment】
// 【screen_project_img_data】
// 【screen_project_process】这四个表
SpringContextUtils.getBean(ScreenExtractService.class).extractPartData(customerId,dateId);
SpringContextUtils.getBean(ScreenExtractService.class).extractPartData(customerId, dateId, msgObj.getProjectId());
}
logger.info("consumer projectChanged msg success,{}",aBoolean);

9
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java
View File

@ -132,9 +132,10 @@ public interface FactOriginProjectLogDailyService extends BaseService<FactOrigin
* @date 2020/9/18 17:30
* @param customerId
* @param date
* @param projectId
* @return void
*/
void deleteByDate(String customerId, String date);
void deleteByDate(String customerId, String date, String projectId);
/**
* @Description 网格项目自治率查询
@ -175,7 +176,7 @@ public interface FactOriginProjectLogDailyService extends BaseService<FactOrigin
* @date 2020.09.20 23:46
**/
Map<String, Integer> getProjectHandledAgency(List<String> agencies, String customerId, String dimId);
/**
* @Description 办结率
* @param agencies
@ -344,7 +345,7 @@ public interface FactOriginProjectLogDailyService extends BaseService<FactOrigin
/**
* 项目吹哨数
* @author zhaoqifeng
* @date 2021/7/5 16:57
* @date 2021/7/5 16:57
* @param customerId
* @param dateId
* @param type
@ -362,4 +363,4 @@ public interface FactOriginProjectLogDailyService extends BaseService<FactOrigin
* @return java.util.Map<java.lang.String,java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>>
*/
Map<String, List<OrgStatisticsResultDTO>> getProjectClosedCount(String customerId, String dateId, Integer type);
}
}

8
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
View File

@ -58,9 +58,10 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
* @author zhaoqifeng
* @date 2020/9/17 14:30
* @param customerId
* @param projectId
* @return java.util.List<com.epmet.dto.extract.FactOriginProjectMainDailyDTO>
*/
List<FactOriginProjectMainDailyDTO> getPendingList(String customerId);
List<FactOriginProjectMainDailyDTO> getPendingList(String customerId, String projectId);
/**
* @Description 网格办结项目数
@ -90,9 +91,10 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
* @date 2020/9/18 17:30
* @param customerId
* @param date
* @param projectId
* @return void
*/
void deleteByDate(String customerId, String date);
void deleteByDate(String customerId, String date, String projectId);
/**
* @param customerId
@ -367,7 +369,7 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
* @author wangc
* @date 2021.03.04 22:56
*/
List<ScreenProjectDataDTO> initNewScreenProjectData(String customerId,Integer rows ,String dateId);
List<ScreenProjectDataDTO> initNewScreenProjectData(String customerId,Integer rows ,String dateId, String projectId);
void computerIfExceed(List<ScreenProjectDataDTO> list,Integer exceedLimit,Integer about2exceedLimit);

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/FactOriginProjectLogDailyServiceImpl.java
View File

@ -144,8 +144,8 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl<FactOr
}
@Override
public void deleteByDate(String customerId, String date) {
baseDao.deleteByDate(customerId, date);
public void deleteByDate(String customerId, String date, String projectId) {
baseDao.deleteByDate(customerId, date, projectId);
}
/**
@ -511,4 +511,4 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl<FactOr
}
}
}

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

@ -77,8 +77,8 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
}
@Override
public List<FactOriginProjectMainDailyDTO> getPendingList(String customerId) {
return baseDao.getPendingList(customerId);
public List<FactOriginProjectMainDailyDTO> getPendingList(String customerId, String projectId) {
return baseDao.getPendingList(customerId, projectId);
}
@Override
@ -108,8 +108,8 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
}
@Override
public void deleteByDate(String customerId, String date) {
baseDao.deleteByDate(customerId, date);
public void deleteByDate(String customerId, String date, String projectId) {
baseDao.deleteByDate(customerId, date, projectId);
}
/**
@ -476,8 +476,8 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
* @date 2021.03.04 22:56
*/
@Override
public List<ScreenProjectDataDTO> initNewScreenProjectData(String customerId,Integer rows , String dateId) {
List<ScreenProjectDataDTO> projects = baseDao.initNewScreenProjectData(customerId, rows <= NumConstant.ZERO ? "" : dateId, dateId);
public List<ScreenProjectDataDTO> initNewScreenProjectData(String customerId,Integer rows , String dateId, String projectId) {
List<ScreenProjectDataDTO> projects = baseDao.initNewScreenProjectData(customerId, rows <= NumConstant.ZERO ? "" : dateId, dateId, projectId);
projects.forEach(project -> {
if (ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())) {
//绿灯事件-结案项目

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

@ -82,11 +82,12 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
public void saveOriginProjectDaily(ExtractOriginFormDTO extractOriginFormDTO) {
String dateString = extractOriginFormDTO.getDateId();
String customerId = extractOriginFormDTO.getCustomerId();
String projectId = extractOriginFormDTO.getObjectId();
List<FactOriginProjectMainDailyEntity> list = new LinkedList<>();
//获取已关闭项目列表
List<ProjectProcessEntity> closedList = projectProcessService.getClosedProjectList(customerId, dateString);
List<FactOriginProjectMainDailyDTO> pendingList = factOriginProjectMainDailyService.getPendingList(customerId);
List<FinishOrgDTO> finishOrgList = projectProcessService.getFinishOrg(customerId, dateString);
List<ProjectProcessEntity> closedList = projectProcessService.getClosedProjectList(customerId, dateString, projectId);
List<FactOriginProjectMainDailyDTO> pendingList = factOriginProjectMainDailyService.getPendingList(customerId, projectId);
List<FinishOrgDTO> finishOrgList = projectProcessService.getFinishOrg(customerId, dateString, projectId);
if (!CollectionUtils.isEmpty(closedList)) {
if(!CollectionUtils.isEmpty(pendingList)) {
List<FactOriginProjectMainDailyEntity> closeProjects =
@ -124,8 +125,8 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
}
}
//获取项目信息
List<ProjectDTO> projectList = projectService.getProjectInfo(customerId, dateString);
factOriginProjectMainDailyService.deleteByDate(customerId, dateString);
List<ProjectDTO> projectList = projectService.getProjectInfo(customerId, dateString, projectId);
factOriginProjectMainDailyService.deleteByDate(customerId, dateString,projectId);
if (!CollectionUtils.isEmpty(projectList)) {
Map<String, ResiEventDTO> projectEventMap = projectService.getEventList(customerId);
//提取议题ID
@ -230,7 +231,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
}
//满意度
List<FactOriginProjectMainDailyEntity> satisfaction = projectService.getProjectSatisfaction(customerId);
List<FactOriginProjectMainDailyEntity> satisfaction = projectService.getProjectSatisfaction(customerId, projectId);
if (CollectionUtils.isNotEmpty(satisfaction)) {
factOriginProjectMainDailyService.updateBatchById(satisfaction);
}
@ -238,7 +239,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
final List<FactOriginProjectMainDailyEntity> mainList = list;
List<FactOriginProjectLogDailyEntity> logList = new ArrayList<>();
//节点发起人 部门流转退回结案
List<ProcessInfoDTO> processList = projectProcessService.getProcessListByCustomer(customerId, dateString);
List<ProcessInfoDTO> processList = projectProcessService.getProcessListByCustomer(customerId, dateString, projectId);
if (!CollectionUtils.isEmpty(processList)) {
logList = processList.stream().map(process -> {
//获取日期相关维度
@ -290,7 +291,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
}).collect(Collectors.toList());
}
//节点发起人 响应
List<ProcessInfoDTO> responseList = projectProcessService.getResponseProcessList(customerId, dateString);
List<ProcessInfoDTO> responseList = projectProcessService.getResponseProcessList(customerId, dateString, projectId);
if (!CollectionUtils.isEmpty(responseList)) {
logList.addAll(responseList.stream().map(process -> {
//获取日期相关维度
@ -336,7 +337,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
}
//项目评论人
List<ProcessInfoDTO> satisfactionRecordList = projectProcessService.getSatisfactionRecord(customerId, dateString);
List<ProcessInfoDTO> satisfactionRecordList = projectProcessService.getSatisfactionRecord(customerId, dateString, projectId);
satisfactionRecordList.forEach(log -> mainList.stream().filter(project -> log.getProjectId().equals(project.getId())).forEach(main -> {
//进行满意度评价的居民的所属机关的父机机关信息
@ -366,7 +367,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
//节点接收人
List<ProcessInfoDTO> processStaffList = projectProcessService.getProcessStaffByCustomer(customerId, dateString);
List<ProcessInfoDTO> processStaffList = projectProcessService.getProcessStaffByCustomer(customerId, dateString, projectId);
logList.addAll(processStaffList.stream().map(process -> {
//获取日期相关维度
DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(process.getCreatedTime());
@ -415,7 +416,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
return entity;
}).collect(Collectors.toList()));
factOriginProjectLogDailyService.deleteByDate(customerId, dateString);
factOriginProjectLogDailyService.deleteByDate(customerId, dateString,projectId);
if (!logList.isEmpty()) {
factOriginProjectLogDailyService.insertBatch(logList);
}
@ -432,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
@ -473,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));

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/ScreenExtractService.java
View File

@ -34,6 +34,6 @@ public interface ScreenExtractService {
* @author LiuJanJun
* @date 2021/4/27 6:12 下午
*/
void extractPartData(String customerId, String dateId);
void extractPartData(String customerId, String dateId, String projectId);
}

5
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
View File

@ -334,7 +334,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
} catch (Exception e) {
log.error("网格员数据统计fact_grid_member_statistics_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
}
extractPartData(customerId, dateId);
extractPartData(customerId, dateId, null);
} finally {
latch.countDown();
log.info("extractDaily 4 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
@ -355,10 +355,11 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
}
@Override
public void extractPartData(String customerId, String dateId) {
public void extractPartData(String customerId, String dateId, String projectId) {
ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
param.setCustomerId(customerId);
param.setDateId(dateId);
param.setProjectId(projectId);
try {
//大屏项目数据抽取_按天抽取

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
View File

@ -231,7 +231,7 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
return false;
}
//获取业务库项目标题
List<ProjectDTO> bizProjectInfoList = projectService.getProjectInfo(param.getCustomerId(), null);
List<ProjectDTO> bizProjectInfoList = projectService.getProjectInfo(param.getCustomerId(), null, null);
if (CollectionUtils.isEmpty(bizProjectInfoList)) {
log.warn("difficultyDataExtract customerId:{} have any project", param.getCustomerId());
return false;

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

@ -74,7 +74,7 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
int rows = screenProjectDataService.checkIfExisted(param.getCustomerId());
List<ScreenProjectDataDTO> metaData =
originMainService.initNewScreenProjectData(param.getCustomerId(), rows , param.getDateId());
originMainService.initNewScreenProjectData(param.getCustomerId(), rows , param.getDateId(), param.getProjectId());
if(!CollectionUtils.isEmpty(metaData)) {
// 查询项目信息
@ -135,6 +135,7 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
ScreenProjectDataDTO orientCase = new ScreenProjectDataDTO();
orientCase.setCustomerId(param.getCustomerId());
orientCase.setProjectId( param.getProjectId());
//待更新的数据 需要检测更新的字段为：①projectStatusCode ②closeCaseTime ③allCategoryName ④projectLevel
List<ScreenProjectDataDTO> orientData =
screenProjectDataService.getPending(orientCase,param.getDateId());
@ -188,7 +189,8 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
}
//
List<ScreenProjectProcessDTO> processes = processService.buildNewScreenProjectProcessData(param.getCustomerId(), param.getDateId(),!screenProjectProcessService.checkIfHistoricalDataExists(param.getCustomerId()));
List<ScreenProjectProcessDTO> processes = processService.buildNewScreenProjectProcessData(param.getCustomerId(), param.getDateId(),
!screenProjectProcessService.checkIfHistoricalDataExists(param.getCustomerId()), param.getProjectId());
if(!CollectionUtils.isEmpty(processes)){
screenProjectProcessService.insertBatch(processes,param.getCustomerId(),param.getDateId());
List<ScreenProjectProcessAttachmentDTO> attachments = processService.buildProcessAttachmentData(processes.stream().map(ScreenProjectProcessDTO::getProcessId).distinct().collect(Collectors.toList()));

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

@ -52,9 +52,10 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
* @date 2020/9/16 15:42
* @param customerId
* @param date
* @param projectId
* @return java.util.List<com.epmet.entity.project.ProjectProcessEntity>
*/
List<ProcessInfoDTO> getProcessListByCustomer(String customerId, String date);
List<ProcessInfoDTO> getProcessListByCustomer(String customerId, String date, String projectId);
/**
* 根据客户查询响应节点
@ -62,9 +63,10 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
* @date 2020/9/30 16:27
* @param customerId
* @param date
* @param projectId
* @return java.util.List<com.epmet.dto.project.ProcessInfoDTO>
*/
List<ProcessInfoDTO> getResponseProcessList(String customerId, String date);
List<ProcessInfoDTO> getResponseProcessList(String customerId, String date, String projectId);
/**
* 查询各个节点的受理人
@ -72,9 +74,10 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
* @date 2020/9/17 10:53
* @param customerId
* @param date
* @param projectId
* @return java.util.List<com.epmet.dto.project.ProcessInfoDTO>
*/
List<ProcessInfoDTO> getProcessStaffByCustomer(String customerId, String date);
List<ProcessInfoDTO> getProcessStaffByCustomer(String customerId, String date, String projectId);
/**
* 获取满意度评价记录
@ -82,9 +85,10 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
* @date 2020/9/17 13:59
* @param customerId
* @param date
* @param projectId
* @return java.util.List<com.epmet.dto.project.ProcessInfoDTO>
*/
List<ProcessInfoDTO> getSatisfactionRecord(String customerId, String date);
List<ProcessInfoDTO> getSatisfactionRecord(String customerId, String date, String projectId);
/**
* 获取已结案的项目列表
@ -92,21 +96,22 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
* @date 2020/9/17 14:43
* @param customerId
* @param date
* @param projectId
* @return java.util.List<java.lang.String>
*/
List<ProjectProcessEntity> getClosedProjectList(String customerId, String date);
List<ProjectProcessEntity> getClosedProjectList(String customerId, String date, String projectId);
/**
* @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);
/**
* 获取办结组织
@ -114,9 +119,10 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
* @date 2020/9/20 21:11
* @param customerId
* @param date
* @param projectId
* @return java.util.List<com.epmet.dto.project.FinishOrgDTO>
*/
List<FinishOrgDTO> getFinishOrg(String customerId, String date);
List<FinishOrgDTO> getFinishOrg(String customerId, String date, String projectId);
/**
* @Description 获得项目最新操作
@ -156,7 +162,7 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
* @author wangc
* @date 2021.03.09 14:49
*/
List<ScreenProjectProcessDTO> buildNewScreenProjectProcessData(String customerId,String dateId,boolean ifRanged);
List<ScreenProjectProcessDTO> buildNewScreenProjectProcessData(String customerId,String dateId,boolean ifRanged, String projectId);
/**
* @Description 构建节点附件数据
@ -166,4 +172,4 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
* @date 2021.03.09 16:56
*/
List<ScreenProjectProcessAttachmentDTO> buildProcessAttachmentData(List<String> processIds);
}
}

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

@ -94,9 +94,10 @@ public interface ProjectService extends BaseService<ProjectEntity> {
* @date 2020/9/15 16:09
* @param customerId
* @param date
* @param projectId
* @return java.util.List<com.epmet.dto.project.ProjectInfoDTO>
*/
List<ProjectDTO> getProjectInfo(String customerId, String date);
List<ProjectDTO> getProjectInfo(String customerId, String date, String projectId);
/**
* 获取用户可滞留天数
@ -155,15 +156,16 @@ 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
* @date 2021/5/21 10:04
* @param customerId
* @param projectId
* @return java.util.List<com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity>
*/
List<FactOriginProjectMainDailyEntity> getProjectSatisfaction(String customerId);
List<FactOriginProjectMainDailyEntity> getProjectSatisfaction(String customerId, String projectId);
List<ProjectDTO> selectProjectListByDateId(String customerId, String yesterdayStr, String projectOriginAgency);
/**
@ -197,6 +199,7 @@ public interface ProjectService extends BaseService<ProjectEntity> {
/**
* 获取事件信息
* @param customerId
* @param projectId
* @return
*/
Map<String, ResiEventDTO> getEventList(String customerId);

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

@ -66,28 +66,28 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
}
@Override
public List<ProcessInfoDTO> getProcessListByCustomer(String customerId, String date) {
return baseDao.selectProcessListByCustomer(customerId, date);
public List<ProcessInfoDTO> getProcessListByCustomer(String customerId, String date, String projectId) {
return baseDao.selectProcessListByCustomer(customerId, date, projectId);
}
@Override
public List<ProcessInfoDTO> getResponseProcessList(String customerId, String date) {
return baseDao.selectResponseProcessList(customerId, date);
public List<ProcessInfoDTO> getResponseProcessList(String customerId, String date, String projectId) {
return baseDao.selectResponseProcessList(customerId, date, projectId);
}
@Override
public List<ProcessInfoDTO> getProcessStaffByCustomer(String customerId, String date) {
return baseDao.selectProcessStaffByCustomer(customerId, date);
public List<ProcessInfoDTO> getProcessStaffByCustomer(String customerId, String date, String projectId) {
return baseDao.selectProcessStaffByCustomer(customerId, date, projectId);
}
@Override
public List<ProcessInfoDTO> getSatisfactionRecord(String customerId, String date) {
return baseDao.selectSatisfactionRecordByCustomer(customerId, date);
public List<ProcessInfoDTO> getSatisfactionRecord(String customerId, String date, String projectId) {
return baseDao.selectSatisfactionRecordByCustomer(customerId, date, projectId);
}
@Override
public List<ProjectProcessEntity> getClosedProjectList(String customerId, String date) {
return baseDao.selectClosedProjectList(customerId, date);
public List<ProjectProcessEntity> getClosedProjectList(String customerId, String date, String projectId) {
return baseDao.selectClosedProjectList(customerId, date, projectId);
}
@ -96,18 +96,19 @@ 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
public List<FinishOrgDTO> getFinishOrg(String customerId, String date) {
return baseDao.selectFinishOrg(customerId, date);
public List<FinishOrgDTO> getFinishOrg(String customerId, String date, String projectId) {
return baseDao.selectFinishOrg(customerId, date, projectId);
}
/**
@ -183,8 +184,8 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
* @date 2021.03.09 14:49
*/
@Override
public List<ScreenProjectProcessDTO> buildNewScreenProjectProcessData(String customerId, String dateId, boolean ifRanged) {
List<ScreenProjectProcessDTO> processes = baseDao.selectProjectProcessAndDirection(customerId, ifRanged ? null : dateId, dateId);
public List<ScreenProjectProcessDTO> buildNewScreenProjectProcessData(String customerId, String dateId, boolean ifRanged, String projectId) {
List<ScreenProjectProcessDTO> processes = baseDao.selectProjectProcessAndDirection(customerId, ifRanged ? null : dateId, dateId, projectId);
if(CollectionUtils.isEmpty(processes)) return null;
return processes.stream().map(target -> {
List<ProjectStaffDTO> points = target.getPoints();
@ -216,4 +217,4 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
public List<ScreenProjectProcessAttachmentDTO> buildProcessAttachmentData(List<String> processIds) {
return baseDao.selectProcessAttachment(processIds);
}
}
}

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

@ -78,8 +78,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
}
@Override
public List<ProjectDTO> getProjectInfo(String customerId, String date) {
return baseDao.selectProjectInfo(customerId, date);
public List<ProjectDTO> getProjectInfo(String customerId, String date, String projectId) {
return baseDao.selectProjectInfo(customerId, date, projectId);
}
@Override
@ -162,20 +162,21 @@ 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);
}
/**
* 获取项目满意度
*
* @param customerId
* @param projectId
* @return java.util.List<com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity>
* @author zhaoqifeng
* @date 2021/5/21 10:04
*/
@Override
public List<FactOriginProjectMainDailyEntity> getProjectSatisfaction(String customerId) {
List<ProjectPointDTO> list = baseDao.selectProjectSatisfaction(customerId);
public List<FactOriginProjectMainDailyEntity> getProjectSatisfaction(String customerId, String projectId) {
List<ProjectPointDTO> list = baseDao.selectProjectSatisfaction(customerId, projectId);
if (org.apache.commons.collections4.CollectionUtils.isEmpty(list)) {
return Collections.emptyList();
}

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>

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

@ -10,6 +10,9 @@
<if test='null != date and "" != date'>
AND DATE_ID = #{date}
</if>
<if test="projectId != null and projectId != ''">
AND PROJECT_ID = #{projectId}
</if>
</delete>
<select id="selectAgencyTransferCount" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
@ -975,4 +978,4 @@
ORG_ID,
OPERATION_USER_ID
</select>
</mapper>
</mapper>

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

@ -41,7 +41,12 @@
ID,
DATE_ID
FROM fact_origin_project_main_daily
WHERE CUSTOMER_ID = #{customerId}
WHERE
1=1
<if test="projectId != null and projectId != ''">
AND ID = #{projectId}
</if>
AND CUSTOMER_ID = #{customerId}
AND PROJECT_STATUS = 'pending'
</select>
<select id="selectOverdueCount" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
@ -112,6 +117,9 @@
fact_origin_project_main_daily
WHERE
CUSTOMER_ID = #{customerId}
<if test="projectId != null and projectId != ''">
AND ID = #{projectId}
</if>
<if test='null != date and "" != date'>
AND DATE_ID = #{date}
</if>
@ -643,6 +651,9 @@
data.DEL_FLAG = '0'
AND
data.CUSTOMER_ID = #{customerId}
<if test="projectId != null and projectId != ''">
AND data.ID = #{projectId}
</if>
<choose>
<when test='null != dateId and "" != dateId'>
AND data.DATE_ID = #{dateId}

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

@ -76,6 +76,9 @@
<if test='null != projectLevel and "" != projectLevel'>
and project_level = #{projectLevel}
</if>
<if test='null != projectId and "" != projectId'>
and project_id = #{projectId}
</if>
and data_end_time <![CDATA[<>]]> #{dataEndTime}
</select>

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

@ -92,7 +92,10 @@
FROM project
WHERE
DEL_FLAG = '0'
AND CUSTOMER_ID = #{customerId}
<if test="projectId != null and projectId != ''">
AND ID = #{projectId}
</if>
and CUSTOMER_ID = #{customerId}
<if test="date != null and date.trim() != ''">
AND DATE_FORMAT(CREATED_TIME, '%Y%m%d') = #{date}
</if>
@ -158,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}
@ -171,6 +177,9 @@
FROM
project_satisfaction_statistics
WHERE CUSTOMER_ID = #{customerId}
<if test="projectId != null and projectId != ''">
AND PROJECT_ID = #{projectId}
</if>
</select>
<select id="selectValueByKey" resultType="java.lang.String">
select

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

@ -38,6 +38,9 @@
AND staff.DEL_FLAG = '0'
WHERE
pp.DEL_FLAG = '0'
<if test="projectId != null and projectId != ''">
AND p.ID = #{projectId}
</if>
AND p.CUSTOMER_ID = #{customerId}
AND pp.OPERATION !='response'
AND pp.OPERATION !='created'
@ -59,6 +62,9 @@
INNER JOIN project_process pp ON ps.PROCESS_ID = pp.ID AND pp.DEL_FLAG = '0'
INNER JOIN project p ON pp.PROJECT_ID = p.ID AND p.DEL_FLAG = '0'
WHERE p.CUSTOMER_ID = #{customerId}
<if test="projectId != null and projectId != ''">
AND p.ID = #{projectId}
</if>
AND ps.DEL_FLAG = '0'
<if test="date != null and date.trim() != ''">
AND DATE_FORMAT(pp.CREATED_TIME, '%Y%m%d') = #{date}
@ -77,6 +83,9 @@
LEFT JOIN project_related_personnel resiuser ON psd.PROJECT_ID = resiuser.PROJECT_ID
AND resiuser.APP = 'resi'
WHERE p.CUSTOMER_ID = #{customerId}
<if test="projectId != null and projectId != ''">
AND p.ID = #{projectId}
</if>
<if test="date != null and date.trim() != ''">
AND DATE_FORMAT(psd.CREATED_TIME, '%Y%m%d') = #{date}
</if>
@ -88,7 +97,12 @@
p.CLOSED_STATUS AS isResolved
FROM project_process pp
INNER JOIN project p ON pp.PROJECT_ID = p.ID
WHERE p.CUSTOMER_ID = #{customerId}
WHERE
1=1
<if test="projectId != null and projectId != ''">
AND p.ID = #{projectId}
</if>
AND p.CUSTOMER_ID = #{customerId}
AND pp.OPERATION = 'close'
<if test="date != null and date.trim() != ''">
AND DATE_FORMAT(pp.CREATED_TIME, '%Y%m%d') = #{date}
@ -165,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'>
@ -245,7 +262,10 @@
FROM
project_process
WHERE
OPERATION = 'close'
OPERATION = 'close'
<if test="projectId != null and projectId != ''">
AND PROJECT_ID = #{projectId}
</if>
AND CUSTOMER_ID = #{customerId}
<if test="date != null and date.trim() != ''">
AND DATE_FORMAT(CREATED_TIME , '%Y%m%d') = #{date}
@ -298,6 +318,9 @@
AND pp.DEPARTMENT_NAME = ps.DEPARTMENT_NAME
WHERE
1=1
<if test="projectId != null and projectId != ''">
AND p.ID = #{projectId}
</if>
AND pp.DEL_FLAG = '0'
AND p.CUSTOMER_ID = #{customerId}
AND pp.OPERATION = 'response'
@ -384,6 +407,9 @@
left join `project_staff` staff on staff.PROCESS_ID = process.ID and staff.DEL_FLAG = '0'
where process.del_flag = '0' and process.customer_id = #{customerId}
<if test="projectId != null and projectId != ''">
AND process.project_id = #{projectId}
</if>
<choose>
<when test='null != dateId and "" != dateId'>
AND DATE_FORMAT(process.created_time, '%Y%m%d') = #{dateId}
@ -420,4 +446,4 @@
PROCESS_ID = #{processId}
</foreach>
</select>
</mapper>
</mapper>

1
epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtAuthProcessor.java
View File

@ -20,6 +20,7 @@ public class ExtAppJwtAuthProcessor extends ExtAppAuthProcessor {
@Autowired
private ExtAppJwtTokenUtils jwtTokenUtils;
@Override
public ExternalAppAuthResultDTO auth(String appId, String token, Long ts) {
String secret;
if (StringUtils.isBlank(secret = getTokenByAppId(appId))) {

1
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
View File

@ -266,6 +266,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
* @author wxz
* @date 2021.08.30 17:12:15
*/
@Override
public void pushComponentAccessToken2PrivateEpmetPlatforms(ComponentAccessTokenFormDTO input) {
List<ThirdPlatformActionsResultDTO> platforms = thirdPlatformService.listPlatformsByActionKey(ThirdPlatformActions.PUSH_COMPONENT_ACCESS_TOKEN);
platforms.stream().forEach(p -> {

9
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java
View File

@ -1,5 +1,6 @@
package com.epmet.dto.result;
import com.epmet.commons.tools.constant.NumConstant;
import lombok.Data;
import java.io.Serializable;
@ -31,7 +32,11 @@ public class VoteResultDTO implements Serializable {
/**
* 支持：support 反对：oppose
*/
private String voteType = "";
private String voteType;
public VoteResultDTO() {
this.supportCount = NumConstant.ZERO;
this.oppositionCount = NumConstant.ZERO;
this.voteType = "";
}
}

71
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
View File

@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.constant.StrConstant;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
@ -52,6 +53,7 @@ import com.epmet.service.IssueVoteDetailService;
import com.epmet.service.IssueVoteStatisticalService;
import com.epmet.utils.ModuleConstants;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -153,7 +155,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
* @Description 表决中议题详情——支持、反对数
* @author zxc
*/
@Override
/*@Override
public VoteResultDTO voteCount(TokenDto tokenDto, IssueIdFormDTO issueId) {
VoteResultDTO voteResultDTO = issueVoteStatisticalDao.voteCount(issueId);
//校验是否已经投票
@ -170,6 +172,22 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
}
}
return voteResultDTO;
}*/
@Override
public VoteResultDTO voteCount(TokenDto tokenDto, IssueIdFormDTO issueId) {
VoteResultDTO result = new VoteResultDTO();
//校验是否已经投票
String voteStatus = issueVoteStatisticalDao.checkVote(issueId.getIssueId(), tokenDto.getUserId());
VoteRedisFormDTO redisData = issueVoteDetailRedis.getVoteStatistical(issueId.getIssueId());
if (StringUtils.isBlank(voteStatus)) {
result.setVoteFlag(false);
} else {
result.setVoteFlag(true);
result.setVoteType(voteStatus);
result.setSupportCount(redisData.getSupportAmount());
result.setOppositionCount(redisData.getOppositionAmount());
}
return result;
}
@ -226,7 +244,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
formDTO.setPageNo(pageIndex);
List<EvaluationListResultDTO> data = issueSatisfactionDetailDao.evaluationList(formDTO);
if (data.size() == NumConstant.ZERO || data == null) {
if (data == null || data.size() == NumConstant.ZERO ) {
return new ArrayList<>();
}
//获取头像和昵称 eg:山东路168号-周先生
@ -237,14 +255,13 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
if (null == userResiInfoList || userResiInfoList.size() < NumConstant.ONE) {
throw new RenException(IssueConstant.SELECT_USERINFO_EXCEPTION);
}
List<EvaluationListResultDTO> resultList = data.stream().flatMap(evaluation -> userResiInfoList.stream().filter(user ->
return data.stream().flatMap(evaluation -> userResiInfoList.stream().filter(user ->
evaluation.getUserId().equals(user.getUserId())).map(userInfo -> {
EvaluationListResultDTO resultDTO = ConvertUtils.sourceToTarget(evaluation, EvaluationListResultDTO.class);
resultDTO.setUserNickName(null == userInfo.getShowName() ? "" : userInfo.getShowName());
resultDTO.setUserHeadPhoto(null == userInfo.getHeadPhoto() ? "" : userInfo.getHeadPhoto());
resultDTO.setUserNickName(null == userInfo.getShowName() ? StrConstant.EPMETY_STR : userInfo.getShowName());
resultDTO.setUserHeadPhoto(null == userInfo.getHeadPhoto() ? StrConstant.EPMETY_STR : userInfo.getHeadPhoto());
return resultDTO;
})).collect(Collectors.toList());
return resultList;
}
/**
@ -283,7 +300,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
List<IssueVoteStatisticalDTO> statisticalList =
baseDao.selectListByIds(ids);
if (null != statisticalList && statisticalList.size() > NumConstant.ZERO) {
List<String> statisiticalIds = statisticalList.stream().map(vote -> vote.getIssueId()).collect(Collectors.toList());
List<String> statisiticalIds = statisticalList.stream().map(IssueVoteStatisticalDTO::getIssueId).collect(Collectors.toList());
if (ids.size() > statisiticalIds.size()) {
//差集
@ -325,16 +342,19 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
notExistedIds.removeAll(votedIssueIds);
if(!notExistedIds.isEmpty()){
List<IssueVoteStatisticalDTO> collect = notExistedIds.stream().map(issueId -> {
IssueVoteStatisticalDTO dto = new IssueVoteStatisticalDTO();
dto.setIssueId(issueId);
dto.setSupportCount(NumConstant.ZERO);
dto.setOppositionCount(NumConstant.ZERO);
dto.setVotableCount(Optional.ofNullable(votableCountMap.get(issueGridMap.get(issueId))).orElse(NumConstant.ZERO));
dto.setCreatedBy(ModuleConstants.CREATED_BY_SYSTEM);dto.setUpdatedBy(ModuleConstants.CREATED_BY_SYSTEM);
return dto;
}).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(collect)) toInsert.addAll(collect);}
List<IssueVoteStatisticalDTO> collect = notExistedIds.stream().map(issueId -> {
IssueVoteStatisticalDTO dto = new IssueVoteStatisticalDTO();
dto.setIssueId(issueId);
dto.setSupportCount(NumConstant.ZERO);
dto.setOppositionCount(NumConstant.ZERO);
dto.setVotableCount(Optional.ofNullable(votableCountMap.get(issueGridMap.get(issueId))).orElse(NumConstant.ZERO));
dto.setCreatedBy(ModuleConstants.CREATED_BY_SYSTEM);dto.setUpdatedBy(ModuleConstants.CREATED_BY_SYSTEM);
return dto;
}).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(collect)) {
toInsert.addAll(collect);
}
}
/*
List<IssueAttitudeCountResultDTO> summaryList = issueVoteDetailDao.getVotingSummaryList(notExistedIds);
@ -427,8 +447,11 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
List<IssueVoteStatisticalDTO> listToUpdate = new ArrayList<>();
setVotableCountsAndUpdateCache(listToUpdate,issues,votableCountMap);
// listToUpdate批量更新
baseDao.updateBatchByIssueId(listToUpdate);
// listToUpdate批量更新 todo 暂时解决下 分批插入
if (CollectionUtils.isNotEmpty(listToUpdate)) {
ListUtils.partition(listToUpdate, NumConstant.ONE_HUNDRED)
.forEach(part -> baseDao.updateBatchByIssueId(part));
}
}
}else{
@ -550,8 +573,12 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
IssueVoteStatisticalDTO vote = new IssueVoteStatisticalDTO();
vote.setIssueId(issue.getId());
VoteRedisFormDTO cache = issueVoteDetailRedis.getVoteStatistical(issue.getId());
if(null == cache) continue;
if(StringUtils.isBlank(cache.getIssueId())) cache.setIssueId(issue.getId());
if(null == cache) {
continue;
}
if(StringUtils.isBlank(cache.getIssueId())) {
cache.setIssueId(issue.getId());
}
vote.setCreatedBy(ModuleConstants.CREATED_BY_SYSTEM);
vote.setUpdatedBy(ModuleConstants.CREATED_BY_SYSTEM);
vote.setSupportCount(cache.getSupportAmount());
@ -563,7 +590,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
list.add(vote);
if(cache.getShouldVoteCount() != vote.getVotableCount()){
if(!cache.getShouldVoteCount().equals(vote.getVotableCount())){
cache.setShouldVoteCount(vote.getVotableCount());
cache.setIssueId(issue.getId());
issueVoteDetailRedis.set(cache);

5
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java
View File

@ -34,12 +34,13 @@ public class BlockChainUploadServiceImpl implements BlockChainUploadService {
* @param processEntity 处理进展entity
* @param assignedStaffEntities 指派给的工作人员entity
*/
@Override
public void send2BlockChain(ProjectEntity projectEntity, ProjectProcessEntity processEntity, List<ProjectStaffEntity> assignedStaffEntities, String projectStaffId) {
if (true) {
return;
}
// 1.项目主信息
BlockChainProjectFormDTO project = null;
@ -131,7 +132,7 @@ public class BlockChainUploadServiceImpl implements BlockChainUploadService {
handledStaff.setOrgIdPath(handledStaffEntity.getOrgIdPath());
handledStaff.setProjectId(handledStaffEntity.getProjectId());
}
if (project == null) {
// 处理
BlockChainProcessProjectFormDTO processForm = new BlockChainProcessProjectFormDTO();

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

@ -2871,8 +2871,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
formDTO.setOrgId(staffInfo.getAgencyId());
}
Result<List<CategoryListResultDTO>> listResult = govIssueOpenFeignClient.selectCategoryOneLevelListByCustomerId(tokenDto);
if (!listResult.success()){
throw new EpmetException("查询1级分类列表失败...");
if (!listResult.success() || CollectionUtils.isEmpty(listResult.getData())){
throw new EpmetException("查询1级分类列表失败或者结果集为空...");
}
List<ProjectCategoryByDateDTO> projectCategoryByDateDTOS = baseDao.selectProjectCategoryByDate(formDTO.getStartDate(),formDTO.getEndDate(), formDTO.getOrgId(), listResult.getData().get(NumConstant.ZERO).getCodeLength());
if (CollectionUtils.isEmpty(projectCategoryByDateDTOS)){

3
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
View File

@ -276,6 +276,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
* @param formDTO
* @return
*/
@Override
public EventDetailResultDTO eventDetailForIcData(ResiEventDetailFormDTO formDTO){
return getEventDetailResultDTO(formDTO.getResiEventId());
}
@ -1079,4 +1080,4 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
return result.getList();
}
}
}

3
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
View File

@ -243,6 +243,7 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl<NoticeCommentDao,
* @Author sun
* @Description 文字、图片安全校验
**/
@Override
public void safetyCheck(List<String> wordList, List<String> imageList) {
if (imageList.size() != NumConstant.ZERO) {
wordList.forEach(word -> {
@ -286,4 +287,4 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl<NoticeCommentDao,
}
}
}
}

1
epmet-user/epmet-user-server/src/main/java/com/epmet/handler/ExcelDiceAddressListHandlerImpl.java
View File

@ -21,6 +21,7 @@ public class ExcelDiceAddressListHandlerImpl implements IExcelDictHandler {
* @param dict 字典Key
* @return
*/
@Override
public List<Map> getList(String dict) {
List<Map> list = new ArrayList<>();
Map<String, String> dictMap = new HashMap<>();

2
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java
View File

@ -17,7 +17,6 @@ import com.epmet.feign.EpmetHeartOpenFeignClient;
import com.epmet.feign.GovOrgOpenFeignClient;
import com.epmet.feign.OperCustomizeOpenFeignClient;
import com.epmet.service.VolunteerService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,6 +53,7 @@ public class VolunteerServiceImpl implements VolunteerService, ResultDataResolve
* @param customerId
* @return
*/
@Override
public VolunteerDistributionResultDTO getVolunteerDistributionAndLegends(String customerId, String agencyId) {
// 1.查询分布

Write Preview
Loading…
Cancel
Save