diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 534810e8b9..afa7f9782f 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -403,9 +403,12 @@ public class IssueServiceImpl extends BaseServiceImpl imp historyService.save(history); if (!ifOpen) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(param.getCreatedTime()); + calendar.add(Calendar.SECOND,NumConstant.ONE_NEG); IssueApplicationHistoryDTO repeatApplyRecord = new IssueApplicationHistoryDTO(); repeatApplyRecord.setActionType(ModuleConstants.ISSUE_APPLICATION_STATUS_UNDER_AUDITING); - repeatApplyRecord.setCreatedTime(param.getCreatedTime()); + repeatApplyRecord.setCreatedTime(calendar.getTime()); repeatApplyRecord.setCustomerId(param.getCustomerId()); repeatApplyRecord.setIssueApplicationId(id); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml index 33da8566ba..46c6878c8e 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml @@ -32,6 +32,7 @@ WHERE iah.DEL_FLAG = '0' AND ia.DEL_FLAG = '0' AND ia.ISSUE_ID = #{issueId} + ORDER BY iah.CREATED_TIME DESC \ No newline at end of file