交易数据时间显示

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

@@ -38,4 +38,7 @@ public class GcJihuaInfo extends BaseEntity {
     @TableField("DATA_TIMESTAMP")
     private Long dataTimestamp;
 
+    @TableField("CREATE_DATE")
+    private Long createDate;
+
 }

src/main/java/com/trs/ggzyexchange/mapper/GcJihuaInfoMapper.java

@@ -20,5 +20,5 @@ import org.apache.ibatis.annotations.Param;
 public interface GcJihuaInfoMapper extends BaseMapper<GcJihuaInfo> {
     Long maxDataTimeStamp();
 
-    IPage<TenderDetailsVo> queryGcJihuaListByTime(Page<ZfcgGongao> page, @Param("time")  Long time);
+    IPage<TenderDetailsVo> queryGcJihuaListByTime(Page<GcJihuaInfo> page, @Param("time")  Long time);
 }

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

@@ -114,7 +114,7 @@ public class GcJihuaSchedul implements Job {
     }
 
     public List<TenderDetailsVo> getTenderDetailsVoListAll(Integer pageNo,Integer pageSize,Long time){
-        Page<ZfcgGongao> page = new Page<ZfcgGongao>(pageNo, pageSize);
+        Page<GcJihuaInfo> page = new Page<GcJihuaInfo>(pageNo, pageSize);
         IPage<TenderDetailsVo> tenderDetailsVoIPage = gcJihuaInfoService.queryGcJihuaListByTime(page,time);
         List<TenderDetailsVo> tenderDetailsVos = new ArrayList<TenderDetailsVo>();
         for (TenderDetailsVo record : tenderDetailsVoIPage.getRecords()) {

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

@@ -255,14 +255,21 @@ public class  GcNoticeandfileSchedul  implements Job {
                         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","TENDER_NOTICE");//add
-                                    gcAttachmentQueryWrapper.eq("BID_SECTION_CODE",bidSectionCode);
+                                    //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();
                                 }

src/main/java/com/trs/ggzyexchange/service/GcJihuaInfoService.java

@@ -19,5 +19,5 @@ public interface GcJihuaInfoService extends IService<GcJihuaInfo> {
 
     Long maxDataTimeStamp();
 
-    IPage<TenderDetailsVo> queryGcJihuaListByTime(Page<ZfcgGongao> page, Long time);
+    IPage<TenderDetailsVo> queryGcJihuaListByTime(Page<GcJihuaInfo> page, Long time);
 }

src/main/java/com/trs/ggzyexchange/service/impl/GcJihuaInfoServiceImpl.java

@@ -27,7 +27,7 @@ public class GcJihuaInfoServiceImpl extends ServiceImpl<GcJihuaInfoMapper, GcJih
     @Autowired
     private GcJihuaInfoMapper gcJihuaInfoMapper;
 
-    public IPage<TenderDetailsVo> queryGcJihuaListByTime(Page<ZfcgGongao> page, Long time) {
+    public IPage<TenderDetailsVo> queryGcJihuaListByTime(Page<GcJihuaInfo> page, Long time) {
         return gcJihuaInfoMapper.queryGcJihuaListByTime(page,time);
     }
 

src/main/java/com/trs/ggzyexchange/service/impl/GcNoticeandfileServiceImpl.java

@@ -169,9 +169,9 @@ public class GcNoticeandfileServiceImpl extends ServiceImpl<GcNoticeandfileMappe
                 }
                 tenderDetailsVo.setDocpubtime(noticeSendTime);
                 String toJSONString = objectMapper.writeValueAsString(tenderDetailsVo);
-                log.info("同步数据-主键："+tenderDetailsVo.getSourceDataKey());
+                /*log.info("同步数据-主键："+tenderDetailsVo.getSourceDataKey());
                 log.info("同步数据-公告标题："+tenderDetailsVo.getNoticeName());
-                log.info("发布时间："+tenderDetailsVo.getNoticeSendTime());
+                log.info("发布时间："+tenderDetailsVo.getNoticeSendTime());*/
                 info = restHighLevelClientUtils.addDoc(ClassIfy.ES_INDEX_SEARCH_PUBLIC_RESOURCE_DEAL.getCode(), String.valueOf(tenderDetailsVo.getSourceDataKey()), toJSONString);
             }
         }catch (Exception e){

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

@@ -53,7 +53,11 @@ public class TenderDetailsVoUtils {
             createDate = noticeSendTime;
         }
         if(createDate!=null&&!"".equals(createDate)&&!CommonConstant.SET_TIME.equals(createDate)){
-            tenderDetailsVo.setNoticeSendTime(createDate);
+            if(createDate.compareTo("2024-06-28 16:25:00")>0){
+                tenderDetailsVo.setNoticeSendTime(createDate);
+            }else{
+                tenderDetailsVo.setNoticeSendTime(noticeSendTime);
+            }
         }else {
             tenderDetailsVo.setNoticeSendTime(noticeSendTime);
         }

src/main/resources/mapper/GcJihuaInfoMapper.xml

@@ -13,7 +13,8 @@
             nn.gonggaocontent noticeContent,
             nn.pubtime noticeSendTime,
             nn.projectjhname noticeName,
-            nn.xiaqucode regionCode
+            nn.xiaqucode regionCode,
+            nn.CREATE_DATE createDate
             from
             gc_jihua_info nn
         where