Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp

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<IssueDao, IssueEntity> 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);
 

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
     </select>
 
 </mapper>