diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java index dca510a468..e1e9658a0a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java @@ -52,12 +52,12 @@ public interface ProjectSubProcessDao extends BaseDao { List selectSubProcessAndAttachment(@Param("processIds")List processIds); /** - * 根据platformId查找最新的记录 + * 根据taskId查找最新的记录 * @author zhaoqifeng * @date 2021/3/19 15:26 - * @param platformId + * @param taskId * @return com.epmet.dto.ProjectSubProcessDTO */ - ProjectSubProcessDTO selectSubProcessByPlatformId(@Param("platformId") String platformId); + ProjectSubProcessDTO selectSubProcessByTaskId(@Param("taskId") String taskId); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java index 702192d210..cfc6180e6a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSubProcessService.java @@ -115,8 +115,8 @@ public interface ProjectSubProcessService extends BaseService files = new ArrayList<>(); for (String url : issueDetail.getData().getTopicInfo().getPhotoList()) { Result multipartFileResult = - HttpClientManager.getInstance().getFileItem(url, UUID.randomUUID().toString().replace("-", "")); + HttpClientManager.getInstance().getFileItem(url, "image." + FilenameUtils.getExtension(url)); if (!multipartFileResult.success()) { throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg()); } @@ -2274,7 +2275,7 @@ public class ProjectServiceImpl extends BaseServiceImpl files = new ArrayList<>(); for (TopicFileResultDTO item : topicAttachment.getData().getVoiceList()) { Result multipartFileResult = - HttpClientManager.getInstance().getFileItem(item.getUrl(), UUID.randomUUID().toString().replace("-", "")); + HttpClientManager.getInstance().getFileItem(item.getUrl(), "voice." + FilenameUtils.getExtension(item.getUrl())); if (!multipartFileResult.success()) { throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg()); } @@ -2293,7 +2294,7 @@ public class ProjectServiceImpl extends BaseServiceImpl files = new ArrayList<>(); for (TopicFileResultDTO item : topicAttachment.getData().getVideoList()) { Result multipartFileResult = - HttpClientManager.getInstance().getFileItem(item.getUrl(), UUID.randomUUID().toString().replace("-", "")); + HttpClientManager.getInstance().getFileItem(item.getUrl(), "video." + FilenameUtils.getExtension(item.getUrl())); if (!multipartFileResult.success()) { throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg()); } @@ -2312,7 +2313,7 @@ public class ProjectServiceImpl extends BaseServiceImpl files = new ArrayList<>(); for (TopicFileResultDTO item : topicAttachment.getData().getDocList()) { Result multipartFileResult = - HttpClientManager.getInstance().getFileItem(item.getUrl(), UUID.randomUUID().toString().replace("-", "")); + HttpClientManager.getInstance().getFileItem(item.getUrl(), "doc." + FilenameUtils.getExtension(item.getUrl())); if (!multipartFileResult.success()) { throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg()); } @@ -2402,7 +2403,7 @@ public class ProjectServiceImpl extends BaseServiceImpl - select ID, CUSTOMER_ID, @@ -103,7 +103,7 @@ from project_sub_process where DEL_FLAG = '0' - AND PLATFORM_ID = #{platformId} + AND TASK_ID = #{taskId} order by CREATED_TIME DESC limit 1