mycopy123@163.com пре 5 месеци
родитељ
комит
d203c7dfe1

+ 1 - 1
src/main/java/com/trs/ggzyexchange/entity/AllianceCityWebsite.java

@@ -21,7 +21,7 @@ public class AllianceCityWebsite {
     private String sourceDataKey;
     private String bulletinTitle;
     private String bulletinContent;
-    private Long publishingTime;
+    private String publishingTime;
     private String regionCode;
     private String bulletinType;
     private String industryType;

+ 2 - 0
src/main/java/com/trs/ggzyexchange/enums/ClassIfy.java

@@ -20,6 +20,8 @@ public enum ClassIfy {
     CF_PROPERTY("cf_resources", "资源权益交易"),
     HHHT_PROPERTY("hhht_resources", "产权交易"),
 
+    FYFBZ_PROJECT("fyfbz_project", "非依法必招项目"),
+
 
     /**
      * 编码对照 --- 上面公告类型

+ 18 - 2
src/main/java/com/trs/ggzyexchange/schedul/AllianceCityWebsiteSchedul.java

@@ -135,7 +135,7 @@ public class AllianceCityWebsiteSchedul implements Job {
                 tenderDetailsVo.setTenderProjectCode(projectCode);
             }
 
-            Long noticeSendTime = record.getPublishingTime();
+            String noticeSendTime = record.getPublishingTime();
             Long createDate = record.getCreateDate();
             if(false&&!ObjectUtils.isEmpty(createDate)&&0 != createDate){
                 tenderDetailsVo.setNoticeSendTime(record.getCreateDate().toString());
@@ -151,7 +151,7 @@ public class AllianceCityWebsiteSchedul implements Job {
             if(!ObjectUtils.isEmpty(regionCode)){
                 tenderDetailsVo.setRegionCode(regionCode);
             }
-            Long noticeEndTime = record.getPublishingTime();
+            String noticeEndTime = record.getPublishingTime();
             if(!ObjectUtils.isEmpty(noticeEndTime)){
                 tenderDetailsVo.setDocGetEndTime(noticeEndTime.toString());
             }
@@ -220,6 +220,22 @@ public class AllianceCityWebsiteSchedul implements Job {
                         }
                         record.setTransactionTypeCode(ClassIfy.CF_PROPERTY.getCode());
                         record.setTransactionTypeName(ClassIfy.CF_PROPERTY.getName());
+                    }else if("100".equals(typeCode)){//非依法必招项目
+                        if("1".equals(typeName)){//招标公告
+                            record.setNoticeTypeCode(ClassIfy.TENDER_ANNOUNCEMENT.getCode());
+                            record.setNoticeTypeName(ClassIfy.TENDER_ANNOUNCEMENT.getName());
+                        }else if("2".equals(typeName)){//变更公告
+                            record.setNoticeTypeCode(ClassIfy.CHANGE_ANNOUNCEMENT.getCode());
+                            record.setNoticeTypeName(ClassIfy.CHANGE_ANNOUNCEMENT.getName());
+                        }else if("3".equals(typeName)){//候选人公告
+                            record.setNoticeTypeCode(ClassIfy.PUBLICITY_OF_BID_WINNER_CANDIDATES.getCode());
+                            record.setNoticeTypeName(ClassIfy.PUBLICITY_OF_BID_WINNER_CANDIDATES.getName());
+                        }else if("4".equals(typeName)){//结果公告
+                            record.setNoticeTypeCode(ClassIfy.ANNOUNCEMENT_OF_BID_WINNING_RESULTS.getCode());
+                            record.setNoticeTypeName(ClassIfy.ANNOUNCEMENT_OF_BID_WINNING_RESULTS.getName());
+                        }
+                        record.setTransactionTypeCode(ClassIfy.FYFBZ_PROJECT.getCode());
+                        record.setTransactionTypeName(ClassIfy.FYFBZ_PROJECT.getName());
                     }
                }else {
                    continue;