Просмотр исходного кода

编号修改、标段号拆分修改

mycopy123@163.com 1 год назад
Родитель
Сommit
d3cfb3b4a6

+ 7 - 0
src/main/java/com/trs/ggzyexchange/schedul/GcNoticeandfileSchedul.java

@@ -227,6 +227,7 @@ public class  GcNoticeandfileSchedul  implements Job {
                     int i1 = bidSectionCodes.indexOf(",");
                     int i2 = bidSectionCodes.indexOf(";");
                     int i3 = bidSectionCodes.indexOf("<br>");
+                    int i4 = bidSectionCodes.indexOf("ltbrgt");
                     String splitBidSectionCode = null;
                     String[] split = null;
                     boolean flag = false;
@@ -245,6 +246,11 @@ public class  GcNoticeandfileSchedul  implements Job {
                         split =  bidSectionCodes.split("<br>");
                         flag = true;
                     }
+                    if(i4 > 0){
+                        splitBidSectionCode =  bidSectionCodes.split("ltbrgt")[0];
+                        split =  bidSectionCodes.split("ltbrgt");
+                        flag = true;
+                    }
                     if(!flag){
                         splitBidSectionCode = bidSectionCodes;
                         split =  bidSectionCodes.split(",");
@@ -377,6 +383,7 @@ public class  GcNoticeandfileSchedul  implements Job {
                 try {
                     bidSectionCodes = bidSectionCodes.replaceAll(",",";");
                     bidSectionCodes = bidSectionCodes.replaceAll("<br",";");
+                    bidSectionCodes = bidSectionCodes.replaceAll("ltbrgt",";");
                 }catch (Exception e){
                     e.printStackTrace();
                 }

+ 5 - 0
src/main/java/com/trs/ggzyexchange/schedul/GcTenderbidfileSchedul.java

@@ -148,6 +148,7 @@ public class GcTenderbidfileSchedul   implements Job {
                 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;
@@ -163,6 +164,10 @@ public class GcTenderbidfileSchedul   implements Job {
                     split =  bidSectionCodes.split("<br>");
                     flag = true;
                 }
+                if(i4 > 0){
+                    split =  bidSectionCodes.split("ltbrgt");
+                    flag = true;
+                }
                 if(!flag){
                     split = new String[]{bidSectionCodes};
                 }

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

@@ -139,8 +139,8 @@ public class ZrzyBgBidwinNoticeSchedul implements Job {
                 tenderDetailsVo.setProjectName(projectName);
             }
             String unifiedDealCode = record.getUnifiedDealCode();
-            if(!ObjectUtils.isEmpty(unifiedDealCode)){
-                tenderDetailsVo.setTenderProjectCode(unifiedDealCode);
+            if(!ObjectUtils.isEmpty(projectCode)){
+                tenderDetailsVo.setTenderProjectCode(projectCode);
             }
             String noticeContent = record.getNoticeContent();
             if(!ObjectUtils.isEmpty(noticeContent)){

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

@@ -132,8 +132,8 @@ public class ZrzyDkBinwinNoticeSchedul implements Job {
                 tenderDetailsVo.setProjectName(projectName);
             }
             String unifiedDealCode = record.getUnifiedDealCode();
-            if(!ObjectUtils.isEmpty(unifiedDealCode)){
-                tenderDetailsVo.setTenderProjectCode(unifiedDealCode);
+            if(!ObjectUtils.isEmpty(projectCode)){
+                tenderDetailsVo.setTenderProjectCode(projectCode);
             }
             String noticeContent = record.getNoticeContent();
             if(!ObjectUtils.isEmpty(noticeContent)){

+ 3 - 3
src/main/java/com/trs/ggzyexchange/schedul/ZrzyDkNoticeSchedul.java

@@ -121,9 +121,9 @@ public class ZrzyDkNoticeSchedul implements Job {
         List<TenderDetailsVo> tenderDetailsVos = new ArrayList<TenderDetailsVo>();
         for (ZrzyDkNotice record : records) {
             TenderDetailsVo tenderDetailsVo = new TenderDetailsVo();
-            String sourceDataCode = record.getSourceDataCode();
-            if(!ObjectUtils.isEmpty(sourceDataCode)){
-                tenderDetailsVo.setProjectCode(sourceDataCode);
+            String projectCode1 = record.getProjectCode();
+            if(!ObjectUtils.isEmpty(projectCode1)){
+                tenderDetailsVo.setProjectCode(projectCode1);
             }
             String noticeName = record.getNoticeName();
             if(!ObjectUtils.isEmpty(noticeName)){

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

@@ -135,8 +135,8 @@ public class ZrzyJyzbBidwinNoticeSchedul implements Job {
                 tenderDetailsVo.setProjectName(projectName);
             }
             String unifiedDealCode = record.getUnifiedDealCode();
-            if(!ObjectUtils.isEmpty(unifiedDealCode)){
-                tenderDetailsVo.setTenderProjectCode(unifiedDealCode);
+            if(!ObjectUtils.isEmpty(projectCode)){
+                tenderDetailsVo.setTenderProjectCode(projectCode);
             }
             String noticeContent = record.getNoticeContent();
             if(!ObjectUtils.isEmpty(noticeContent)){

+ 3 - 3
src/main/java/com/trs/ggzyexchange/schedul/ZrzyJyzbNoticeSchedul.java

@@ -118,9 +118,9 @@ public class ZrzyJyzbNoticeSchedul implements Job {
         List<TenderDetailsVo> tenderDetailsVos = new ArrayList<TenderDetailsVo>();
         for (ZrzyJyzbNotice record : records) {
             TenderDetailsVo tenderDetailsVo = new TenderDetailsVo();
-            String sourceDataCode = record.getSourceDataCode();
-            if(!ObjectUtils.isEmpty(sourceDataCode)){
-                tenderDetailsVo.setProjectCode(sourceDataCode);
+            String projectCode1 = record.getProjectCode();
+            if(!ObjectUtils.isEmpty(projectCode1)){
+                tenderDetailsVo.setProjectCode(projectCode1);
             }
             String noticeName = record.getNoticeName();
             if(!ObjectUtils.isEmpty(noticeName)){

+ 5 - 5
src/main/java/com/trs/ggzyexchange/schedul/ZrzyTdBidwinnoticeSchedul.java

@@ -130,9 +130,9 @@ public class ZrzyTdBidwinnoticeSchedul   implements Job {
             TenderDetailsVo tenderDetailsVo = new TenderDetailsVo();
             String sourceDataKey = record.getSourceDataKey();
 
-            String dealLandCode = record.getDealLandCode();
-            if(!ObjectUtils.isEmpty(dealLandCode)){
-                tenderDetailsVo.setProjectCode(dealLandCode);
+            String landProjectName1 = record.getLandProjectName();
+            if(!ObjectUtils.isEmpty(landProjectName1)){
+                tenderDetailsVo.setProjectCode(landProjectName1);
             }
             String announcementTitle = record.getAnnouncementTitle();
             if(!ObjectUtils.isEmpty(announcementTitle)){
@@ -143,8 +143,8 @@ public class ZrzyTdBidwinnoticeSchedul   implements Job {
                 tenderDetailsVo.setProjectName(landProjectName);
             }
             String dealAnnouncementGuid = record.getDealAnnouncementGuid();
-            if(!ObjectUtils.isEmpty(dealAnnouncementGuid)){
-                tenderDetailsVo.setTenderProjectCode(dealAnnouncementGuid);
+            if(!ObjectUtils.isEmpty(landProjectName1)){
+                tenderDetailsVo.setTenderProjectCode(landProjectName1);
             }
             String announcementConnect = record.getAnnouncementConnect();
             if(!ObjectUtils.isEmpty(announcementConnect)){

+ 4 - 4
src/main/java/com/trs/ggzyexchange/schedul/ZrzyTdCedeNoticeSchedul.java

@@ -129,14 +129,14 @@ public class ZrzyTdCedeNoticeSchedul    implements Job {
             if(!ObjectUtils.isEmpty(record.getSourceDataCode())){
                 tenderDetailsVo.setDataSourceCode(record.getSourceDataCode());
             }
-            if(!ObjectUtils.isEmpty(record.getAnnouncementCode())){
-                tenderDetailsVo.setProjectCode(record.getAnnouncementCode());
+            if(!ObjectUtils.isEmpty(record.getLandProjectName())){
+                tenderDetailsVo.setProjectCode(record.getLandProjectName());
             }
             if(!ObjectUtils.isEmpty(record.getLandProjectName())){
                 tenderDetailsVo.setProjectName(record.getLandProjectName());
             }
-            if(!ObjectUtils.isEmpty(record.getAnnouncementGuid())){
-                tenderDetailsVo.setTenderProjectCode(record.getAnnouncementGuid());
+            if(!ObjectUtils.isEmpty(record.getLandProjectName())){
+                tenderDetailsVo.setTenderProjectCode(record.getLandProjectName());
             }
             if(!ObjectUtils.isEmpty(record.getAnnouncementTitle())){
                 tenderDetailsVo.setNoticeName(record.getAnnouncementTitle());

+ 5 - 5
src/main/java/com/trs/ggzyexchange/schedul/ZrzyTkqBidwinnoticeSchedul.java

@@ -121,9 +121,9 @@ public class ZrzyTkqBidwinnoticeSchedul implements Job {
         for (ZrzyTkqBidwinnotice record : records) {
             TenderDetailsVo tenderDetailsVo = new TenderDetailsVo();
 
-            String sourceDataCode = record.getSourceDataCode();
-            if(!ObjectUtils.isEmpty(sourceDataCode)){
-                tenderDetailsVo.setProjectCode(sourceDataCode);
+            String naAppCode = record.getNaAppCode();
+            if(!ObjectUtils.isEmpty(naAppCode)){
+                tenderDetailsVo.setProjectCode(naAppCode);
             }
             String noticeName = record.getNaAppName();
             if(!ObjectUtils.isEmpty(noticeName)){
@@ -134,8 +134,8 @@ public class ZrzyTkqBidwinnoticeSchedul implements Job {
                 tenderDetailsVo.setProjectName(projectName);
             }
             String traAgencyCode = record.getTraAgencyCode();
-            if(!ObjectUtils.isEmpty(traAgencyCode)){
-                tenderDetailsVo.setTenderProjectCode(traAgencyCode);
+            if(!ObjectUtils.isEmpty(naAppCode)){
+                tenderDetailsVo.setTenderProjectCode(naAppCode);
             }
             String announcementConnect = record.getAnnouncementConnect();
             if(!ObjectUtils.isEmpty(announcementConnect)){

+ 5 - 5
src/main/java/com/trs/ggzyexchange/schedul/ZrzyTkqNoticeSchedul.java

@@ -120,9 +120,9 @@ public class ZrzyTkqNoticeSchedul implements Job {
         for (ZrzyTkqNotice record : records) {
             TenderDetailsVo tenderDetailsVo = new TenderDetailsVo();
 
-            String sourceDataCode = record.getSourceDataCode();
-            if(!ObjectUtils.isEmpty(sourceDataCode)){
-                tenderDetailsVo.setProjectCode(sourceDataCode);
+            String naAppCode = record.getNaAppCode();
+            if(!ObjectUtils.isEmpty(naAppCode)){
+                tenderDetailsVo.setProjectCode(naAppCode);
             }
             String noticeName = record.getNoticeName();
             if(!ObjectUtils.isEmpty(noticeName)){
@@ -133,8 +133,8 @@ public class ZrzyTkqNoticeSchedul implements Job {
                 tenderDetailsVo.setProjectName(projectName);
             }
             String traAgencyCode = record.getTraAgencyCode();
-            if(!ObjectUtils.isEmpty(traAgencyCode)){
-                tenderDetailsVo.setTenderProjectCode(traAgencyCode);
+            if(!ObjectUtils.isEmpty(naAppCode)){
+                tenderDetailsVo.setTenderProjectCode(naAppCode);
             }
             String announcementConnect = record.getAnnouncementConnect();
             if(!ObjectUtils.isEmpty(announcementConnect)){