审批工单接口修改

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/AuditLogApiServiceImpl.java

@@ -330,7 +330,8 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
         Date currDate = new Date();
         if (CollectionUtils.isNotEmpty(auditLogList)) {
             for (TabAuditLog auditLog : auditLogList) {
-                if (DateUtil.compareDate(currDate, auditLog.getAuditExpireTime())) {
+                //因为过期时间数据目前是必有的，所以需要判读状态，再去判断过期时间
+                if (DataSecurityAuditEnum.WAIT.getCode().equals(auditLog.getAuditResult()) && DateUtil.compareDate(currDate, auditLog.getAuditExpireTime())) {
                     auditLog.setAuditResult(DataSecurityAuditEnum.OVER_TIME.getCode());
                 }
             }
@@ -349,6 +350,10 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
         if (!isCanCloseStatus) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "工单不能关闭");
         }
+        //超时
+        if (DateUtil.compareDate(new Date(), record.getAuditExpireTime())) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "工单不能关闭");
+        }
         int updateNum = auditLogService.closeAudit(auditLogId);
         if (updateNum > 0) {
             return ServiceResponse.success();

gic-platform-enterprise-service/src/main/resources/mapper/TabAuditLogMapper.xml

@@ -316,6 +316,7 @@
     <if test="auditResult != null">
       <if test="auditResult == 3">
         and audit_expire_time &lt; now()
+        and audit_result = 0
       </if>
       <if test="auditResult != 3">
         and audit_result = #{auditResult}