Skip to content

Z
zhichan
Commit 71a88211 by 兰国旗
Options

优化查询沟通记录并兼容未获取到易名数据时查询自己数据

parent c7e37adb
Showing with 19 additions and 5 deletions
center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js
...@@ -1641,7 +1641,7 @@ class UtilsNeedService extends AppServiceBase { ...@@ -1641,7 +1641,7 @@ class UtilsNeedService extends AppServiceBase {
var tmpObj2 = { var tmpObj2 = {
actionBody: { actionBody: {
orderNo: channelOrderNo, orderNo: channelOrderNo,
channelNeedNo: rtn.data.channelNeedNo, channelNeedNo: rtn.data.channelNeedNo || channelOrderNo,//做云服和企服通没有渠道需求号的兼容
needsolution: rtn.data.solutionContent needsolution: rtn.data.solutionContent
}, },
appInfo: pobj.appInfo appInfo: pobj.appInfo
......
center-channel/app/base/service/impl/utilsSve/utilsNeedSve2.js
...@@ -185,7 +185,7 @@ class UtilsNeedService2 extends AppServiceBase { ...@@ -185,7 +185,7 @@ class UtilsNeedService2 extends AppServiceBase {
if (result.data.uapp_id == uappId.ename) {// yiming / ename if (result.data.uapp_id == uappId.ename) {// yiming / ename
console.log("queryExpertApplyCommunicationLogs---ename---pobj--", pobj) console.log("queryExpertApplyCommunicationLogs---ename---pobj--", pobj)
console.log('settings.enameClientUrl()+"queryExpertApplyCommunicationLogs"----',settings.enameClientUrl()+"queryExpertApplyCommunicationLogs") console.log('settings.enameClientUrl()+"queryExpertApplyCommunicationLogs"----',settings.enameClientUrl()+"queryExpertApplyCommunicationLogs")
var res = await self.execClient.execEnamePost({ var res = await this.execClient.execEnamePost({
BeginTime: pobj.actionBody.BeginTime ? pobj.actionBody.BeginTime : "", BeginTime: pobj.actionBody.BeginTime ? pobj.actionBody.BeginTime : "",
EndTime: pobj.actionBody.EndTime ? pobj.actionBody.EndTime : "", EndTime: pobj.actionBody.EndTime ? pobj.actionBody.EndTime : "",
BizId: pobj.actionBody.intentionBizId, BizId: pobj.actionBody.intentionBizId,
...@@ -196,10 +196,24 @@ class UtilsNeedService2 extends AppServiceBase { ...@@ -196,10 +196,24 @@ class UtilsNeedService2 extends AppServiceBase {
console.log('ename+++queryExpertApplyCommunicationLogs---res---', res) console.log('ename+++queryExpertApplyCommunicationLogs---res---', res)
} }
} }
console.log('ename--res--',res)
if(res && res.data && res.data.result){ //判断易名是否有写接口
res.data['Data'] = res.data.result // let enameFollowContent = [];
if(res && res.stdout && res.stdout.indexOf('<html>') > -1 && res.stdout.indexOf('</html>') > -1 && res.stdout.indexOf('nginx') > -1 ){//先判断没有写接口的情况
if(result && result.status == 0 && result.data){
if(result.data.followContent[0].indexOf('提交方案') > -1){
result.data.followContent.splice(result.data.followContent[0].indexOf('提交方案'),1);
// enameFollowContent = result.data.followContent;
}
result.data['Data'] = result.data.followContent;
}
return getResultSuccess(result);
}else{//正常易名有查询沟通记录
if(res && res.data && res.data.result){
res.data['Data'] = res.data.result
}
} }
return getResultSuccess(res); return getResultSuccess(res);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment