diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java index 4fb104b4a1..48d1beddaa 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java @@ -89,9 +89,10 @@ public interface FactOriginProjectLogDailyDao extends BaseDao */ - List getPendingList(@Param("customerId") String customerId); + List getPendingList(@Param("customerId") String customerId, String projectId); /** * 项目超期数 @@ -91,9 +92,10 @@ public interface FactOriginProjectMainDailyDao extends BaseDao { * * @param customerId * @param date + * @param projectId * @return java.util.List * @author zhaoqifeng * @date 2020/9/15 16:13 */ - List selectProjectInfo(@Param("customerId") String customerId, @Param("date") String date); + List selectProjectInfo(@Param("customerId") String customerId, @Param("date") String date, String projectId); /** * 获取用户可滞留天数 @@ -144,11 +145,12 @@ public interface ProjectDao extends BaseDao { * 获取项目满意度 * * @param customerId + * @param projectId * @return java.util.List * @author zhaoqifeng * @date 2021/5/21 10:06 */ - List selectProjectSatisfaction(@Param("customerId") String customerId); + List selectProjectSatisfaction(@Param("customerId") String customerId, String projectId); /** * 根据key查找value diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java index f9647a4fe0..68535efc4f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java @@ -56,9 +56,10 @@ public interface ProjectProcessDao extends BaseDao { * @date 2020/9/16 15:18 * @param customerId * @param date + * @param projectId * @return java.util.List */ - List selectProcessListByCustomer(@Param("customerId") String customerId, @Param("date") String date); + List selectProcessListByCustomer(@Param("customerId") String customerId, @Param("date") String date, String projectId); /** * 根据客户查询响应节点 @@ -66,9 +67,10 @@ public interface ProjectProcessDao extends BaseDao { * @date 2020/9/16 15:18 * @param customerId * @param date + * @param projectId * @return java.util.List */ - List selectResponseProcessList(@Param("customerId") String customerId, @Param("date") String date); + List selectResponseProcessList(@Param("customerId") String customerId, @Param("date") String date, String projectId); /** * 查询各个节点的受理人 @@ -76,9 +78,10 @@ public interface ProjectProcessDao extends BaseDao { * @date 2020/9/17 10:54 * @param customerId * @param date + * @param projectId * @return java.util.List */ - List selectProcessStaffByCustomer(@Param("customerId") String customerId, @Param("date") String date); + List selectProcessStaffByCustomer(@Param("customerId") String customerId, @Param("date") String date, String projectId); /** * 获取满意度评价记录 @@ -86,9 +89,10 @@ public interface ProjectProcessDao extends BaseDao { * @date 2020/9/17 14:44 * @param customerId * @param date + * @param projectId * @return java.util.List */ - List selectSatisfactionRecordByCustomer(@Param("customerId") String customerId, @Param("date") String date); + List selectSatisfactionRecordByCustomer(@Param("customerId") String customerId, @Param("date") String date, String projectId); /** * 获取已结案的项目列表 @@ -96,9 +100,10 @@ public interface ProjectProcessDao extends BaseDao { * @date 2020/9/17 14:44 * @param customerId * @param date + * @param projectId * @return java.util.List */ - List selectClosedProjectList(@Param("customerId") String customerId, @Param("date") String date); + List selectClosedProjectList(@Param("customerId") String customerId, @Param("date") String date, String projectId); /** * @Description 查询项目-机关各个节点历时详情 * @param customerId @@ -143,9 +148,10 @@ public interface ProjectProcessDao extends BaseDao { * @date 2020/9/18 18:01 * @param customerId * @param date + * @param projectId * @return java.util.List */ - List selectFinishOrg(@Param("customerId") String customerId, @Param("date") String date); + List selectFinishOrg(@Param("customerId") String customerId, @Param("date") String date, String projectId); /** * @Description 查找项目最近一次操作说明 @@ -179,4 +185,4 @@ public interface ProjectProcessDao extends BaseDao { List selectProjectProcessAndDirection(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param("dataEndTime")String dataEndTime ); List selectProcessAttachment(@Param("list")List list); -} \ No newline at end of file +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java index b3b50560f6..0dca827c0a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java @@ -132,9 +132,10 @@ public interface FactOriginProjectLogDailyService extends BaseService getProjectHandledAgency(List agencies, String customerId, String dimId); - + /** * @Description 办结率 * @param agencies @@ -344,7 +345,7 @@ public interface FactOriginProjectLogDailyService extends BaseService> */ Map> getProjectClosedCount(String customerId, String dateId, Integer type); -} \ No newline at end of file +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java index 056de60e3e..92e175a510 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java @@ -58,9 +58,10 @@ public interface FactOriginProjectMainDailyService extends BaseService */ - List getPendingList(String customerId); + List getPendingList(String customerId, String projectId); /** * @Description 网格办结项目数 @@ -90,9 +91,10 @@ public interface FactOriginProjectMainDailyService extends BaseService getPendingList(String customerId) { - return baseDao.getPendingList(customerId); + public List getPendingList(String customerId, String projectId) { + return baseDao.getPendingList(customerId, projectId); } @Override @@ -108,8 +108,8 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl list = new LinkedList<>(); //获取已关闭项目列表 - List closedList = projectProcessService.getClosedProjectList(customerId, dateString); - List pendingList = factOriginProjectMainDailyService.getPendingList(customerId); - List finishOrgList = projectProcessService.getFinishOrg(customerId, dateString); + List closedList = projectProcessService.getClosedProjectList(customerId, dateString, projectId); + List pendingList = factOriginProjectMainDailyService.getPendingList(customerId, projectId); + List finishOrgList = projectProcessService.getFinishOrg(customerId, dateString, projectId); if (!CollectionUtils.isEmpty(closedList)) { if(!CollectionUtils.isEmpty(pendingList)) { List closeProjects = @@ -124,8 +125,8 @@ public class ProjectExtractServiceImpl implements ProjectExtractService { } } //获取项目信息 - List projectList = projectService.getProjectInfo(customerId, dateString); - factOriginProjectMainDailyService.deleteByDate(customerId, dateString); + List projectList = projectService.getProjectInfo(customerId, dateString, projectId); + factOriginProjectMainDailyService.deleteByDate(customerId, dateString,projectId); if (!CollectionUtils.isEmpty(projectList)) { Map projectEventMap = projectService.getEventList(customerId); //提取议题ID @@ -230,7 +231,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService { } //满意度 - List satisfaction = projectService.getProjectSatisfaction(customerId); + List satisfaction = projectService.getProjectSatisfaction(customerId, projectId); if (CollectionUtils.isNotEmpty(satisfaction)) { factOriginProjectMainDailyService.updateBatchById(satisfaction); } @@ -238,7 +239,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService { final List mainList = list; List logList = new ArrayList<>(); //节点发起人 部门流转退回结案 - List processList = projectProcessService.getProcessListByCustomer(customerId, dateString); + List 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 responseList = projectProcessService.getResponseProcessList(customerId, dateString); + List 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 satisfactionRecordList = projectProcessService.getSatisfactionRecord(customerId, dateString); + List 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 processStaffList = projectProcessService.getProcessStaffByCustomer(customerId, dateString); + List 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); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java index 230238b288..7215caaa8d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java @@ -231,7 +231,7 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr return false; } //获取业务库项目标题 - List bizProjectInfoList = projectService.getProjectInfo(param.getCustomerId(), null); + List bizProjectInfoList = projectService.getProjectInfo(param.getCustomerId(), null, null); if (CollectionUtils.isEmpty(bizProjectInfoList)) { log.warn("difficultyDataExtract customerId:{} have any project", param.getCustomerId()); return false; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java index 84386e9ec3..5ed51e7274 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java @@ -52,9 +52,10 @@ public interface ProjectProcessService extends BaseService * @date 2020/9/16 15:42 * @param customerId * @param date + * @param projectId * @return java.util.List */ - List getProcessListByCustomer(String customerId, String date); + List getProcessListByCustomer(String customerId, String date, String projectId); /** * 根据客户查询响应节点 @@ -62,9 +63,10 @@ public interface ProjectProcessService extends BaseService * @date 2020/9/30 16:27 * @param customerId * @param date + * @param projectId * @return java.util.List */ - List getResponseProcessList(String customerId, String date); + List getResponseProcessList(String customerId, String date, String projectId); /** * 查询各个节点的受理人 @@ -72,9 +74,10 @@ public interface ProjectProcessService extends BaseService * @date 2020/9/17 10:53 * @param customerId * @param date + * @param projectId * @return java.util.List */ - List getProcessStaffByCustomer(String customerId, String date); + List getProcessStaffByCustomer(String customerId, String date, String projectId); /** * 获取满意度评价记录 @@ -82,9 +85,10 @@ public interface ProjectProcessService extends BaseService * @date 2020/9/17 13:59 * @param customerId * @param date + * @param projectId * @return java.util.List */ - List getSatisfactionRecord(String customerId, String date); + List getSatisfactionRecord(String customerId, String date, String projectId); /** * 获取已结案的项目列表 @@ -92,9 +96,10 @@ public interface ProjectProcessService extends BaseService * @date 2020/9/17 14:43 * @param customerId * @param date + * @param projectId * @return java.util.List */ - List getClosedProjectList(String customerId, String date); + List getClosedProjectList(String customerId, String date, String projectId); @@ -114,9 +119,10 @@ public interface ProjectProcessService extends BaseService * @date 2020/9/20 21:11 * @param customerId * @param date + * @param projectId * @return java.util.List */ - List getFinishOrg(String customerId, String date); + List getFinishOrg(String customerId, String date, String projectId); /** * @Description 获得项目最新操作 @@ -166,4 +172,4 @@ public interface ProjectProcessService extends BaseService * @date 2021.03.09 16:56 */ List buildProcessAttachmentData(List processIds); -} \ No newline at end of file +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java index ced07132f7..0c1810df1c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java @@ -94,9 +94,10 @@ public interface ProjectService extends BaseService { * @date 2020/9/15 16:09 * @param customerId * @param date + * @param projectId * @return java.util.List */ - List getProjectInfo(String customerId, String date); + List getProjectInfo(String customerId, String date, String projectId); /** * 获取用户可滞留天数 @@ -161,9 +162,10 @@ public interface ProjectService extends BaseService { * @author zhaoqifeng * @date 2021/5/21 10:04 * @param customerId + * @param projectId * @return java.util.List */ - List getProjectSatisfaction(String customerId); + List getProjectSatisfaction(String customerId, String projectId); List selectProjectListByDateId(String customerId, String yesterdayStr, String projectOriginAgency); /** @@ -197,6 +199,7 @@ public interface ProjectService extends BaseService { /** * 获取事件信息 * @param customerId + * @param projectId * @return */ Map getEventList(String customerId); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java index a71c61bfbd..ad4f3a7537 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java @@ -66,28 +66,28 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl getProcessListByCustomer(String customerId, String date) { - return baseDao.selectProcessListByCustomer(customerId, date); + public List getProcessListByCustomer(String customerId, String date, String projectId) { + return baseDao.selectProcessListByCustomer(customerId, date, projectId); } @Override - public List getResponseProcessList(String customerId, String date) { - return baseDao.selectResponseProcessList(customerId, date); + public List getResponseProcessList(String customerId, String date, String projectId) { + return baseDao.selectResponseProcessList(customerId, date, projectId); } @Override - public List getProcessStaffByCustomer(String customerId, String date) { - return baseDao.selectProcessStaffByCustomer(customerId, date); + public List getProcessStaffByCustomer(String customerId, String date, String projectId) { + return baseDao.selectProcessStaffByCustomer(customerId, date, projectId); } @Override - public List getSatisfactionRecord(String customerId, String date) { - return baseDao.selectSatisfactionRecordByCustomer(customerId, date); + public List getSatisfactionRecord(String customerId, String date, String projectId) { + return baseDao.selectSatisfactionRecordByCustomer(customerId, date, projectId); } @Override - public List getClosedProjectList(String customerId, String date) { - return baseDao.selectClosedProjectList(customerId, date); + public List getClosedProjectList(String customerId, String date, String projectId) { + return baseDao.selectClosedProjectList(customerId, date, projectId); } @@ -106,8 +106,8 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl getFinishOrg(String customerId, String date) { - return baseDao.selectFinishOrg(customerId, date); + public List getFinishOrg(String customerId, String date, String projectId) { + return baseDao.selectFinishOrg(customerId, date, projectId); } /** @@ -216,4 +216,4 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl buildProcessAttachmentData(List processIds) { return baseDao.selectProcessAttachment(processIds); } -} \ No newline at end of file +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java index 5084e99852..dd03758d43 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java @@ -78,8 +78,8 @@ public class ProjectServiceImpl extends BaseServiceImpl getProjectInfo(String customerId, String date) { - return baseDao.selectProjectInfo(customerId, date); + public List getProjectInfo(String customerId, String date, String projectId) { + return baseDao.selectProjectInfo(customerId, date, projectId); } @Override @@ -169,13 +169,14 @@ public class ProjectServiceImpl extends BaseServiceImpl * @author zhaoqifeng * @date 2021/5/21 10:04 */ @Override - public List getProjectSatisfaction(String customerId) { - List list = baseDao.selectProjectSatisfaction(customerId); + public List getProjectSatisfaction(String customerId, String projectId) { + List list = baseDao.selectProjectSatisfaction(customerId, projectId); if (org.apache.commons.collections4.CollectionUtils.isEmpty(list)) { return Collections.emptyList(); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml index 4e28cbb74b..36c72e368b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml @@ -10,6 +10,9 @@ AND DATE_ID = #{date} + + AND PROJECT_ID = #{projectId} + - \ No newline at end of file + diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml index f111a535eb..4ca4c5e447 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml @@ -41,7 +41,12 @@ ID, DATE_ID FROM fact_origin_project_main_daily - WHERE CUSTOMER_ID = #{customerId} + WHERE + 1=1 + + AND ID = #{projectId} + + AND CUSTOMER_ID = #{customerId} AND PROJECT_STATUS = 'pending' - \ No newline at end of file +