From d85fb62cbc96db5d6da80e8a24f2742080d0fafd Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 27 Aug 2020 14:40:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E6=98=AF=E9=A6=96=E6=AC=A1=E6=8E=A5?=
 =?UTF-8?q?=E6=94=B6=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/ProjectDetailResultDTO.java |  4 ++++
 .../src/main/java/com/epmet/dao/ProjectStaffDao.java |  9 +++++++++
 .../java/com/epmet/service/ProjectStaffService.java  |  9 +++++++++
 .../com/epmet/service/impl/ProjectServiceImpl.java   |  7 +++++++
 .../epmet/service/impl/ProjectStaffServiceImpl.java  |  5 +++++
 .../src/main/resources/mapper/ProjectStaffDao.xml    | 12 ++++++++++++
 6 files changed, 46 insertions(+)

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<ProjectStaffEntity> {
 	 * @Description 查询当前处于项目节点中的切工作未处理的工作人员
 	 **/
     List<ProjectStaffDTO> selectProjectTransferStaffList(ProjectStaffDTO dto);
+
+    /**
+     * 获取未处理的转项目节点
+     * @author zhaoqifeng
+     * @date 2020/8/27 14:26
+     * @param dto
+     * @return java.util.List<java.lang.String>
+     */
+    List<String> 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<ProjectStaffEntity> {
      * @return java.util.List<java.lang.String>
      */
     List<String> getStaffsByProjectId(String projectId);
+
+    /**
+     * 获取未处理的转项目节点
+     * @author zhaoqifeng
+     * @date 2020/8/27 14:30
+     * @param dto
+     * @return java.util.List<java.lang.String>
+     */
+    List<String> 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<ProjectDao, ProjectEntit
 		ProjectDetailResultDTO resultDTO = baseDao.selectProjectDetail(fromDTO.getProjectId());
 		if (ProjectConstant.CLOSED.equals(resultDTO.getProjectStatus())) {
 			resultDTO.setProcessable(false);
+			resultDTO.setIsCreated(false);
 		} else {
 			//获取我未处理的部门
 			ProjectStaffDTO projectStaffDTO = new ProjectStaffDTO();
@@ -277,6 +278,12 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			} else {
 				resultDTO.setProcessable(false);
 			}
+			List<String> 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<ProjectStaffDao, Pr
         return baseDao.selectStaffsByProjectId(projectId);
     }
 
+    @Override
+    public List<String> 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}
     </select>
+    <select id="selectCreatedProcess" resultType="java.lang.String" parameterType="com.epmet.dto.ProjectStaffDTO">
+        SELECT
+            pp.ID
+        FROM
+            project_staff ps
+        INNER JOIN project_process pp ON ps.PROCESS_ID = pp.ID AND pp.DEL_FLAG = '0' AND pp.OPERATION = 'created'
+        WHERE
+            ps.DEL_FLAG = '0'
+          AND ps.PROJECT_ID = #{projectId}
+          AND STAFF_ID = #{staffId}
+          AND IS_HANDLE = 'unhandled'
+    </select>
 
 </mapper>
\ No newline at end of file