Merge branch 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform

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

@@ -65,6 +65,11 @@ public class ProjectDetailResultDTO implements Serializable {
 	 */
 	private Boolean isSend;
 
+	/**
+	 * 当前流转到外部系统的ID
+	 */
+	private List<String> platformIds;
+
 	@NoArgsConstructor
 	@Data
 	public static class DepartmentNameListBean {

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java

@@ -86,4 +86,12 @@ public interface ProjectProcessDao extends BaseDao<ProjectProcessEntity> {
      * @date 2020/12/21 下午4:18
      */
     List<ProcessListV2ResultDTO> selectProcessList(@Param("projectId")String projectId);
+
+    /**
+     * @Description  查询当前流转到外部系统的ID
+     * @Param projectId
+     * @author zxc
+     * @date 2021/3/19 上午10:18
+     */
+    List<String> selectPlatFormIds(@Param("projectId") String projectId);
 }

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

@@ -159,4 +159,12 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
      **/
     void transferV2(TransferFormDTO formDTO);
 
+    /**
+     * @Description  查询当前流转到外部系统的ID
+     * @Param projectId
+     * @author zxc
+     * @date 2021/3/19 上午10:18
+     */
+    List<String> selectPlatFormIds(String projectId);
+
 }

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

@@ -730,4 +730,17 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
         }
     }
 
+    /**
+     * @Description  查询当前流转到外部系统的ID
+     * @Param projectId
+     * @author zxc
+     * @date 2021/3/19 上午10:18
+     */
+    @Override
+    public List<String> selectPlatFormIds(String projectId) {
+        List<String> platFormIds = baseDao.selectPlatFormIds(projectId);
+        if (CollectionUtils.isEmpty(platFormIds))return new ArrayList<>();
+        return platFormIds;
+    }
+
 }

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

@@ -288,6 +288,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		customerProjectParameterDTO.setParameterKey(ProjectConstant.EXTERNAL_SYSTEM);
 		String parameterValue = parameterService.getParameterValueByKey(customerProjectParameterDTO);
 		ProjectDetailResultDTO resultDTO = baseDao.selectProjectDetail(fromDTO.getProjectId());
+		// 查询当前流转到外部系统的ID
+		resultDTO.setPlatformIds(projectProcessService.selectPlatFormIds(fromDTO.getProjectId()));
 		resultDTO.setIsSend((StringUtils.isEmpty(parameterValue) || parameterValue.equals(NumConstant.ZERO_STR)) ? false : resultDTO.getProcessable());
 		if (ProjectConstant.CLOSED.equals(resultDTO.getProjectStatus())) {
 			resultDTO.setProcessable(false);

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

@@ -101,4 +101,14 @@
               AND PROJECT_ID = #{projectId}
               order by created_time desc
     </select>
+
+    <!-- 查询当前流转到外部系统的ID -->
+    <select id="selectPlatFormIds" resultType="java.lang.String">
+        SELECT
+            DISTINCT psp.PLATFORM_ID
+        FROM project_process pp
+        LEFT JOIN project_sub_process psp ON psp.PROCESS_ID = pp.ID
+        WHERE psp.DEL_FLAG = 0
+            AND pp.PROJECT_ID = #{projectId}
+    </select>
 </mapper>