change org

rej-reex/app/base/service/impl/rejreex/tmrejaskcaseSve.js

@@ -44,8 +44,8 @@ class TmrejaskcaseService extends ServiceBase {
   }
   }
 
 
   orgdata (data) {
   orgdata (data) {
+    let res = {}
     let datat = {}
     let datat = {}
-    datat.orderNo = data.orderId
     let apply = {
     let apply = {
       askforId: data.askforId,
       askforId: data.askforId,
       tradeImg: data.tradeImg,
       tradeImg: data.tradeImg,
@@ -67,7 +67,9 @@ class TmrejaskcaseService extends ServiceBase {
     datat.supData = data.supData
     datat.supData = data.supData
     datat.recDate = data.recDate
     datat.recDate = data.recDate
     datat.askforDate = data.askforDate
     datat.askforDate = data.askforDate
-    return datat
+    res.orderNo = data.orderId
+    res.deliveryData = datat
+    return res
   }
   }
 }
 }
 module.exports = TmrejaskcaseService;
 module.exports = TmrejaskcaseService;

rej-reex/app/base/service/impl/rejreex/trademarkcaseSve.js

@@ -195,7 +195,7 @@ class TrademarkcaseService extends ServiceBase {
     datat.supData = data.supData
     datat.supData = data.supData
     datat.recDate = data.recDate
     datat.recDate = data.recDate
     datat.askforDate = data.askforDate
     datat.askforDate = data.askforDate
-    res.deliveryData = datat 
+    res.deliveryData = datat
     return res
     return res
   }
   }
 }
 }

rej-reex/app/base/service/impl/reportcb/rejcbSve.js

@@ -59,7 +59,7 @@ class RejcbService extends ServiceBase {
 
 
       let step2 = {}
       let step2 = {}
       step2.appGjdq = data[i].applicant.country ? data[i].applicant.country.trim() : ""
       step2.appGjdq = data[i].applicant.country ? data[i].applicant.country.trim() : ""
-      step2.dlsqrLx = data[i].applicant.applicantType ? data[i].applicant.applicantType.trim() : ""
+      step2.dlsqrLx = data[i].applicant.duty ? data[i].applicant.duty.trim() : ""
       step2.certCode = data[i].usccode ? data[i].usccode.trim() : ""
       step2.certCode = data[i].usccode ? data[i].usccode.trim() : ""
       switch (data[i].caseId) {
       switch (data[i].caseId) {
         case 'TESTCBSELECT01':
         case 'TESTCBSELECT01':

rej-reex/app/config/settings.js

@@ -28,7 +28,7 @@ var settings = {
   qifuurl: function () {
   qifuurl: function () {
     if (this.env == 'dev') {
     if (this.env == 'dev') {
       return 'http://gsbweb.qifu-dev.gongsibao.com/web/opaction/tmReview/springBoard'
       return 'http://gsbweb.qifu-dev.gongsibao.com/web/opaction/tmReview/springBoard'
-      // return 'http://192.168.201.235:4012/web/opaction/tmReview/springBoard'
+      // return 'http://gsbweb.qifu-dev.gongsibao.com:4012/web/opaction/tmReview/springBoard'
     } else {
     } else {
       return 'http://gsbweb.qifu.gongsibao.com/web/opaction/tmReview/springBoard'
       return 'http://gsbweb.qifu.gongsibao.com/web/opaction/tmReview/springBoard'
     }
     }
@@ -50,7 +50,8 @@ var settings = {
   },
   },
   queueUrl: function () {
   queueUrl: function () {
     if (this.env == "dev") {
     if (this.env == "dev") {
-      return "http://192.168.18.101:4018/api/queueAction/producer/springBoard";
+      // return "http://192.168.18.101:4018/api/queueAction/producer/springBoard";
+      return "http://127.0.0.1:4018/api/queueAction/producer/springBoard";
     } else {
     } else {
       return "http://sytxpublic-msgq-service/api/queueAction/producer/springBoard";
       return "http://sytxpublic-msgq-service/api/queueAction/producer/springBoard";
     }
     }