wanghongzhi před 1 rokem
rodič
revize
ace7e96a96

+ 5 - 5
easydo-chengfa/src/main/java/easydo/technology/service/KafkaClient.java

@@ -208,31 +208,31 @@ public class KafkaClient {
         purchaseInfo.setPurchaseCreateTime(purchase.getCreateTime());
         purchaseInfo.setPurchaseEndTime(purchase.getEndTime());
         if (StringUtil.isNotEmpty(purchase.getId())) {
-            purchaseInfo.setPurchaseUrl(redirectUrl + "?userId=1&type=purchase&businessId=" + purchase.getId() + "&path=" + purchasePath);
+            purchaseInfo.setPurchaseUrl(redirectUrl + "?userId=1&type=purchase&processInstanceId=" + purchase.getProcessInstanceId() + "&path=" + purchasePath);
         }
         purchaseInfo.setMatterCreateTime(matter.getCreateTime());
         purchaseInfo.setMatterEndTime(matter.getEndTime());
         purchaseInfo.setMatterNo(matter.getBusinessNo());
         if (StringUtil.isNotEmpty(matter.getId())) {
-            purchaseInfo.setMatterUrl(redirectUrl + "?userId=1&type=purchase_matter&businessId=" + purchase.getId() + "&path=" + purchasePath);
+            purchaseInfo.setMatterUrl(redirectUrl + "?userId=1&type=purchase_matter&processInstanceId=" + matter.getProcessInstanceId() + "&path=" + purchasePath);
         }
         purchaseInfo.setBidSignCreateTime(bidSign.getCreateTime());
         purchaseInfo.setBidSignEndTime(bidSign.getEndTime());
         purchaseInfo.setBidAnswerNo(bidSign.getBusinessNo());
         if (StringUtil.isNotEmpty(bidSign.getId())) {
-            purchaseInfo.setBidSignUrl(redirectUrl + "?userId=1&type=purchase_bid_sign&businessId=" + purchase.getId() + "&path=" + purchasePath);
+            purchaseInfo.setBidSignUrl(redirectUrl + "?userId=1&type=purchase_bid_sign&processInstanceId=" + bidSign.getProcessInstanceId() + "&path=" + purchasePath);
         }
         purchaseInfo.setBidAnswerCreateTime(answerSign.getCreateTime());
         purchaseInfo.setBidAnswerEndTime(answerSign.getEndTime());
         purchaseInfo.setBidAnswerNo(answerSign.getBusinessNo());
         if (StringUtil.isNotEmpty(answerSign.getId())) {
-            purchaseInfo.setBidAnswerUrl(redirectUrl + "?userId=1&type=purchase_answer_sign&businessId=" + purchase.getId() + "&path=" + purchasePath);
+            purchaseInfo.setBidAnswerUrl(redirectUrl + "?userId=1&type=purchase_answer_sign&processInstanceId=" + answerSign.getProcessInstanceId() + "&path=" + purchasePath);
         }
         purchaseInfo.setBidNoticeCreateTime(notice.getCreateTime());
         purchaseInfo.setBidNoticeEndTime(notice.getEndTime());
         purchaseInfo.setBidNoticeNo(notice.getBusinessNo());
         if (StringUtil.isNotEmpty(notice.getId())) {
-            purchaseInfo.setBidNoticeUrl(redirectUrl + "?userId=1&type=purchase_bid_notice&businessId=" + purchase.getId() + "&path=" + purchasePath);
+            purchaseInfo.setBidNoticeUrl(redirectUrl + "?userId=1&type=purchase_bid_notice&processInstanceId=" + notice.getProcessInstanceId() + "&path=" + purchasePath);
         }
         purchaseInfo.setStatus(0);
         purchaseInfo.setDataSource(4);

+ 1 - 1
easydo-chengfa/src/main/resources/config/application-prod.yml

@@ -193,7 +193,7 @@ GLD:
 
 PURCHASE:
   redirectUrl: "http://172.16.1.132:8800/#/redirect"
-  purchasePath: "process-form-infor"
+  purchasePath: "process-form-view"
   supplierPath: "supplier-evaluation-detail"
   requestUrl: "http://172.16.1.132:8810/purchase/getDetail?"
 

+ 1 - 1
easydo-chengfa/src/main/resources/config/application-test.yml

@@ -193,7 +193,7 @@ GLD:
 
 PURCHASE:
   redirectUrl: "http://172.16.1.150:8800/#/redirect"
-  purchasePath: "process-form-infor"
+  purchasePath: "process-form-view"
   supplierPath: "supplier-evaluation-detail"
   requestUrl: "http://172.16.1.150:8810/purchase/getDetail?"