yiming

center-order/app/base/service/impl/dbneed/needinfoSve2.js

@@ -184,6 +184,7 @@ class NeedinfoService2 extends ServiceBase {
   }
   }
 
 
   async writeCommunicationLog(pobj, actionBody) {
   async writeCommunicationLog(pobj, actionBody) {
+    console.log('actionBody---writeCommunicationLog---',actionBody)
     // 查询需求沟通记录
     // 查询需求沟通记录
     // 2020 0820 lin 修改channel传过来的参数 为 note/intentionBizId
     // 2020 0820 lin 修改channel传过来的参数 为 note/intentionBizId
     actionBody.Note = ["noteTime", moment().format("YYYY-MM-DD HH:mm:ss"), "note", actionBody.note];
     actionBody.Note = ["noteTime", moment().format("YYYY-MM-DD HH:mm:ss"), "note", actionBody.note];

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

@@ -234,12 +234,28 @@ class BaseQcService {
 		if (!solution) {
 		if (!solution) {
 			return system.getResultFail(-103, "方案交付信息有误");
 			return system.getResultFail(-103, "方案交付信息有误");
 		}
 		}
-		if (needinfo.channelTypeCode == "7") {//edi
-			ab.solutionContent.solution.IcpType = 2;
-		} else if (needinfo.channelTypeCode == "5") {//icp
-			ab.solutionContent.solution.IcpType = 1;
-		} else {
-			return system.getResultFail(-208, "需求业务类型有误");
+		//判断属于百度还是易名
+		if(needinfo.uapp_id == 44){
+			if (needinfo.channelTypeCode == "7") {//edi
+				ab.solutionContent.solution.IcpType = 2;
+			} else if (needinfo.channelTypeCode == "5") {//icp
+				ab.solutionContent.solution.IcpType = 1;
+			} else {
+				return system.getResultFail(-208, "需求业务类型有误");
+			}
+		}
+		if(needinfo.uapp_id == 52){
+			if (needinfo.channelTypeCode == "7") {//edi
+				ab.solutionContent.solution.IcpType = 2;
+			} else if (needinfo.channelTypeCode == "5") {//icp
+				ab.solutionContent.solution.IcpType = 1;
+			} else if (needinfo.channelTypeCode == "icpnb") {//icpnb
+				ab.solutionContent.solution.IcpType = 4;
+			} else if (needinfo.channelTypeCode == "edinb") {//edinb
+				ab.solutionContent.solution.IcpType = 3;
+			} else {
+				return system.getResultFail(-208, "需求业务类型有误");
+			}
 		}
 		}
 		if (!solution.CompanyName) {
 		if (!solution.CompanyName) {
 			return system.getResultFail(-105, "公司名不能为空");
 			return system.getResultFail(-105, "公司名不能为空");