|
|
@@ -32,15 +32,15 @@ import java.util.List;
|
|
|
* @since 2023-02-24
|
|
|
*/
|
|
|
|
|
|
-@Component
|
|
|
-public class ZrzyTkqBidwinnoticeSchedul{
|
|
|
+//@Component
|
|
|
+//public class ZrzyTkqBidwinnoticeSchedul{
|
|
|
|
|
|
/*}
|
|
|
-@Component
|
|
|
-public class ZrzyTkqBidwinnoticeSchedul implements Job {
|
|
|
+
|
|
|
*/
|
|
|
-/*
|
|
|
|
|
|
+@Component
|
|
|
+public class ZrzyTkqBidwinnoticeSchedul implements Job {
|
|
|
private Logger logger = LoggerFactory.getLogger(ZrzyTkqBidwinnoticeSchedul.class);
|
|
|
|
|
|
@Autowired
|
|
|
@@ -110,7 +110,97 @@ public class ZrzyTkqBidwinnoticeSchedul implements Job {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
public List<TenderDetailsVo> getTenderDetailsVoListAll(Integer pageNo,Integer pageSize,Long time){
|
|
|
+ QueryWrapper<ZrzyTkqBidwinnotice> gcPerformanceQueryWrapper = new QueryWrapper<ZrzyTkqBidwinnotice>();
|
|
|
+ gcPerformanceQueryWrapper.gt("PUBLISHING_TIME",time);
|
|
|
+ Page<ZrzyTkqBidwinnotice> page = new Page<ZrzyTkqBidwinnotice>(pageNo, pageSize);
|
|
|
+ Page<ZrzyTkqBidwinnotice> page1 = zrzyTkqBidwinnoticeService.page(page,gcPerformanceQueryWrapper);
|
|
|
+ List<ZrzyTkqBidwinnotice> records = page1.getRecords();
|
|
|
+ List<TenderDetailsVo> tenderDetailsVos = new ArrayList<TenderDetailsVo>();
|
|
|
+ for (ZrzyTkqBidwinnotice record : records) {
|
|
|
+ TenderDetailsVo tenderDetailsVo = new TenderDetailsVo();
|
|
|
+
|
|
|
+ String sourceDataCode = record.getSourceDataCode();
|
|
|
+ if(!ObjectUtils.isEmpty(sourceDataCode)){
|
|
|
+ tenderDetailsVo.setProjectCode(sourceDataCode);
|
|
|
+ }
|
|
|
+ String noticeName = record.getNaAppName();
|
|
|
+ if(!ObjectUtils.isEmpty(noticeName)){
|
|
|
+ tenderDetailsVo.setNoticeName(noticeName);
|
|
|
+ }
|
|
|
+ String projectName = record.getNaAppName();
|
|
|
+ if(!ObjectUtils.isEmpty(projectName)){
|
|
|
+ tenderDetailsVo.setProjectName(projectName);
|
|
|
+ }
|
|
|
+ String traAgencyCode = record.getTraAgencyCode();
|
|
|
+ if(!ObjectUtils.isEmpty(traAgencyCode)){
|
|
|
+ tenderDetailsVo.setTenderProjectCode(traAgencyCode);
|
|
|
+ }
|
|
|
+ String announcementConnect = record.getAnnouncementConnect();
|
|
|
+ if(!ObjectUtils.isEmpty(announcementConnect)){
|
|
|
+ tenderDetailsVo.setNoticeContent(announcementConnect);
|
|
|
+ }
|
|
|
+
|
|
|
+ Long noticeSendTime = record.getPublishingTime();
|
|
|
+ Long createDate = record.getCreateDate();
|
|
|
+ if(!ObjectUtils.isEmpty(createDate)){
|
|
|
+ tenderDetailsVo.setNoticeSendTime(record.getCreateDate().toString());
|
|
|
+ }else{
|
|
|
+
|
|
|
+ if(!ObjectUtils.isEmpty(noticeSendTime)){
|
|
|
+ tenderDetailsVo.setNoticeSendTime(noticeSendTime.toString());
|
|
|
+ tenderDetailsVo.setDocGetStartTime(noticeSendTime.toString());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ String regionCode = record.getRegionCode();
|
|
|
+ if(!ObjectUtils.isEmpty(regionCode)){
|
|
|
+ tenderDetailsVo.setRegionCode(regionCode);
|
|
|
+ }
|
|
|
+ Long noticeEndTime = record.getPublishingTime();
|
|
|
+ if(!ObjectUtils.isEmpty(noticeEndTime)){
|
|
|
+ tenderDetailsVo.setDocGetEndTime(noticeEndTime.toString());
|
|
|
+ }
|
|
|
+ String dataSourceCode = record.getDataSourceCode();
|
|
|
+ if(!ObjectUtils.isEmpty(dataSourceCode)){
|
|
|
+ tenderDetailsVo.setDataSourceCode(dataSourceCode);
|
|
|
+ }
|
|
|
+ String sourceDataKey = record.getSourceDataKey();
|
|
|
+ if(!ObjectUtils.isEmpty(sourceDataKey)){
|
|
|
+ tenderDetailsVo.setSourceDataKey(sourceDataKey+noticeSendTime);
|
|
|
+ }
|
|
|
+ tenderDetailsVos.add(tenderDetailsVo);
|
|
|
+ }
|
|
|
+ for (TenderDetailsVo record : tenderDetailsVos) {
|
|
|
+ try {
|
|
|
+ record.setNoticeTypeCode(ClassIfy.TRANSACTION_PARCEL.getCode());
|
|
|
+ record.setNoticeTypeName(ClassIfy.TRANSACTION_PARCEL.getName());
|
|
|
+ record.setTransactionTypeCode(ClassIfy.NATURAL_RESOURCES.getCode());
|
|
|
+ record.setTransactionTypeName(ClassIfy.NATURAL_RESOURCES.getName());
|
|
|
+ record = tenderDetailsVoService.getTenderDetailsVoAllOrther(record);
|
|
|
+ try {
|
|
|
+ String regionCode = record.getRegionCode();
|
|
|
+ AreaPlatform areaPlatformByRegionCode = areaPlatformService.getAreaPlatformByRegionCode(regionCode);
|
|
|
+ if(!ObjectUtils.isEmpty(areaPlatformByRegionCode)){
|
|
|
+ record.setPlatformCode(areaPlatformByRegionCode.getPlatformCode());
|
|
|
+ record.setPlatformName(areaPlatformByRegionCode.getRegionName());
|
|
|
+ }
|
|
|
+ record.setIndustriesTypeName(ClassIfy.zrzy_ky.getName());
|
|
|
+ }catch (Exception e){
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ TenderDetailsVoUtils.isNull(record);
|
|
|
+ }catch (Exception e){
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return tenderDetailsVos;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+/* public List<TenderDetailsVo> getTenderDetailsVoListAll(Integer pageNo,Integer pageSize,Long time){
|
|
|
QueryWrapper<ZrzyTkqBidwinnotice> gcPerformanceQueryWrapper = new QueryWrapper<ZrzyTkqBidwinnotice>();
|
|
|
gcPerformanceQueryWrapper.gt("DATA_TIMESTAMP",time);
|
|
|
Page<ZrzyTkqBidwinnotice> page = new Page<ZrzyTkqBidwinnotice>(pageNo, pageSize);
|
|
|
@@ -123,7 +213,7 @@ public class ZrzyTkqBidwinnoticeSchedul implements Job {
|
|
|
if(!ObjectUtils.isEmpty(sourceDataKey)){
|
|
|
tenderDetailsVo.setSourceDataKey(sourceDataKey);
|
|
|
}
|
|
|
- String dealLandCode = record.getDealLandCode();
|
|
|
+ *//*String dealLandCode = record.getDealLandCode();
|
|
|
if(!ObjectUtils.isEmpty(dealLandCode)){
|
|
|
tenderDetailsVo.setProjectCode(dealLandCode);
|
|
|
}
|
|
|
@@ -138,7 +228,9 @@ public class ZrzyTkqBidwinnoticeSchedul implements Job {
|
|
|
String dealAnnouncementGuid = record.getDealAnnouncementGuid();
|
|
|
if(!ObjectUtils.isEmpty(dealAnnouncementGuid)){
|
|
|
tenderDetailsVo.setTenderProjectCode(dealAnnouncementGuid);
|
|
|
- }
|
|
|
+ }*//*
|
|
|
+
|
|
|
+
|
|
|
String announcementConnect = record.getAnnouncementConnect();
|
|
|
if(!ObjectUtils.isEmpty(announcementConnect)){
|
|
|
tenderDetailsVo.setNoticeContent(announcementConnect);
|
|
|
@@ -185,9 +277,8 @@ public class ZrzyTkqBidwinnoticeSchedul implements Job {
|
|
|
}
|
|
|
}
|
|
|
return tenderDetailsVos;
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
- @Override
|
|
|
public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
|
|
|
try {
|
|
|
if(JobLock.ZrzyTdBidwinnoticeFlag){
|
|
|
@@ -207,7 +298,7 @@ public class ZrzyTkqBidwinnoticeSchedul implements Job {
|
|
|
JobLock.ZrzyTdBidwinnoticeFlag = true;
|
|
|
}
|
|
|
}
|
|
|
-*/
|
|
|
+
|
|
|
|
|
|
|
|
|
}
|