Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/qo/DownloadReportQO.java

@@ -12,7 +12,6 @@ import java.util.Date;
  */
 public class DownloadReportQO extends PageQO {
     private static final long serialVersionUID = -5251611329415430980L;
-
     public interface SelectValidView {
 
     }
@@ -35,6 +34,8 @@ public class DownloadReportQO extends PageQO {
 //    private String searchName;
     private Integer auditResult;
     private Date auditExpireTime;
+    private Date ltAuditExpireTime;
+
     private Boolean hasDownloadUrl;
 
     private String projectCode;
@@ -118,4 +119,12 @@ public class DownloadReportQO extends PageQO {
     public void setProjectCode(String projectCode) {
         this.projectCode = projectCode;
     }
+
+    public Date getLtAuditExpireTime() {
+        return ltAuditExpireTime;
+    }
+
+    public void setLtAuditExpireTime(Date ltAuditExpireTime) {
+        this.ltAuditExpireTime = ltAuditExpireTime;
+    }
 }

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

@@ -63,6 +63,7 @@ public class DownloadReportServiceImpl implements DownloadReportService {
             switch (downloadReportQO.getDownloadReportStatus()) {
                 case 0:
                     downloadReportQO.setAuditResult(DataSecurityAuditEnum.WAIT.getCode());
+                    downloadReportQO.setLtAuditExpireTime(new Date());
                     downloadReportQO.setHasDownloadUrl(null);
                     break;
                 case 2:

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

@@ -342,6 +342,9 @@
     <if test="auditExpireTime != null ">
         and audit_expire_time &lt; #{auditExpireTime}
     </if>
+    <if test="ltAuditExpireTime != null ">
+        and audit_expire_time &gt; #{ltAuditExpireTime}
+    </if>
     <if test="hasDownloadUrl != null ">
         <if test="hasDownloadUrl">
             and download_url is not null