needSolution add channelDeliverId

center-order/app/base/db/models/dbneed/needsolution.js

@@ -20,6 +20,7 @@ module.exports = (db, DataTypes) => {
       }
       }
     },
     },
     statusName: DataTypes.STRING(50), //状态名称
     statusName: DataTypes.STRING(50), //状态名称
+    channelDeliverId: DataTypes.STRING(128), //服务单id
     createUserId: DataTypes.INTEGER, //创建者id
     createUserId: DataTypes.INTEGER, //创建者id
     isInvalid:DataTypes.INTEGER, //是否废弃的无效的方案
     isInvalid:DataTypes.INTEGER, //是否废弃的无效的方案
   }, {
   }, {

center-order/app/base/service/impl/qcutils/aliyunqcSve.js

@@ -999,15 +999,10 @@ class AliyunQcService {
     var material = solutionContent.customerMaterial || {};
     var material = solutionContent.customerMaterial || {};
     if (ab.extInfo) {
     if (ab.extInfo) {
       // 退回修改理由
       // 退回修改理由
-<<<<<<< HEAD
       var extInfoJson = JSON.parse(ab.extInfo);
       var extInfoJson = JSON.parse(ab.extInfo);
-      if(ab.extInfo.rejectReason) {
-        ab.rejectReason = ab.extInfo.rejectReason,
-        solutionContent.note = ab.rejectReason
-=======
-      if (ab.extInfo.rejectReason) {
-        ab.rejectReason = ab.extInfo.rejectReason
->>>>>>> 6f53c3c29ddcc51fd1cf02d87cf354bda70b546d
+      if(extInfoJson.rejectReason) {
+        ab.rejectReason = extInfoJson.rejectReason,
+        solutionContent.rejectReason = extInfoJson.rejectReason
       }
       }
       material.businessLicenseArr = ab.extInfo.businessLicenseArr;
       material.businessLicenseArr = ab.extInfo.businessLicenseArr;
       material.idCardListArr = ab.idCardListArr;
       material.idCardListArr = ab.idCardListArr;
@@ -1018,9 +1013,10 @@ class AliyunQcService {
     var updateObj = {
     var updateObj = {
       id: ns.id,
       id: ns.id,
       solutionContent: solutionContent,
       solutionContent: solutionContent,
-      channelDeliverId: ab.bizId,
-      note: ab.rejectReason
     };
     };
+    if(ab.bizId != ns.channelDeliverId) {
+      updateObj.channelDeliverId = ab.bizId
+    }
     if (ab.operationType == "ABC_CLOSE_PRODUCE") {//⽅案已关闭
     if (ab.operationType == "ABC_CLOSE_PRODUCE") {//⽅案已关闭
       updateObj["status"] = "yzf";
       updateObj["status"] = "yzf";
       updateObj["isInvalid"] = 1;
       updateObj["isInvalid"] = 1;