项目详情判断是否可退回

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java

@@ -51,7 +51,7 @@ public class ProjectDetailResultDTO implements Serializable {
 	/**
 	 * 是否是转项目节点
 	 */
-	private Boolean isCreated;
+	private Boolean returnable;
 	/**
 	 * 当前跟进部门
 	 */

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

@@ -266,7 +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);
+			resultDTO.setReturnable(false);
 		} else {
 			//获取我未处理的部门
 			ProjectStaffDTO projectStaffDTO = new ProjectStaffDTO();
@@ -278,11 +278,13 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			} else {
 				resultDTO.setProcessable(false);
 			}
-			List<String> created = projectStaffService.getCreatedProcess(projectStaffDTO);
+			ReturnListFromDTO returnListFromDTO = new ReturnListFromDTO();
-			if (null != created && created.size() > NumConstant.ZERO) {
+			returnListFromDTO.setProjectId(fromDTO.getProjectId());
-				resultDTO.setIsCreated(true);
+			List<ReturnListResultDTO> returnableList = projectProcessService.getReturnableList(returnListFromDTO);
+			if (null != returnableList && returnableList.size() > NumConstant.ZERO) {
+				resultDTO.setReturnable(true);
 			} else {
-				resultDTO.setIsCreated(false);
+				resultDTO.setReturnable(false);
 			}
 		}
 

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml

@@ -62,7 +62,7 @@
         WHERE
             ps.DEL_FLAG = '0'
           AND ps.PROJECT_ID = #{projectId}
-          AND STAFF_ID = #{staffId}
+          AND ps.STAFF_ID = #{staffId}
           AND IS_HANDLE = 'unhandled'
     </select>