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

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

dev_shibei_match
jianjun 4 years ago
parent
d11efb5858
commit
f2a85da553
18 changed files with 132 additions and 70 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-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
  2. 6
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
  3. 6
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java
  4. 20
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java
  5. 9
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectLogDailyService.java
  6. 6
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
  7. 6
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java
  8. 8
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
  9. 23
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
  10. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
  11. 20
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java
  12. 7
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
  13. 26
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java
  14. 9
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
  15. 5
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
  16. 10
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
  17. 8
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
  18. 26
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml

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

@ -89,9 +89,10 @@ public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectL
* @date 2020/9/18 17:32
* @param customerId
* @param date
* @return void
* @param projectId
* @return void
*/
void deleteByDate(@Param("customerId") String customerId, @Param("date") String date);
void deleteByDate(@Param("customerId") String customerId, @Param("date") String date, String projectId);
/**
* 办结项目满意度

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

@ -59,9 +59,10 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
* @author zhaoqifeng
* @date 2020/9/17 14:32
* @param customerId
* @param projectId
* @return java.util.List<com.epmet.dto.extract.FactOriginProjectMainDailyDTO>
*/
List<FactOriginProjectMainDailyDTO> getPendingList(@Param("customerId") String customerId);
List<FactOriginProjectMainDailyDTO> getPendingList(@Param("customerId") String customerId, String projectId);
/**
* 项目超期数
@ -91,9 +92,10 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
* @date 2020/9/18 17:32
* @param customerId
* @param date
* @param projectId
* @return void
*/
void deleteByDate(@Param("customerId") String customerId, @Param("date") String date);
void deleteByDate(@Param("customerId") String customerId, @Param("date") String date, String projectId);
/**
* @param customerId

6
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, String projectId);
/**
* 获取用户可滞留天数
@ -144,11 +145,12 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
* 获取项目满意度
*
* @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, String projectId);
/**
* 根据key查找value

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

@ -56,9 +56,10 @@ public interface ProjectProcessDao extends BaseDao<ProjectProcessEntity> {
* @date 2020/9/16 15:18
* @param customerId
* @param date
* @param projectId
* @return java.util.List<com.epmet.entity.project.ProjectProcessEntity>
*/
List<ProcessInfoDTO> selectProcessListByCustomer(@Param("customerId") String customerId, @Param("date") String date);
List<ProcessInfoDTO> selectProcessListByCustomer(@Param("customerId") String customerId, @Param("date") String date, String projectId);
/**
* 根据客户查询响应节点
@ -66,9 +67,10 @@ public interface ProjectProcessDao extends BaseDao<ProjectProcessEntity> {
* @date 2020/9/16 15:18
* @param customerId
* @param date
* @param projectId
* @return java.util.List<com.epmet.entity.project.ProjectProcessEntity>
*/
List<ProcessInfoDTO> selectResponseProcessList(@Param("customerId") String customerId, @Param("date") String date);
List<ProcessInfoDTO> selectResponseProcessList(@Param("customerId") String customerId, @Param("date") String date, String projectId);
/**
* 查询各个节点的受理人
@ -76,9 +78,10 @@ public interface ProjectProcessDao extends BaseDao<ProjectProcessEntity> {
* @date 2020/9/17 10:54
* @param customerId
* @param date
* @param projectId
* @return java.util.List<com.epmet.dto.project.ProcessInfoDTO>
*/
List<ProcessInfoDTO> selectProcessStaffByCustomer(@Param("customerId") String customerId, @Param("date") String date);
List<ProcessInfoDTO> selectProcessStaffByCustomer(@Param("customerId") String customerId, @Param("date") String date, String projectId);
/**
* 获取满意度评价记录
@ -86,9 +89,10 @@ public interface ProjectProcessDao extends BaseDao<ProjectProcessEntity> {
* @date 2020/9/17 14:44
* @param customerId
* @param date
* @param projectId
* @return java.util.List<com.epmet.dto.project.ProcessInfoDTO>
*/
List<ProcessInfoDTO> selectSatisfactionRecordByCustomer(@Param("customerId") String customerId, @Param("date") String date);
List<ProcessInfoDTO> selectSatisfactionRecordByCustomer(@Param("customerId") String customerId, @Param("date") String date, String projectId);
/**
* 获取已结案的项目列表
@ -96,9 +100,10 @@ public interface ProjectProcessDao extends BaseDao<ProjectProcessEntity> {
* @date 2020/9/17 14:44
* @param customerId
* @param date
* @param projectId
* @return java.util.List<java.lang.String>
*/
List<ProjectProcessEntity> selectClosedProjectList(@Param("customerId") String customerId, @Param("date") String date);
List<ProjectProcessEntity> selectClosedProjectList(@Param("customerId") String customerId, @Param("date") String date, String projectId);
/**
* @Description 查询项目-机关各个节点历时详情
* @param customerId
@ -143,9 +148,10 @@ public interface ProjectProcessDao extends BaseDao<ProjectProcessEntity> {
* @date 2020/9/18 18:01
* @param customerId
* @param date
* @param projectId
* @return java.util.List<com.epmet.dto.project.FinishOrgDTO>
*/
List<FinishOrgDTO> selectFinishOrg(@Param("customerId") String customerId, @Param("date") String date);
List<FinishOrgDTO> selectFinishOrg(@Param("customerId") String customerId, @Param("date") String date, String projectId);
/**
* @Description 查找项目最近一次操作说明
@ -179,4 +185,4 @@ public interface ProjectProcessDao extends BaseDao<ProjectProcessEntity> {
List<ScreenProjectProcessDTO> selectProjectProcessAndDirection(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param("dataEndTime")String dataEndTime );
List<ScreenProjectProcessAttachmentDTO> selectProcessAttachment(@Param("list")List<String> list);
}
}

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

6
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

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

8
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);
}
/**

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

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;

20
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,9 +96,10 @@ 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);
@ -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 获得项目最新操作
@ -166,4 +172,4 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
* @date 2021.03.09 16:56
*/
List<ScreenProjectProcessAttachmentDTO> buildProcessAttachmentData(List<String> processIds);
}
}

7
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);
/**
* 获取用户可滞留天数
@ -161,9 +162,10 @@ public interface ProjectService extends BaseService<ProjectEntity> {
* @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);

26
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);
}
@ -106,8 +106,8 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
}
@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);
}
/**
@ -216,4 +216,4 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
public List<ScreenProjectProcessAttachmentDTO> buildProcessAttachmentData(List<String> processIds) {
return baseDao.selectProcessAttachment(processIds);
}
}
}

9
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
@ -169,13 +169,14 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
* 获取项目满意度
*
* @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();
}

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>

10
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>

8
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>
@ -171,6 +174,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

26
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}
@ -245,7 +259,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 +315,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'
@ -420,4 +440,4 @@
PROCESS_ID = #{processId}
</foreach>
</select>
</mapper>
</mapper>

Write Preview
Loading…
Cancel
Save