diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java index 62f3100301..8ad21b2082 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java @@ -48,6 +48,10 @@ public class ProjectDetailResultDTO implements Serializable { * 处理状态(是否由我处理) */ private Boolean processable; + /** + * 是否是转项目节点 + */ + private Boolean isCreated; /** * 当前跟进部门 */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java index 78a7927b43..88bc5dadf2 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java @@ -70,4 +70,13 @@ public interface ProjectStaffDao extends BaseDao { * @Description 查询当前处于项目节点中的切工作未处理的工作人员 **/ List selectProjectTransferStaffList(ProjectStaffDTO dto); + + /** + * 获取未处理的转项目节点 + * @author zhaoqifeng + * @date 2020/8/27 14:26 + * @param dto + * @return java.util.List + */ + List selectCreatedProcess(ProjectStaffDTO dto); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java index 349068ce2c..af0ee6061d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java @@ -131,4 +131,13 @@ public interface ProjectStaffService extends BaseService { * @return java.util.List */ List getStaffsByProjectId(String projectId); + + /** + * 获取未处理的转项目节点 + * @author zhaoqifeng + * @date 2020/8/27 14:30 + * @param dto + * @return java.util.List + */ + List getCreatedProcess(ProjectStaffDTO dto); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 31566fc96b..ddacb38fed 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -266,6 +266,7 @@ public class ProjectServiceImpl extends BaseServiceImpl created = projectStaffService.getCreatedProcess(projectStaffDTO); + if (null != created && created.size() > NumConstant.ZERO) { + resultDTO.setIsCreated(true); + } else { + resultDTO.setIsCreated(false); + } } //获取当前跟进部门 diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java index 9dfa87eed5..e33943f2e4 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java @@ -150,4 +150,9 @@ public class ProjectStaffServiceImpl extends BaseServiceImpl getCreatedProcess(ProjectStaffDTO dto) { + return baseDao.selectCreatedProcess(dto); + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml index ebeb87a063..0b8cbe9bc6 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml @@ -53,5 +53,17 @@ AND project_id = #{projectId} AND is_handle = #{isHandle} + \ No newline at end of file