附件相关

src/main/java/com/trs/ggzyexchange/config/QuartzConfig.java

@@ -21,7 +21,7 @@ public class QuartzConfig {
      * 创建Job实例
      * 定时任务 国有产权 交易结果/实物资产
      */
-/*    @Bean
+    @Bean
     public JobDetail jobDetailCqSwBargainResult() {
         return JobBuilder.newJob(CqSwCompleteBulletinSchedul.class).storeDurably().build();
     }
@@ -33,7 +33,7 @@ public class QuartzConfig {
                 .withSchedule(CronScheduleBuilder.cronSchedule(this.strSron))
                 .forJob(jobDetailCqSwBargainResult())
                 .build();
-    }*/
+    }
 
     @Bean
     public JobDetail jobDetailCqSwCompleteBulletin() {

src/main/java/com/trs/ggzyexchange/entity/GcAttachment.java

@@ -96,5 +96,11 @@ public class GcAttachment extends BaseEntity {
     @TableField("URL")
     private String url;
 
+    @TableField("ASSOCIATION_CODE")
+    private String associationCode;
+
+    @TableField("DATA_TIMESTAMP")
+    private Long dataTimestamp;
+
 
 }

src/main/java/com/trs/ggzyexchange/entity/TenderDetailsVo.java

@@ -224,5 +224,9 @@ public class TenderDetailsVo extends BaseEntity{
     @JsonProperty("docpubtime")
     private String docpubtime = "";
 
+    @JsonProperty("dataTimestamp")
+    private Long dataTimestamp = 0L;
+
+
 
 }

src/main/java/com/trs/ggzyexchange/schedul/GcBidExceptioNoticeSchedul.java

@@ -11,10 +11,7 @@ import com.trs.ggzyexchange.controller.BaseController;
 import com.trs.ggzyexchange.entity.*;
 import com.trs.ggzyexchange.enums.ClassIfy;
 import com.trs.ggzyexchange.enums.JobLock;
-import com.trs.ggzyexchange.service.GcBidExceptioNoticeService;
-import com.trs.ggzyexchange.service.GcNoticeandfileService;
-import com.trs.ggzyexchange.service.ScheduledTashService;
-import com.trs.ggzyexchange.service.TenderDetailsVoService;
+import com.trs.ggzyexchange.service.*;
 import com.trs.ggzyexchange.utils.TenderDetailsVoUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.quartz.Job;
@@ -63,6 +60,9 @@ public class GcBidExceptioNoticeSchedul implements Job {
     @Autowired
     private ScheduledTashService scheduledTashService;
 
+    @Autowired
+    private GcAttachmentService gcAttachmentService;
+
     public void queryPageListUpdateEs() throws JsonProcessingException {
 
         /**
@@ -144,6 +144,98 @@ public class GcBidExceptioNoticeSchedul implements Job {
             record.setTransactionTypeCode(ClassIfy.ENGINEERING_CONSTRUCTION.getCode());
             record.setTransactionTypeName(ClassIfy.ENGINEERING_CONSTRUCTION.getName());
             record = tenderDetailsVoService.getTenderDetailsVoAllOrther(record);
+
+            try {
+                String bidSectionCodes = record.getBidSectionCodes();
+                int i1 = bidSectionCodes.indexOf(",");
+                int i2 = bidSectionCodes.indexOf(";");
+                int i3 = bidSectionCodes.indexOf("<br>");
+                int i4 = bidSectionCodes.indexOf("ltbrgt");
+                String splitBidSectionCode = null;
+                boolean flag = false;
+                String[] split = null;
+                if(i1 > 0){
+                    split =  bidSectionCodes.split(",");
+                    flag = true;
+                }
+                if(i2 > 0){
+                    split =  bidSectionCodes.split(";");
+                    flag = true;
+                }
+                if(i3 > 0){
+                    split =  bidSectionCodes.split("<br>");
+                    flag = true;
+                }
+                if(i4 > 0){
+                    split =  bidSectionCodes.split("ltbrgt");
+                    flag = true;
+                }
+                if(!flag){
+                    split = new String[]{bidSectionCodes};
+                }
+                List<GcAttachment> attachmentList = new ArrayList<GcAttachment>();
+
+                if(record.getDataTimestamp()>20250324000000L){
+                    //通过标包编号查询对应的附件信息
+                    QueryWrapper<GcAttachment> gcAttachmentQueryWrapper = new QueryWrapper<GcAttachment>();
+                    gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE","EXCEPTION_NOTICE_FILE");//add
+                    gcAttachmentQueryWrapper.eq("ASSOCIATION_CODE", record.getSourceDataKey());
+                    List<GcAttachment> list = gcAttachmentService.list(gcAttachmentQueryWrapper);
+
+
+                    if(!ObjectUtils.isEmpty(list)){
+                        attachmentList.addAll(list);
+                    }
+                }else{
+                    if(!ObjectUtils.isEmpty(split)){
+                        if(split.length >=1){
+                            for (String bidSectionCode : split) {
+                                try {
+                                    //通过标包编号查询对应的附件信息
+                                    QueryWrapper<GcAttachment> gcAttachmentQueryWrapper = new QueryWrapper<GcAttachment>();
+                                    gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE","EXCEPTION_NOTICE_FILE");//add
+                                    gcAttachmentQueryWrapper.like("BID_SECTION_CODE",bidSectionCode);
+                                    List<GcAttachment> list = gcAttachmentService.list(gcAttachmentQueryWrapper);
+
+
+                                    if(!ObjectUtils.isEmpty(list)){
+                                        attachmentList.addAll(list);
+                                    }
+                                }catch (Exception e){
+                                    e.printStackTrace();
+                                }
+                            }
+                        }
+                    }
+                }
+
+
+
+                String noticeContent = record.getNoticeContent();
+                String file = "";
+                if(!ObjectUtils.isEmpty(attachmentList)){
+                    if(attachmentList.size() > 0){
+                        file = "<br>附件：<br>";
+                    }
+                }
+                for (GcAttachment gcAttachment : attachmentList) {
+                    try{
+                        String attachmentName = gcAttachment.getAttachmentName();
+                        String url = gcAttachment.getUrl();
+                        file += "<a  target='_blank' style='color: blue' href='"+ url +"'>"+ attachmentName +"</a><br/>";
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
+                }
+                //招标文件拼接地址
+                if(!ObjectUtils.isEmpty(noticeContent) && noticeContent != ""){
+                    file = noticeContent + file;
+                }
+                record.setNoticeContent(file);
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+
             TenderDetailsVoUtils.isNull(record);
         }
         return tenderDetailsVoIPage.getRecords();

src/main/java/com/trs/ggzyexchange/schedul/GcBidcandidatePostSchedul.java

@@ -174,32 +174,50 @@ public class GcBidcandidatePostSchedul   implements Job {
                     }
 
                     List<GcAttachment> attachmentList = new ArrayList<GcAttachment>();
-                    if (!ObjectUtils.isEmpty(split)) {
-                        if (split.length >= 1) {
-                            for (String bidSectionCode : split) {
-                                try {
-                                    String bidSectionCodeClean = bidSectionCode.replaceAll(">", "").replaceAll("<", "");
-                                    String bidSectionCodeClean2 = bidSectionCodeClean.replaceAll("gt", "").replaceAll("lt", "");
-                                    //通过标包编号查询对应的附件信息
-                                    QueryWrapper<GcAttachment> gcAttachmentQueryWrapper = new QueryWrapper<GcAttachment>();
-                                    gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE", "PUBLICITY_DOC");//add
-                                    gcAttachmentQueryWrapper.eq("isshow", "0");//add
-                                    //gcAttachmentQueryWrapper.eq("BID_SECTION_CODE",bidSectionCode);
-                                    gcAttachmentQueryWrapper.like("BID_SECTION_CODE", bidSectionCodeClean2);
-                                    List<GcAttachment> list = gcAttachmentService.list(gcAttachmentQueryWrapper);
-                                    if (attachmentList.size() > 0) {
-                                        break;
-                                    }
-                                    if (!ObjectUtils.isEmpty(list)) {
-                                        attachmentList.addAll(list);
-                                    }
 
-                                } catch (Exception e) {
-                                    e.printStackTrace();
+                    if(record.getDataTimestamp()>20250324000000L){
+                        //通过标包编号查询对应的附件信息
+                        QueryWrapper<GcAttachment> gcAttachmentQueryWrapper = new QueryWrapper<GcAttachment>();
+                        gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE","PUBLICITY_DOC");//add
+                        gcAttachmentQueryWrapper.eq("isshow", "0");//add
+                        gcAttachmentQueryWrapper.eq("ASSOCIATION_CODE", record.getSourceDataKey());
+                        List<GcAttachment> list = gcAttachmentService.list(gcAttachmentQueryWrapper);
+                        if (attachmentList.size() > 0) {
+                            break;
+                        }
+                        if (!ObjectUtils.isEmpty(list)) {
+                            attachmentList.addAll(list);
+                        }
+                    }else{
+                        if (!ObjectUtils.isEmpty(split)) {
+                            if (split.length >= 1) {
+                                for (String bidSectionCode : split) {
+                                    try {
+                                        String bidSectionCodeClean = bidSectionCode.replaceAll(">", "").replaceAll("<", "");
+                                        String bidSectionCodeClean2 = bidSectionCodeClean.replaceAll("gt", "").replaceAll("lt", "");
+                                        //通过标包编号查询对应的附件信息
+                                        QueryWrapper<GcAttachment> gcAttachmentQueryWrapper = new QueryWrapper<GcAttachment>();
+                                        gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE", "PUBLICITY_DOC");//add
+                                        gcAttachmentQueryWrapper.eq("isshow", "0");//add
+                                        //gcAttachmentQueryWrapper.eq("BID_SECTION_CODE",bidSectionCode);
+                                        gcAttachmentQueryWrapper.like("BID_SECTION_CODE", bidSectionCodeClean2);
+                                        List<GcAttachment> list = gcAttachmentService.list(gcAttachmentQueryWrapper);
+                                        if (attachmentList.size() > 0) {
+                                            break;
+                                        }
+                                        if (!ObjectUtils.isEmpty(list)) {
+                                            attachmentList.addAll(list);
+                                        }
+
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
+                                    }
                                 }
                             }
                         }
                     }
+
+
                     String noticeContent = record.getNoticeContent();
                     String file = "";
                     if (!ObjectUtils.isEmpty(attachmentList)) {

src/main/java/com/trs/ggzyexchange/schedul/GcBidopenrecordSchedul.java

@@ -11,10 +11,7 @@ import com.trs.ggzyexchange.controller.BaseController;
 import com.trs.ggzyexchange.entity.*;
 import com.trs.ggzyexchange.enums.ClassIfy;
 import com.trs.ggzyexchange.enums.JobLock;
-import com.trs.ggzyexchange.service.GcBidopenrecordService;
-import com.trs.ggzyexchange.service.GcNoticeandfileService;
-import com.trs.ggzyexchange.service.ScheduledTashService;
-import com.trs.ggzyexchange.service.TenderDetailsVoService;
+import com.trs.ggzyexchange.service.*;
 import com.trs.ggzyexchange.utils.TenderDetailsVoUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.quartz.Job;
@@ -64,6 +61,9 @@ public class GcBidopenrecordSchedul  implements Job {
     @Autowired
     private ScheduledTashService scheduledTashService;
 
+    @Autowired
+    private GcAttachmentService gcAttachmentService;
+
     public void queryPageListUpdateEs() throws Exception {
         /**
          * 查询当前在定时任务表当中的最新时间
@@ -145,6 +145,96 @@ public class GcBidopenrecordSchedul  implements Job {
                 record.setTransactionTypeCode(ClassIfy.ENGINEERING_CONSTRUCTION.getCode());
                 record.setTransactionTypeName(ClassIfy.ENGINEERING_CONSTRUCTION.getName());
                 record = tenderDetailsVoService.getTenderDetailsVoAllOrther(record);
+
+                /*try {
+                    String bidSectionCodes = record.getBidSectionCodes();
+                    int i1 = bidSectionCodes.indexOf(",");
+                    int i2 = bidSectionCodes.indexOf(";");
+                    int i3 = bidSectionCodes.indexOf("<br>");
+                    int i4 = bidSectionCodes.indexOf("ltbrgt");
+                    String splitBidSectionCode = null;
+                    boolean flag = false;
+                    String[] split = null;
+                    if(i1 > 0){
+                        split =  bidSectionCodes.split(",");
+                        flag = true;
+                    }
+                    if(i2 > 0){
+                        split =  bidSectionCodes.split(";");
+                        flag = true;
+                    }
+                    if(i3 > 0){
+                        split =  bidSectionCodes.split("<br>");
+                        flag = true;
+                    }
+                    if(i4 > 0){
+                        split =  bidSectionCodes.split("ltbrgt");
+                        flag = true;
+                    }
+                    if(!flag){
+                        split = new String[]{bidSectionCodes};
+                    }
+                    List<GcAttachment> attachmentList = new ArrayList<GcAttachment>();
+                    if(record.getDataTimestamp()>20250324000000L){
+                        //通过标包编号查询对应的附件信息
+                        QueryWrapper<GcAttachment> gcAttachmentQueryWrapper = new QueryWrapper<GcAttachment>();
+                        gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE","BID_RECORD_FILE");//add
+                        gcAttachmentQueryWrapper.eq("ASSOCIATION_CODE", record.getSourceDataKey());
+                        List<GcAttachment> list = gcAttachmentService.list(gcAttachmentQueryWrapper);
+
+                        if(!ObjectUtils.isEmpty(list)){
+                            attachmentList.addAll(list);
+                        }
+                    }else{
+                        if(!ObjectUtils.isEmpty(split)){
+                            if(split.length >=1){
+                                for (String bidSectionCode : split) {
+                                    try {
+                                        //通过标包编号查询对应的附件信息
+                                        QueryWrapper<GcAttachment> gcAttachmentQueryWrapper = new QueryWrapper<GcAttachment>();
+                                        gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE","BID_RECORD_FILE");//add
+                                        gcAttachmentQueryWrapper.like("BID_SECTION_CODE",bidSectionCode);
+                                        List<GcAttachment> list = gcAttachmentService.list(gcAttachmentQueryWrapper);
+
+                                        if(!ObjectUtils.isEmpty(list)){
+                                            attachmentList.addAll(list);
+                                        }
+                                    }catch (Exception e){
+                                        e.printStackTrace();
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+
+
+                    String noticeContent = record.getNoticeContent();
+                    String file = "";
+                    if(!ObjectUtils.isEmpty(attachmentList)){
+                        if(attachmentList.size() > 0){
+                            file = "<br>附件：<br>";
+                        }
+                    }
+                    for (GcAttachment gcAttachment : attachmentList) {
+                        try{
+                            String attachmentName = gcAttachment.getAttachmentName();
+                            String url = gcAttachment.getUrl();
+                            file += "<a  target='_blank' style='color: blue' href='"+ url +"'>"+ attachmentName +"</a><br/>";
+                        }catch (Exception e){
+                            e.printStackTrace();
+                        }
+                    }
+                    //招标文件拼接地址
+                    if(!ObjectUtils.isEmpty(noticeContent) && noticeContent != ""){
+                        file = noticeContent + file;
+                    }
+                    record.setNoticeContent(file);
+                }catch (Exception e){
+                    e.printStackTrace();
+                }*/
+
+
                 TenderDetailsVoUtils.isNull(record);
             }catch (Exception e){
                 e.printStackTrace();

src/main/java/com/trs/ggzyexchange/schedul/GcBidpublicitySchedul.java

@@ -180,32 +180,50 @@ public class GcBidpublicitySchedul  implements Job {
                     }
 
                     List<GcAttachment> attachmentList = new ArrayList<GcAttachment>();
-                    if (!ObjectUtils.isEmpty(split)) {
-                        if (split.length >= 1) {
-                            for (String bidSectionCode : split) {
-                                try {
-                                    String bidSectionCodeClean = bidSectionCode.replaceAll(">", "").replaceAll("<", "");
-                                    String bidSectionCodeClean2 = bidSectionCodeClean.replaceAll("gt", "").replaceAll("lt", "");
-                                    //通过标包编号查询对应的附件信息
-                                    QueryWrapper<GcAttachment> gcAttachmentQueryWrapper = new QueryWrapper<GcAttachment>();
-                                    gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE", "WIN_BID_NOTICE");//add
-                                    gcAttachmentQueryWrapper.eq("isshow", "0");//add
-                                    //gcAttachmentQueryWrapper.eq("BID_SECTION_CODE",bidSectionCode);
-                                    gcAttachmentQueryWrapper.like("BID_SECTION_CODE", bidSectionCodeClean2);
-                                    List<GcAttachment> list = gcAttachmentService.list(gcAttachmentQueryWrapper);
-                                    if (attachmentList.size() > 0) {
-                                        break;
-                                    }
-                                    if (!ObjectUtils.isEmpty(list)) {
-                                        attachmentList.addAll(list);
-                                    }
 
-                                } catch (Exception e) {
-                                    e.printStackTrace();
+                    if(record.getDataTimestamp()>20250324000000L){
+                        //通过标包编号查询对应的附件信息
+                        QueryWrapper<GcAttachment> gcAttachmentQueryWrapper = new QueryWrapper<GcAttachment>();
+                        gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE", "WIN_BID_NOTICE");//add
+//                        gcAttachmentQueryWrapper.eq("isshow", "0");//add
+                        gcAttachmentQueryWrapper.eq("ASSOCIATION_CODE", record.getSourceDataKey());
+                        List<GcAttachment> list = gcAttachmentService.list(gcAttachmentQueryWrapper);
+                        if (attachmentList.size() > 0) {
+                            break;
+                        }
+                        if (!ObjectUtils.isEmpty(list)) {
+                            attachmentList.addAll(list);
+                        }
+                    }else{
+                        if (!ObjectUtils.isEmpty(split)) {
+                            if (split.length >= 1) {
+                                for (String bidSectionCode : split) {
+                                    try {
+                                        String bidSectionCodeClean = bidSectionCode.replaceAll(">", "").replaceAll("<", "");
+                                        String bidSectionCodeClean2 = bidSectionCodeClean.replaceAll("gt", "").replaceAll("lt", "");
+                                        //通过标包编号查询对应的附件信息
+                                        QueryWrapper<GcAttachment> gcAttachmentQueryWrapper = new QueryWrapper<GcAttachment>();
+                                        gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE", "WIN_BID_NOTICE");//add
+//                                        gcAttachmentQueryWrapper.eq("isshow", "0");//add
+                                        //gcAttachmentQueryWrapper.eq("BID_SECTION_CODE",bidSectionCode);
+                                        gcAttachmentQueryWrapper.like("BID_SECTION_CODE", bidSectionCodeClean2);
+                                        List<GcAttachment> list = gcAttachmentService.list(gcAttachmentQueryWrapper);
+                                        if (attachmentList.size() > 0) {
+                                            break;
+                                        }
+                                        if (!ObjectUtils.isEmpty(list)) {
+                                            attachmentList.addAll(list);
+                                        }
+
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
+                                    }
                                 }
                             }
                         }
                     }
+
+
                     String noticeContent = record.getNoticeContent();
                     String file = "";
                     if (!ObjectUtils.isEmpty(attachmentList)) {

src/main/java/com/trs/ggzyexchange/schedul/GcNoticeandfileSchedul.java

@@ -259,37 +259,60 @@ public class  GcNoticeandfileSchedul  implements Job {
                     }
 
                     List<GcAttachment> attachmentList = new ArrayList<GcAttachment>();
-                    if(!ObjectUtils.isEmpty(split)){
-                        if(split.length >=1){
-                            for (String bidSectionCode : split) {
-                                try {
-                                    String bidSectionCodeClean = bidSectionCode.replaceAll(">","").replaceAll("<","");
-                                    String bidSectionCodeClean2 = bidSectionCodeClean.replaceAll("gt","").replaceAll("lt","");
-                                    //通过标包编号查询对应的附件信息
-                                    QueryWrapper<GcAttachment> gcAttachmentQueryWrapper = new QueryWrapper<GcAttachment>();
-                                    if("2".equals(record.getNoticeNature())){
-                                        gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE","CHANGE_NOTICE");//add
-                                    }else{
-                                        gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE","TENDER_NOTICE");//add
-                                    }
 
-                                    //gcAttachmentQueryWrapper.eq("isshow", "0");//add
-                                    //gcAttachmentQueryWrapper.eq("BID_SECTION_CODE",bidSectionCode);
-                                    gcAttachmentQueryWrapper.like("BID_SECTION_CODE",bidSectionCodeClean2);
-                                    List<GcAttachment> list = gcAttachmentService.list(gcAttachmentQueryWrapper);
-                                    if(attachmentList.size() > 0){
-                                        break;
-                                    }
-                                    if(!ObjectUtils.isEmpty(list)){
-                                        attachmentList.addAll(list);
-                                    }
 
-                                }catch (Exception e){
-                                    e.printStackTrace();
+                    if(record.getDataTimestamp()>20250324000000L){
+                        //通过标包编号查询对应的附件信息
+                        QueryWrapper<GcAttachment> gcAttachmentQueryWrapper = new QueryWrapper<GcAttachment>();
+                        if("2".equals(record.getNoticeNature())){
+                            gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE","CHANGE_NOTICE");//add
+                        }else{
+                            gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE","TENDER_NOTICE");//add
+                        }
+//                        gcAttachmentQueryWrapper.eq("isshow", "0");//add
+                        gcAttachmentQueryWrapper.eq("ASSOCIATION_CODE", record.getSourceDataKey());
+                        List<GcAttachment> list = gcAttachmentService.list(gcAttachmentQueryWrapper);
+                        if (attachmentList.size() > 0) {
+                            break;
+                        }
+                        if (!ObjectUtils.isEmpty(list)) {
+                            attachmentList.addAll(list);
+                        }
+                    }else{
+                        if(!ObjectUtils.isEmpty(split)){
+                            if(split.length >=1){
+                                for (String bidSectionCode : split) {
+                                    try {
+                                        String bidSectionCodeClean = bidSectionCode.replaceAll(">","").replaceAll("<","");
+                                        String bidSectionCodeClean2 = bidSectionCodeClean.replaceAll("gt","").replaceAll("lt","");
+                                        //通过标包编号查询对应的附件信息
+                                        QueryWrapper<GcAttachment> gcAttachmentQueryWrapper = new QueryWrapper<GcAttachment>();
+                                        if("2".equals(record.getNoticeNature())){
+                                            gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE","CHANGE_NOTICE");//add
+                                        }else{
+                                            gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE","TENDER_NOTICE");//add
+                                        }
+
+                                        //gcAttachmentQueryWrapper.eq("isshow", "0");//add
+                                        //gcAttachmentQueryWrapper.eq("BID_SECTION_CODE",bidSectionCode);
+                                        gcAttachmentQueryWrapper.like("BID_SECTION_CODE",bidSectionCodeClean2);
+                                        List<GcAttachment> list = gcAttachmentService.list(gcAttachmentQueryWrapper);
+                                        if(attachmentList.size() > 0){
+                                            break;
+                                        }
+                                        if(!ObjectUtils.isEmpty(list)){
+                                            attachmentList.addAll(list);
+                                        }
+
+                                    }catch (Exception e){
+                                        e.printStackTrace();
+                                    }
                                 }
                             }
                         }
                     }
+
+
                     String noticeContent = record.getNoticeContent();
                     String file = "";
                     if(!ObjectUtils.isEmpty(attachmentList)){

src/main/java/com/trs/ggzyexchange/schedul/GcTenderbidfileSchedul.java

@@ -172,34 +172,70 @@ public class GcTenderbidfileSchedul   implements Job {
                     split = new String[]{bidSectionCodes};
                 }
                 List<GcAttachment> attachmentList = new ArrayList<GcAttachment>();
-                if(!ObjectUtils.isEmpty(split)){
-                    if(split.length >=1){
-                        for (String bidSectionCode : split) {
-                            try {
-                                //通过标包编号查询对应的附件信息
-                                QueryWrapper<GcAttachment> gcAttachmentQueryWrapper = new QueryWrapper<GcAttachment>();
-                                gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE","TENDER_FILE_FILE");//add
-                                gcAttachmentQueryWrapper.eq("BID_SECTION_CODE",bidSectionCode);
-                                List<GcAttachment> list = gcAttachmentService.list(gcAttachmentQueryWrapper);
-
-                                //通过标包编号查询对应的附件信息
-                                QueryWrapper<GcAttachment> gcAttachmentQueryWrapper2 = new QueryWrapper<GcAttachment>();
-                                gcAttachmentQueryWrapper2.eq("ATTACHMENT_SET_CODE","FILE_EX_TDOC");//add
-                                gcAttachmentQueryWrapper2.eq("BID_SECTION_CODE",bidSectionCode);
-                                List<GcAttachment> list2 = gcAttachmentService.list(gcAttachmentQueryWrapper2);
-                                if(!ObjectUtils.isEmpty(list2)){
-                                    attachmentList.addAll(list2);
-                                }
 
-                                if(!ObjectUtils.isEmpty(list)){
-                                    attachmentList.addAll(list);
+                if(record.getDataTimestamp()>20250324000000L){
+                    //通过标包编号查询对应的附件信息
+                    QueryWrapper<GcAttachment> gcAttachmentQueryWrapper3 = new QueryWrapper<GcAttachment>();
+                    gcAttachmentQueryWrapper3.eq("ATTACHMENT_SET_CODE","TENDER_FILE");//add
+                    gcAttachmentQueryWrapper3.eq("ASSOCIATION_CODE", record.getSourceDataKey());
+                    List<GcAttachment> list3 = gcAttachmentService.list(gcAttachmentQueryWrapper3);
+
+
+                    //通过标包编号查询对应的附件信息
+                    QueryWrapper<GcAttachment> gcAttachmentQueryWrapper = new QueryWrapper<GcAttachment>();
+                    gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE","TENDER_FILE_FILE");//add
+                    gcAttachmentQueryWrapper.eq("ASSOCIATION_CODE", record.getSourceDataKey());
+                    List<GcAttachment> list = gcAttachmentService.list(gcAttachmentQueryWrapper);
+
+                    //通过标包编号查询对应的附件信息
+                    QueryWrapper<GcAttachment> gcAttachmentQueryWrapper2 = new QueryWrapper<GcAttachment>();
+                    gcAttachmentQueryWrapper2.eq("ATTACHMENT_SET_CODE","FILE_EX_TDOC");//add
+                    gcAttachmentQueryWrapper2.eq("ASSOCIATION_CODE", record.getSourceDataKey());
+                    List<GcAttachment> list2 = gcAttachmentService.list(gcAttachmentQueryWrapper2);
+                    if(!ObjectUtils.isEmpty(list3)){
+                        attachmentList.addAll(list3);
+                    }
+
+                    if(!ObjectUtils.isEmpty(list2)){
+                        attachmentList.addAll(list2);
+                    }
+
+                    if(!ObjectUtils.isEmpty(list)){
+                        attachmentList.addAll(list);
+                    }
+                }else{
+                    if(!ObjectUtils.isEmpty(split)){
+                        if(split.length >=1){
+                            for (String bidSectionCode : split) {
+                                try {
+                                    //通过标包编号查询对应的附件信息
+                                    QueryWrapper<GcAttachment> gcAttachmentQueryWrapper = new QueryWrapper<GcAttachment>();
+                                    gcAttachmentQueryWrapper.eq("ATTACHMENT_SET_CODE","TENDER_FILE_FILE");//add
+                                    gcAttachmentQueryWrapper.eq("BID_SECTION_CODE",bidSectionCode);
+                                    List<GcAttachment> list = gcAttachmentService.list(gcAttachmentQueryWrapper);
+
+                                    //通过标包编号查询对应的附件信息
+                                    QueryWrapper<GcAttachment> gcAttachmentQueryWrapper2 = new QueryWrapper<GcAttachment>();
+                                    gcAttachmentQueryWrapper2.eq("ATTACHMENT_SET_CODE","FILE_EX_TDOC");//add
+                                    gcAttachmentQueryWrapper2.eq("BID_SECTION_CODE",bidSectionCode);
+                                    List<GcAttachment> list2 = gcAttachmentService.list(gcAttachmentQueryWrapper2);
+                                    if(!ObjectUtils.isEmpty(list2)){
+                                        attachmentList.addAll(list2);
+                                    }
+
+                                    if(!ObjectUtils.isEmpty(list)){
+                                        attachmentList.addAll(list);
+                                    }
+                                }catch (Exception e){
+                                    e.printStackTrace();
                                 }
-                            }catch (Exception e){
-                                e.printStackTrace();
                             }
                         }
                     }
                 }
+
+
+
                 String noticeContent = record.getNoticeContent();
                 String file = "";
                 if(!ObjectUtils.isEmpty(attachmentList)){

src/main/java/com/trs/ggzyexchange/utils/TenderDetailsVoUtils.java

@@ -226,6 +226,10 @@ public class TenderDetailsVoUtils {
                 String date1 = sdfylmldlhlmls.format(new Date(Long.parseLong(date)));
                 return date1;
             }
+
+            if (date.length() == 19) {
+                return date;
+            }
         }
         return newDate;
     }

src/main/resources/application.yml

@@ -13,8 +13,8 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.kingbase8.Driver
-    url: jdbc:kingbase8://10.8.3.142:54321/ggzyexchange
-#    url: jdbc:kingbase8://10.8.3.137:54321/ggzyexchange
+#    url: jdbc:kingbase8://10.8.3.142:54321/ggzyexchange
+    url: jdbc:kingbase8://10.8.3.137:54321/ggzyexchange
     username: ggzyexchange
     password: ggzyexchange
     druid:
@@ -51,7 +51,8 @@ mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
     auto-mapping-behavior: full
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl  # 禁用日志
   mapper-locations: classpath:mapper/*.xml
 logging:
   level:
@@ -61,4 +62,4 @@ logging:
   file:
     name: logs/rulemark.log
 time:
-  cron: 0 */10 * * * ?
+  cron: 0 */1 * * * ?

src/main/resources/mapper/GcBidcandidatePostMapper.xml

@@ -13,7 +13,8 @@
             gcbp.PUBLICITY_REFER_TIME publicityReferTime,
             gcbp.PUBLICITY_START_TIME publicityStartTime,
             gcbp.PUBLICITY_END_TIME publicityEndTime,
-            gct.REGION_CODE regionCode
+            gct.REGION_CODE regionCode,
+            gcbp.DATA_TIMESTAMP dataTimestamp
         from
             GC_BIDCANDIDATE_POST gcbp
             left join GC_TENDERPROJECT gct
@@ -61,7 +62,8 @@
             gcbp.DATA_SOURCE_CODE dataSourceCode,
             gcbp.BID_SECTION_CODES bidSectionCodes,
             gcbp.PUBLICITY_START_TIME docGetStartTime,
-            gcbp.PUBLICITY_END_TIME docGetEndTime
+            gcbp.PUBLICITY_END_TIME docGetEndTime,
+            gcbp.DATA_TIMESTAMP dataTimestamp
         from
             GC_BIDCANDIDATE_POST gcbp
         left join GC_TENDERPROJECT gct
@@ -87,7 +89,8 @@
             gcbp.BID_SECTION_CODES bidSectionCodes,
             gcbp.PUBLICITY_START_TIME docGetStartTime,
             gcbp.PUBLICITY_END_TIME docGetEndTime,
-            gcbp.CREATE_DATE createDate
+            gcbp.CREATE_DATE createDate,
+            gcbp.DATA_TIMESTAMP dataTimestamp
         from
             GC_BIDCANDIDATE_POST gcbp
                 left join GC_TENDERPROJECT gct

src/main/resources/mapper/GcBidpublicityMapper.xml

@@ -12,7 +12,8 @@
             gcb.PLATFORM_CODE platformCode,
             gcb.NOTICE_SEND_TIME noticeSendTime,
             gcb.BULLETIN_TYPE bulletinType,
-            gcp.INDUSTRIES_TYPE industriesType
+            gcp.INDUSTRIES_TYPE industriesType,
+            gcb.DATA_TIMESTAMP dataTimestamp
         from
             GC_BIDPUBLICITY gcb
             left join GC_TENDERPROJECT gct
@@ -59,7 +60,8 @@
             gcb.BULLETIN_TYPE bulletinTypeCode,
             gcb.BULLETIN_DUTY bulletinDuty,
             gcb.DATA_SOURCE_CODE dataSourceCode,
-            gcb.BID_SECTION_CODE bidSectionCodes
+            gcb.BID_SECTION_CODE bidSectionCodes,
+            gcb.DATA_TIMESTAMP dataTimestamp
         from
             GC_BIDPUBLICITY gcb
         left join GC_TENDERPROJECT gct
@@ -85,7 +87,8 @@
             gcb.BULLETIN_DUTY bulletinDuty,
             gcb.DATA_SOURCE_CODE dataSourceCode,
             gcb.BID_SECTION_CODE bidSectionCodes,
-            gcb.CREATE_DATE createDate
+            gcb.CREATE_DATE createDate,
+            gcb.DATA_TIMESTAMP dataTimestamp
         from
             GC_BIDPUBLICITY gcb
                 left join GC_TENDERPROJECT gct

src/main/resources/mapper/GcNoticeandfileMapper.xml

@@ -13,7 +13,8 @@
             gcn.NOTICE_SEND_TIME noticeSendTime,
             gcn.DOC_GET_END_TIME docGetEndTime,
             gcn.BULLETIN_TYPE bulletinType,
-            gcp.INDUSTRIES_TYPE industriesType
+            gcp.INDUSTRIES_TYPE industriesType,
+            gcn.DATA_TIMESTAMP dataTimestamp
         from
             GC_NOTICEANDFILE gcn
         left join GC_TENDERPROJECT gct
@@ -65,7 +66,8 @@
         gcn.DOC_GET_START_TIME docGetStartTime,
         gcn.DOC_GET_END_TIME docGetEndTime,
         gcn.BID_DOC_REFER_END_TIME bidDocReferEndTime,
-        gcn.BID_OPEN_TIME bidOpenTime
+        gcn.BID_OPEN_TIME bidOpenTime,
+        gcn.DATA_TIMESTAMP dataTimestamp
         from
         GC_NOTICEANDFILE gcn
         left join GC_TENDERPROJECT gct
@@ -119,7 +121,8 @@
         gcn.DOC_GET_END_TIME docGetEndTime,
         gcn.BID_DOC_REFER_END_TIME bidDocReferEndTime,
         gcn.BID_OPEN_TIME bidOpenTime,
-        gcn.CREATE_DATE createDate
+        gcn.CREATE_DATE createDate,
+        gcn.DATA_TIMESTAMP dataTimestamp
         from
         GC_NOTICEANDFILE gcn
         left join GC_TENDERPROJECT gct

src/main/resources/mapper/GcReconsiderMapper.xml

@@ -11,10 +11,11 @@
             nn.SOURCE_DATA_KEY sourceDataKey,
             nn.TENDER_PROJECT_NAME projectName,
             nn.NOTICE_CONTENT noticeContent,
-            nn.NOTICE_SEND_TIM noticeSendTime,
+            nn.NOTICE_SEND_TIME noticeSendTime,
             nn.RECONSIDER_TITLE noticeName,
             nn.REGION_CODE regionCode,
-            nn.CREATE_DATE createDate
+            nn.CREATE_DATE createDate,
+            nn.BID_SECTION_CODE bidSectionCodes
             from
             gc_reconsider nn
         where

src/main/resources/mapper/GcTenderbidfileMapper.xml

@@ -18,7 +18,8 @@
             gctb.DATA_SOURCE_CODE dataSourceCode,
             gctb.BID_SECTION_CODE bidSectionCodes,
             gctb.valid_period validPeriod,
-            gctb.clarify_time clarifyTime
+            gctb.clarify_time clarifyTime,
+            gctb.DATA_TIMESTAMP dataTimestamp
         from
             GC_TENDERBIDFILE gctb
                 left join GC_TENDERPROJECT gct
@@ -45,7 +46,8 @@
             gctb.BID_SECTION_CODE bidSectionCodes,
             gctb.valid_period validPeriod,
             gctb.clarify_time clarifyTime,
-            gctb.CREATE_DATE createDate
+            gctb.CREATE_DATE createDate,
+            gctb.DATA_TIMESTAMP dataTimestamp
         from
             GC_TENDERBIDFILE gctb
                 left join GC_TENDERPROJECT gct