更新自然资源数据更新方式

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

@@ -211,12 +211,12 @@ public class TenderDetailsVo extends BaseEntity{
     private String file;
 
     /**
-     * 开标结束时间
+     * 文档状态
      */
     @JsonProperty("docstatus")
     private String docstatus = "10";
      /**
-     * 开标结束时间
+     * 文档发布时间
      */
     @JsonProperty("docpubtime")
     private String docpubtime = "";

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

@@ -61,9 +61,14 @@ public class GcNoticeandfileSchedul  implements Job {
         Page<ScheduledTash> page = scheduledTashService.page(pageScheduledTash, scheduledTashQueryWrapper);
         List<ScheduledTash> records = page.getRecords();
         ScheduledTash scheduledTash = null;
-        if(records.size() > 0){
-            scheduledTash = records.get(0);
+        if(!ObjectUtils.isEmpty(page)){
+            if(!ObjectUtils.isEmpty(records)){
+                if(records.size() > 0){
+                    scheduledTash = records.get(0);
+                }
+            }
         }
+
         Long time = null;
         if(ObjectUtils.isEmpty(scheduledTash)){
             try {
@@ -120,182 +125,193 @@ public class GcNoticeandfileSchedul  implements Job {
         Page<GcNoticeandfile> page = new Page<GcNoticeandfile>(pageNo, pageSize);
         IPage<TenderDetailsVo> pageList = gcNoticeandfileService.queryGcTenderProjectAllListGeTime(page, gcNoticeandfile,time);
         for (TenderDetailsVo record : pageList.getRecords()) {
-            String escaped = StringEscapeUtils.unescapeHtml3(record.getNoticeContent());
-            record.setNoticeContent(escaped);
-            //获取国标区域名称
-            QueryWrapper<TRegion> tRegionQueryWrapper = new QueryWrapper<TRegion>();
-            tRegionQueryWrapper.eq("code",record.getRegionCode()+"000000");
-            Page<TRegion> pageTRegion = new Page<TRegion>(1, 1);
-            List<TRegion> records = tRegionService.page(pageTRegion, tRegionQueryWrapper).getRecords();
-            if(records.size() >= 1){
-                try {
-                    String name = records.get(0).getName();
-                    if(!ObjectUtils.isEmpty(name)){
-                        record.setRegionName(name);
-                    }
-                }catch (Exception e){
-                    e.printStackTrace();
-                }
-            }
-            //获取区域编号
-            QueryWrapper<AreaPlatform> areaPlatformQueryWrapper = new QueryWrapper<AreaPlatform>();
-            Page<AreaPlatform> areaPlatformPage = new Page<AreaPlatform>(1, 1);
-            areaPlatformQueryWrapper.eq("PLATFORM_CODE",record.getPlatformCode());
-            List<AreaPlatform> recordsAreaPlatform = areaPlatformService.page(areaPlatformPage, areaPlatformQueryWrapper).getRecords();
-            if(recordsAreaPlatform.size() >= 1){
-                try {
-                    String regionName = recordsAreaPlatform.get(0).getRegionName();
-                    if(!ObjectUtils.isEmpty(regionName)){
-                        record.setPlatformName(regionName);
-                    }
-                }catch (Exception e){
-                    e.printStackTrace();
-                }
-            }
-            record.setTransactionTypeCode(ClassIfy.ENGINEERING_CONSTRUCTION.getCode());
-            record.setTransactionTypeName(ClassIfy.ENGINEERING_CONSTRUCTION.getName());
-            //获取行业信息代码
-            String industriesTypeCode = record.getIndustriesTypeCode();
-            if(!ObjectUtils.isEmpty(industriesTypeCode)){
-                try {
-                    QueryWrapper<CIndustriesType> cIndustriesTypeQueryWrapper = new QueryWrapper<CIndustriesType>();
-                    cIndustriesTypeQueryWrapper.eq("code",industriesTypeCode);
-                    CIndustriesType cIndustriesType = cIndustriesTypeService.getOne(cIndustriesTypeQueryWrapper);
-                    if(!ObjectUtils.isEmpty(cIndustriesType)){
-                        String name = cIndustriesType.getName();
-                        record.setIndustriesTypeName(name);
-                    }
-                }catch (Exception e){
-                    e.printStackTrace();
-                }
-            }
-            record.setNoticeTypeCode(ClassIfy.TENDER_ANNOUNCEMENT.getCode());
-            record.setNoticeTypeName(ClassIfy.TENDER_ANNOUNCEMENT.getName());
-            String bulletinTypeCode = record.getBulletinTypeCode();
-            if(!ObjectUtils.isEmpty(bulletinTypeCode)){
-                try {
-                    String bulletinTypeName = BulletinType.getBulletinTypeName(bulletinTypeCode);
-                    if(!ObjectUtils.isEmpty(bulletinTypeName)){
-                        record.setBulletinTypeName(bulletinTypeName);
-                    }
-                }catch (Exception e){
-                    e.printStackTrace();
+            if(!ObjectUtils.isEmpty(record)){
+                String escaped = StringEscapeUtils.unescapeHtml3(record.getNoticeContent());
+                if(!ObjectUtils.isEmpty(escaped)){
+                    record.setNoticeContent(escaped);
                 }
-            }
-            String dataSourceCode = record.getDataSourceCode();
-            if(!ObjectUtils.isEmpty(dataSourceCode)){
-                QueryWrapper<TRegion> tRegionQueryWrapperQ = new QueryWrapper<TRegion>();
-                String subSourceCode = dataSourceCode.substring(1, dataSourceCode.length());
-                tRegionQueryWrapperQ.eq("code",subSourceCode+"000000");
-                List<TRegion> tRegionList = tRegionService.page(pageTRegion, tRegionQueryWrapperQ).getRecords();
-                if(tRegionList.size() >= 1){
-                    String name = tRegionList.get(0).getName();
-                    if(!ObjectUtils.isEmpty(name)){
-                        record.setDataSourceName(name+"公共资源交易中心");
-                    }
-                }
-                if(subSourceCode.equals("150401")){
-                    record.setDataSourceName("赤峰市公共资源交易中心");
-                }
-            }
-            String bidSectionCodes = record.getBidSectionCodes();
-            if(!ObjectUtils.isEmpty(bidSectionCodes)){
-                int i1 = bidSectionCodes.indexOf(",");
-                int i2 = bidSectionCodes.indexOf(";");
-                int i3 = bidSectionCodes.indexOf("<br>");
-                String splitBidSectionCode = null;
-                boolean flag = false;
-                if(i1 > 0){
-                    splitBidSectionCode =  bidSectionCodes.split(",")[0];
-                    flag = true;
-                }
-                if(i2 > 0){
-                    splitBidSectionCode =  bidSectionCodes.split(";")[0];
-                    flag = true;
-                }
-                if(i3 > 0){
-                    splitBidSectionCode =  bidSectionCodes.split("<br>")[0];
-                    flag = true;
-                }
-                if(!flag){
-                    splitBidSectionCode = bidSectionCodes;
-                }
-                //获取标包编号
-                if(!ObjectUtils.isEmpty(splitBidSectionCode)){
-                    QueryWrapper<GcTenderbidfile> gcTenderbidfileQueryWrapper = new QueryWrapper<GcTenderbidfile>();
-                    Page<GcTenderbidfile> gcTenderbidfilePage = new Page<GcTenderbidfile>(1, 1);
-                    gcTenderbidfileQueryWrapper.eq("BID_SECTION_CODE",splitBidSectionCode);
-                    List<GcTenderbidfile> gcTenderbidfileRecords = gcTenderbidfileService.page(gcTenderbidfilePage, gcTenderbidfileQueryWrapper).getRecords();
-                    if(gcTenderbidfileRecords.size() >= 1){
+                //获取国标区域名称
+                QueryWrapper<TRegion> tRegionQueryWrapper = new QueryWrapper<TRegion>();
+                String TregionCode = record.getRegionCode();
+                Page<TRegion> pageTRegion = new Page<TRegion>(1, 1);
+                if(!ObjectUtils.isEmpty(TregionCode)){
+                    tRegionQueryWrapper.eq("code",TregionCode+"000000");
+                    List<TRegion> records = tRegionService.page(pageTRegion, tRegionQueryWrapper).getRecords();
+                    if(records.size() >= 1){
                         try {
-                            Integer validPeriod = gcTenderbidfileRecords.get(0).getValidPeriod();
-                            if(!ObjectUtils.isEmpty(validPeriod)){
-                                record.setValidPeriod(validPeriod+"");
+                            String name = records.get(0).getName();
+                            if(!ObjectUtils.isEmpty(name)){
+                                record.setRegionName(name);
                             }
                         }catch (Exception e){
                             e.printStackTrace();
                         }
+                    }
+                }
+                //获取区域编号
+                String areaPlatformCode = record.getPlatformCode();
+                if(!ObjectUtils.isEmpty(areaPlatformCode)){
+                    QueryWrapper<AreaPlatform> areaPlatformQueryWrapper = new QueryWrapper<AreaPlatform>();
+                    Page<AreaPlatform> areaPlatformPage = new Page<AreaPlatform>(1, 1);
+                    areaPlatformQueryWrapper.eq("PLATFORM_CODE",areaPlatformCode);
+                    List<AreaPlatform> recordsAreaPlatform = areaPlatformService.page(areaPlatformPage, areaPlatformQueryWrapper).getRecords();
+                    if(recordsAreaPlatform.size() >= 1){
                         try {
-                            Long clarifyTime = gcTenderbidfileRecords.get(0).getClarifyTime();
-                            if(!ObjectUtils.isEmpty(clarifyTime)){
-                                record.setClarifyTime(clarifyTime+"");
+                            String regionName = recordsAreaPlatform.get(0).getRegionName();
+                            if(!ObjectUtils.isEmpty(regionName)){
+                                record.setPlatformName(regionName);
                             }
                         }catch (Exception e){
                             e.printStackTrace();
                         }
-                        try {
-                            Long submitTime = gcTenderbidfileRecords.get(0).getSubmitTime();
-                            if(!ObjectUtils.isEmpty(submitTime)){
-                                record.setSubmitTime(submitTime+"");
-                            }
-                        }catch (Exception e){
-                            e.printStackTrace();
+                    }
+                }
+
+                record.setTransactionTypeCode(ClassIfy.ENGINEERING_CONSTRUCTION.getCode());
+                record.setTransactionTypeName(ClassIfy.ENGINEERING_CONSTRUCTION.getName());
+                //获取行业信息代码
+                String industriesTypeCode = record.getIndustriesTypeCode();
+                if(!ObjectUtils.isEmpty(industriesTypeCode)){
+                    try {
+                        QueryWrapper<CIndustriesType> cIndustriesTypeQueryWrapper = new QueryWrapper<CIndustriesType>();
+                        cIndustriesTypeQueryWrapper.eq("code",industriesTypeCode);
+                        CIndustriesType cIndustriesType = cIndustriesTypeService.getOne(cIndustriesTypeQueryWrapper);
+                        if(!ObjectUtils.isEmpty(cIndustriesType)){
+                            String name = cIndustriesType.getName();
+                            record.setIndustriesTypeName(name);
                         }
+                    }catch (Exception e){
+                        e.printStackTrace();
                     }
-                    QueryWrapper<GcBidopenrecord> gcBidopenrecordQueryWrapper = new QueryWrapper<GcBidopenrecord>();
-                    Page<GcBidopenrecord> gcBidopenrecordPage = new Page<GcBidopenrecord>(1, 1);
-                    gcBidopenrecordQueryWrapper.eq("BID_SECTION_CODES",splitBidSectionCode);
-                    List<GcBidopenrecord> gcBidopenrecordRecords = gcBidopenrecordService.page(gcBidopenrecordPage, gcBidopenrecordQueryWrapper).getRecords();
-                    if(gcBidopenrecordRecords.size() >= 1){
-                        try {
-                            String bidOpeningAddress = gcBidopenrecordRecords.get(0).getBidOpeningAddress();
-                            if(!ObjectUtils.isEmpty(bidOpeningAddress)){
-                                record.setBidOpeningAddress(bidOpeningAddress);
-                            }
-                        }catch (Exception e){
-                            e.printStackTrace();
+                }
+                record.setNoticeTypeCode(ClassIfy.TENDER_ANNOUNCEMENT.getCode());
+                record.setNoticeTypeName(ClassIfy.TENDER_ANNOUNCEMENT.getName());
+                String bulletinTypeCode = record.getBulletinTypeCode();
+                if(!ObjectUtils.isEmpty(bulletinTypeCode)){
+                    try {
+                        String bulletinTypeName = BulletinType.getBulletinTypeName(bulletinTypeCode);
+                        if(!ObjectUtils.isEmpty(bulletinTypeName)){
+                            record.setBulletinTypeName(bulletinTypeName);
                         }
-                        try {
-                            Long bidOpeningTime = gcBidopenrecordRecords.get(0).getBidOpeningTime();
-                            if(!ObjectUtils.isEmpty(bidOpeningTime)){
-                                record.setBidOpeningTime(bidOpeningTime+"");
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
+                }
+                String dataSourceCode = record.getDataSourceCode();
+                if(!ObjectUtils.isEmpty(dataSourceCode)){
+                    QueryWrapper<TRegion> tRegionQueryWrapperQ = new QueryWrapper<TRegion>();
+                    String subSourceCode = dataSourceCode.substring(1, dataSourceCode.length());
+                    tRegionQueryWrapperQ.eq("code",subSourceCode+"000000");
+                    List<TRegion> tRegionList = tRegionService.page(pageTRegion, tRegionQueryWrapperQ).getRecords();
+                    if(tRegionList.size() >= 1){
+                        String name = tRegionList.get(0).getName();
+                        if(!ObjectUtils.isEmpty(name)){
+                            record.setDataSourceName(name+"公共资源交易中心");
+                        }
+                    }
+                    if(subSourceCode.equals("150401")){
+                        record.setDataSourceName("赤峰市公共资源交易中心");
+                    }
+                }
+                String bidSectionCodes = record.getBidSectionCodes();
+                if(!ObjectUtils.isEmpty(bidSectionCodes)){
+                    int i1 = bidSectionCodes.indexOf(",");
+                    int i2 = bidSectionCodes.indexOf(";");
+                    int i3 = bidSectionCodes.indexOf("<br>");
+                    String splitBidSectionCode = null;
+                    boolean flag = false;
+                    if(i1 > 0){
+                        splitBidSectionCode =  bidSectionCodes.split(",")[0];
+                        flag = true;
+                    }
+                    if(i2 > 0){
+                        splitBidSectionCode =  bidSectionCodes.split(";")[0];
+                        flag = true;
+                    }
+                    if(i3 > 0){
+                        splitBidSectionCode =  bidSectionCodes.split("<br>")[0];
+                        flag = true;
+                    }
+                    if(!flag){
+                        splitBidSectionCode = bidSectionCodes;
+                    }
+                    //获取标包编号
+                    if(!ObjectUtils.isEmpty(splitBidSectionCode)){
+                        QueryWrapper<GcTenderbidfile> gcTenderbidfileQueryWrapper = new QueryWrapper<GcTenderbidfile>();
+                        Page<GcTenderbidfile> gcTenderbidfilePage = new Page<GcTenderbidfile>(1, 1);
+                        gcTenderbidfileQueryWrapper.eq("BID_SECTION_CODE",splitBidSectionCode);
+                        List<GcTenderbidfile> gcTenderbidfileRecords = gcTenderbidfileService.page(gcTenderbidfilePage, gcTenderbidfileQueryWrapper).getRecords();
+                        if(gcTenderbidfileRecords.size() >= 1){
+                            try {
+                                Integer validPeriod = gcTenderbidfileRecords.get(0).getValidPeriod();
+                                if(!ObjectUtils.isEmpty(validPeriod)){
+                                    record.setValidPeriod(validPeriod+"");
+                                }
+                            }catch (Exception e){
+                                e.printStackTrace();
+                            }
+                            try {
+                                Long clarifyTime = gcTenderbidfileRecords.get(0).getClarifyTime();
+                                if(!ObjectUtils.isEmpty(clarifyTime)){
+                                    record.setClarifyTime(clarifyTime+"");
+                                }
+                            }catch (Exception e){
+                                e.printStackTrace();
+                            }
+                            try {
+                                Long submitTime = gcTenderbidfileRecords.get(0).getSubmitTime();
+                                if(!ObjectUtils.isEmpty(submitTime)){
+                                    record.setSubmitTime(submitTime+"");
+                                }
+                            }catch (Exception e){
+                                e.printStackTrace();
                             }
-                        }catch (Exception e){
-                            e.printStackTrace();
                         }
-                        try {
-                            Long bidFinishTime = gcBidopenrecordRecords.get(0).getBidFinishTime();
-                            if(!ObjectUtils.isEmpty(bidFinishTime)){
-                                record.setBidFinishTime(bidFinishTime+"");
+                        QueryWrapper<GcBidopenrecord> gcBidopenrecordQueryWrapper = new QueryWrapper<GcBidopenrecord>();
+                        Page<GcBidopenrecord> gcBidopenrecordPage = new Page<GcBidopenrecord>(1, 1);
+                        gcBidopenrecordQueryWrapper.eq("BID_SECTION_CODES",splitBidSectionCode);
+                        List<GcBidopenrecord> gcBidopenrecordRecords = gcBidopenrecordService.page(gcBidopenrecordPage, gcBidopenrecordQueryWrapper).getRecords();
+                        if(gcBidopenrecordRecords.size() >= 1){
+                            try {
+                                String bidOpeningAddress = gcBidopenrecordRecords.get(0).getBidOpeningAddress();
+                                if(!ObjectUtils.isEmpty(bidOpeningAddress)){
+                                    record.setBidOpeningAddress(bidOpeningAddress);
+                                }
+                            }catch (Exception e){
+                                e.printStackTrace();
+                            }
+                            try {
+                                Long bidOpeningTime = gcBidopenrecordRecords.get(0).getBidOpeningTime();
+                                if(!ObjectUtils.isEmpty(bidOpeningTime)){
+                                    record.setBidOpeningTime(bidOpeningTime+"");
+                                }
+                            }catch (Exception e){
+                                e.printStackTrace();
+                            }
+                            try {
+                                Long bidFinishTime = gcBidopenrecordRecords.get(0).getBidFinishTime();
+                                if(!ObjectUtils.isEmpty(bidFinishTime)){
+                                    record.setBidFinishTime(bidFinishTime+"");
+                                }
+                            }catch (Exception e){
+                                e.printStackTrace();
                             }
-                        }catch (Exception e){
-                            e.printStackTrace();
                         }
-                    }
-                    String noticeNature = record.getNoticeNature();
-                    if(!ObjectUtils.isEmpty(noticeNature)){
-                        try {
-                            String noticeNatureTypeName = BulletinType.getNoticeNatureTypeName(noticeNature);
-                            if(!ObjectUtils.isEmpty(noticeNatureTypeName)){
-                                record.setNoticeNatureName(noticeNatureTypeName);
+                        String noticeNature = record.getNoticeNature();
+                        if(!ObjectUtils.isEmpty(noticeNature)){
+                            try {
+                                String noticeNatureTypeName = BulletinType.getNoticeNatureTypeName(noticeNature);
+                                if(!ObjectUtils.isEmpty(noticeNatureTypeName)){
+                                    record.setNoticeNatureName(noticeNatureTypeName);
+                                }
+                            }catch (Exception e){
+                                e.printStackTrace();
                             }
-                        }catch (Exception e){
-                            e.printStackTrace();
                         }
                     }
                 }
+                TenderDetailsVoUtils.isNull(record);
             }
-            TenderDetailsVoUtils.isNull(record);
         }
         return pageList.getRecords();
     }

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

@@ -112,7 +112,7 @@ public class ZrzyBgBidwinNoticeSchedul implements Job {
     }
     public List<TenderDetailsVo> getTenderDetailsVoListAll(Integer pageNo,Integer pageSize,Long time){
         QueryWrapper<ZrzyBgBidwinNotice> gcPerformanceQueryWrapper = new QueryWrapper<ZrzyBgBidwinNotice>();
-        gcPerformanceQueryWrapper.gt("ISSUE_TIME",time);
+        gcPerformanceQueryWrapper.gt("DATA_TIMESTAMP",time);
         Page<ZrzyBgBidwinNotice> page = new Page<ZrzyBgBidwinNotice>(pageNo, pageSize);
         Page<ZrzyBgBidwinNotice> page1 = zrzyBgBidwinNoticeService.page(page,gcPerformanceQueryWrapper);
         List<ZrzyBgBidwinNotice> records = page1.getRecords();

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

@@ -95,7 +95,7 @@ public class ZrzyBgNoticeSchedul implements Job {
         }
         if(!ObjectUtils.isEmpty(time)){
             QueryWrapper<ZrzyBgNotice> gcPerformanceQueryWrapper = new QueryWrapper<ZrzyBgNotice>();
-            gcPerformanceQueryWrapper.gt("ISSUE_TIME",time);
+            gcPerformanceQueryWrapper.gt("DATA_TIMESTAMP",time);
             int count = zrzyBgNoticeService.count(gcPerformanceQueryWrapper);
             Integer pageSize = 1000;
             Integer pageNum = (int)Math.ceil((double)count/pageSize);
@@ -159,8 +159,8 @@ public class ZrzyBgNoticeSchedul implements Job {
         }
         for (TenderDetailsVo record : tenderDetailsVos) {
            try {
-               record.setNoticeTypeCode(ClassIfy.TRANSACTION_PARCEL.getCode());
-               record.setNoticeTypeName(ClassIfy.TRANSACTION_PARCEL.getName());
+               record.setNoticeTypeCode(ClassIfy.TRANSFER_ANNOUNCEMENT.getCode());
+               record.setNoticeTypeName(ClassIfy.TRANSFER_ANNOUNCEMENT.getName());
                record.setTransactionTypeCode(ClassIfy.NATURAL_RESOURCES.getCode());
                record.setTransactionTypeName(ClassIfy.NATURAL_RESOURCES.getName());
                record = tenderDetailsVoService.getTenderDetailsVoAllOrther(record);

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

@@ -93,7 +93,7 @@ public class ZrzyCkqBidwinnoticeSchedul implements Job {
         }
         if(!ObjectUtils.isEmpty(time)){
             QueryWrapper<ZrzyCkqBidwinnotice> gcPerformanceQueryWrapper = new QueryWrapper<ZrzyCkqBidwinnotice>();
-            gcPerformanceQueryWrapper.gt("PUBLISHING_TIME",time);
+            gcPerformanceQueryWrapper.gt("DATA_TIMESTAMP",time);
             int count = zrzyCkqBidwinnoticeService.count(gcPerformanceQueryWrapper);
             Integer pageSize = 1000;
             Integer pageNum = (int)Math.ceil((double)count/pageSize);

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

@@ -93,7 +93,7 @@ public class ZrzyCkqNoticeSchedul implements Job {
         }
         if(!ObjectUtils.isEmpty(time)){
             QueryWrapper<ZrzyCkqNotice> gcPerformanceQueryWrapper = new QueryWrapper<ZrzyCkqNotice>();
-            gcPerformanceQueryWrapper.gt("NOTICE_SEND_TIME",time);
+            gcPerformanceQueryWrapper.gt("DATA_TIMESTAMP",time);
             int count = zrzyCkqNoticeService.count(gcPerformanceQueryWrapper);
             Integer pageSize = 1000;
             Integer pageNum = (int)Math.ceil((double)count/pageSize);
@@ -158,8 +158,8 @@ public class ZrzyCkqNoticeSchedul implements Job {
         }
         for (TenderDetailsVo record : tenderDetailsVos) {
            try {
-               record.setNoticeTypeCode(ClassIfy.TRANSACTION_PARCEL.getCode());
-               record.setNoticeTypeName(ClassIfy.TRANSACTION_PARCEL.getName());
+               record.setNoticeTypeCode(ClassIfy.TRANSFER_ANNOUNCEMENT.getCode());
+               record.setNoticeTypeName(ClassIfy.TRANSFER_ANNOUNCEMENT.getName());
                record.setTransactionTypeCode(ClassIfy.NATURAL_RESOURCES.getCode());
                record.setTransactionTypeName(ClassIfy.NATURAL_RESOURCES.getName());
                record = tenderDetailsVoService.getTenderDetailsVoAllOrther(record);

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

@@ -93,7 +93,7 @@ public class ZrzyDkBinwinNoticeSchedul implements Job {
         }
         if(!ObjectUtils.isEmpty(time)){
             QueryWrapper<ZrzyDkBinwinNotice> gcPerformanceQueryWrapper = new QueryWrapper<ZrzyDkBinwinNotice>();
-            gcPerformanceQueryWrapper.gt("SUBMITS_TIME",time);
+            gcPerformanceQueryWrapper.gt("DATA_TIMESTAMP",time);
             int count = zrzyDkBinwinNoticeService.count(gcPerformanceQueryWrapper);
             Integer pageSize = 1000;
             Integer pageNum = (int)Math.ceil((double)count/pageSize);

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

@@ -95,7 +95,7 @@ public class ZrzyDkNoticeSchedul implements Job {
         }
         if(!ObjectUtils.isEmpty(time)){
             QueryWrapper<ZrzyDkNotice> gcPerformanceQueryWrapper = new QueryWrapper<ZrzyDkNotice>();
-            gcPerformanceQueryWrapper.gt("NOTICE_SEND_TIME",time);
+            gcPerformanceQueryWrapper.gt("DATA_TIMESTAMP",time);
             int count = zrzyDkNoticeService.count(gcPerformanceQueryWrapper);
             Integer pageSize = 1000;
             Integer pageNum = (int)Math.ceil((double)count/pageSize);
@@ -159,8 +159,8 @@ public class ZrzyDkNoticeSchedul implements Job {
         }
         for (TenderDetailsVo record : tenderDetailsVos) {
            try {
-               record.setNoticeTypeCode(ClassIfy.TRANSACTION_PARCEL.getCode());
-               record.setNoticeTypeName(ClassIfy.TRANSACTION_PARCEL.getName());
+               record.setNoticeTypeCode(ClassIfy.TRANSFER_ANNOUNCEMENT.getCode());
+               record.setNoticeTypeName(ClassIfy.TRANSFER_ANNOUNCEMENT.getName());
                record.setTransactionTypeCode(ClassIfy.NATURAL_RESOURCES.getCode());
                record.setTransactionTypeName(ClassIfy.NATURAL_RESOURCES.getName());
                record = tenderDetailsVoService.getTenderDetailsVoAllOrther(record);

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

@@ -96,7 +96,7 @@ public class ZrzyJyzbBidwinNoticeSchedul implements Job {
         }
         if(!ObjectUtils.isEmpty(time)){
             QueryWrapper<ZrzyJyzbBidwinNotice> gcPerformanceQueryWrapper = new QueryWrapper<ZrzyJyzbBidwinNotice>();
-            gcPerformanceQueryWrapper.gt("ISSUE_TIME",time);
+            gcPerformanceQueryWrapper.gt("DATA_TIMESTAMP",time);
             int count = zrzyJyzbBidwinNoticeService.count(gcPerformanceQueryWrapper);
             Integer pageSize = 1000;
             Integer pageNum = (int)Math.ceil((double)count/pageSize);

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

@@ -92,7 +92,7 @@ public class ZrzyJyzbNoticeSchedul implements Job {
         }
         if(!ObjectUtils.isEmpty(time)){
             QueryWrapper<ZrzyJyzbNotice> gcPerformanceQueryWrapper = new QueryWrapper<ZrzyJyzbNotice>();
-            gcPerformanceQueryWrapper.gt("ISSUE_TIME",time);
+            gcPerformanceQueryWrapper.gt("DATA_TIMESTAMP",time);
             int count = zrzyJyzbNoticeService.count(gcPerformanceQueryWrapper);
             Integer pageSize = 1000;
             Integer pageNum = (int)Math.ceil((double)count/pageSize);
@@ -156,8 +156,8 @@ public class ZrzyJyzbNoticeSchedul implements Job {
         }
         for (TenderDetailsVo record : tenderDetailsVos) {
            try {
-               record.setNoticeTypeCode(ClassIfy.TRANSACTION_PARCEL.getCode());
-               record.setNoticeTypeName(ClassIfy.TRANSACTION_PARCEL.getName());
+               record.setNoticeTypeCode(ClassIfy.TRANSFER_ANNOUNCEMENT.getCode());
+               record.setNoticeTypeName(ClassIfy.TRANSFER_ANNOUNCEMENT.getName());
                record.setTransactionTypeCode(ClassIfy.NATURAL_RESOURCES.getCode());
                record.setTransactionTypeName(ClassIfy.NATURAL_RESOURCES.getName());
                record = tenderDetailsVoService.getTenderDetailsVoAllOrther(record);

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

@@ -93,7 +93,7 @@ public class ZrzyTkqNoticeSchedul implements Job {
         }
         if(!ObjectUtils.isEmpty(time)){
             QueryWrapper<ZrzyTkqNotice> gcPerformanceQueryWrapper = new QueryWrapper<ZrzyTkqNotice>();
-            gcPerformanceQueryWrapper.gt("NOTICE_SEND_TIME",time);
+            gcPerformanceQueryWrapper.gt("DATA_TIMESTAMP",time);
             int count = zrzyTkqNoticeService.count(gcPerformanceQueryWrapper);
             Integer pageSize = 1000;
             Integer pageNum = (int)Math.ceil((double)count/pageSize);
@@ -158,8 +158,8 @@ public class ZrzyTkqNoticeSchedul implements Job {
         }
         for (TenderDetailsVo record : tenderDetailsVos) {
            try {
-               record.setNoticeTypeCode(ClassIfy.TRANSACTION_PARCEL.getCode());
-               record.setNoticeTypeName(ClassIfy.TRANSACTION_PARCEL.getName());
+               record.setNoticeTypeCode(ClassIfy.TRANSFER_ANNOUNCEMENT.getCode());
+               record.setNoticeTypeName(ClassIfy.TRANSFER_ANNOUNCEMENT.getName());
                record.setTransactionTypeCode(ClassIfy.NATURAL_RESOURCES.getCode());
                record.setTransactionTypeName(ClassIfy.NATURAL_RESOURCES.getName());
                record = tenderDetailsVoService.getTenderDetailsVoAllOrther(record);

src/main/resources/mapper/GcBidopenrecordMapper.xml

@@ -10,6 +10,7 @@
             gcb.NOTICE_NAME noticeName,
             gcb.PLATFORM_CODE platformCode,
             gcb.BID_OPENING_ADDRESS bidOpeningAddress,
+            gcb.BID_OPENING_TIME noticeSendTime,
             gcb.BID_OPENING_TIME bidOpeningTime,
             gcb.BID_FINISH_TIME bidFinishTime,
             gct.REGION_CODE regionCode,
@@ -60,7 +61,7 @@
             gcb.TENDER_PROJECT_CODE tenderProjectCode,
             gcb.NOTICE_NAME noticeName,
             gcb.BID_OPENING_CONTENT noticeContent,
-            gct.CREATE_TIME noticeSendTime,
+            gcb.BID_OPENING_TIME noticeSendTime,
             gcb.BID_OPENING_TIME bidOpeningTime,
             gcb.BID_FINISH_TIME bidFinishTime,
             gct.REGION_CODE regionCode,
@@ -86,7 +87,7 @@
             gcb.TENDER_PROJECT_CODE tenderProjectCode,
             gcb.NOTICE_NAME noticeName,
             gcb.BID_OPENING_CONTENT noticeContent,
-            gct.CREATE_TIME noticeSendTime,
+            gcb.BID_OPENING_TIME noticeSendTime,
             gcb.BID_OPENING_TIME bidOpeningTime,
             gcb.BID_FINISH_TIME bidFinishTime,
             gct.REGION_CODE regionCode,