Skip to content

Z
zhichan
Commit aae34162 by 张庆香
Options

修改插入数据信息功能

parent fd68779d
Showing with 85 additions and 110 deletions
tx-fi-tax/app/base/controller/impl/bizchance/bizoptCtl.js
......@@ -9,9 +9,9 @@ class BizOptCtl extends CtlBase {
constructor() {
super("bizchance", CtlBase.getServiceName(BizOptCtl));
this.schemeService = system.getObject("service.bizchance.schemeSve");
this.schemeSve = system.getObject("service.bizchance.fitaxschemeSve");//财税-方案信息
this.fitaxcompanySve = system.getObject("service.bizchance.fitaxcompanySve");//财税-企业信息
this.operationrecordSve = system.getObject("service.bizchance.operationrecordSve");//财税-需求分配记录
this.schemeSve = system.getObject("service.bizchance.fitaxschemeSve"); //财税-方案信息
this.fitaxcompanySve = system.getObject("service.bizchance.fitaxcompanySve"); //财税-企业信息
this.operationrecordSve = system.getObject("service.bizchance.operationrecordSve"); //财税-需求分配记录
this.logService = system.getObject("service.bizchance.statuslogSve");
this.shisService = system.getObject("service.bizchance.salesmanhisSve");
this.receiveUrl = settings.receiveUrl();
......@@ -40,22 +40,21 @@ class BizOptCtl extends CtlBase {
let results = rs.results.rows;
results.forEach(element => {
let robj = {};
robj.id = element.id;//数据的id
robj.demand_code = element.demand_code;//商机编号
robj.v_cophone = system.decryptStr(element.v_cophone);//联系电话-shousuo
robj.business_status = element.business_status;//商机当前状态
robj.id = element.id; //数据的id
robj.demand_code = element.demand_code; //商机编号
robj.v_cophone = system.decryptStr(element.v_cophone); //联系电话-shousuo
robj.business_status = element.business_status; //商机当前状态
if (element.business_info.serviceName && element.business_info.serviceName != 'undefined') {
robj.address = element.business_info.serviceName;//服务地区
}
else {
robj.address = element.business_info.serviceName; //服务地区
} else {
robj.address = "";
}
// robj.updated_at = this.timeFormat(element.updated_at);//商机当前状态日期
robj.updated_at = element.updated_at;//商机当前状态日期
robj.business_type = element.business_type;//商机类型
robj.v_coname = element.v_coname;//联系人-shousuo
robj.source_name = element.source_name;//渠道来源--前端服务
robj.servicerName = element.facilitator_name;//服务商名称
robj.updated_at = element.updated_at; //商机当前状态日期
robj.business_type = element.business_type; //商机类型
robj.v_coname = element.v_coname; //联系人-shousuo
robj.source_name = element.source_name; //渠道来源--前端服务
robj.servicerName = element.facilitator_name; //服务商名称
// robj.facilitator_name = element.facilitator_name;//服务商名称
// robj.sourceName = element.source_name;//渠道来源
......@@ -154,10 +153,10 @@ class BizOptCtl extends CtlBase {
var pobj = mobj.d;
if (pobj.demand_code && pobj.demand_code != 'undefined') {
try {
var bizoptInfo = await this.service.findInfoByDemandCode(pobj);//需求信息
var companyInfo = await this.fitaxcompanySve.findInfo(pobj);//企业信息
var schemeInfo = await this.schemeSve.findInfo(pobj);//方案详情
var followUpinfos = await this.operationrecordSve.findAllInfo(pobj);//线索记录
var bizoptInfo = await this.service.findInfoByDemandCode(pobj); //需求信息
var companyInfo = await this.fitaxcompanySve.findInfo(pobj); //企业信息
var schemeInfo = await this.schemeSve.findInfo(pobj); //方案详情
var followUpinfos = await this.operationrecordSve.findAllInfo(pobj); //线索记录
return system.getResult({ bizoptInfo: bizoptInfo, companyInfo: companyInfo, schemeInfo: schemeInfo, followUpinfos: followUpinfos });
} catch (error) {
......@@ -178,27 +177,26 @@ class BizOptCtl extends CtlBase {
var ms = await this.schemeService.findInfoByDemandCode(pobj);
var rarr = {}
if (rs) {
var statusInfo = { "currentStatus": rs.business_status };//商机状态
var statusInfo = { "currentStatus": rs.business_status }; //商机状态
var businessInfo = {};
businessInfo.demand_code = rs.demand_code;//商机编号
businessInfo.channelSource = appconfig.pdict.source[rs.source_name];///渠道来源
businessInfo.demand_code = rs.demand_code; //商机编号
businessInfo.channelSource = appconfig.pdict.source[rs.source_name]; ///渠道来源
// businessInfo.businessType = rs.business_type;//商机类型代码
businessInfo.businessType = appconfig.pdict.businessType[rs.business_type];//商机类型名称
businessInfo.businessType = appconfig.pdict.businessType[rs.business_type]; //商机类型名称
// businessInfo.serviceArea = rs.service_address;//服务地区
if (businessInfo.businessName == "云上园区注册") {
businessInfo.serviceArea = appconfig.pdict.registeredParkDict[rs.service_address];//服务地区名称
}
else {
businessInfo.serviceArea = appconfig.pdict.registeredAreaDict[rs.service_address];//服务地区名称
businessInfo.serviceArea = appconfig.pdict.registeredParkDict[rs.service_address]; //服务地区名称
} else {
businessInfo.serviceArea = appconfig.pdict.registeredAreaDict[rs.service_address]; //服务地区名称
}
if (businessInfo.businessName == "注册地址") {
businessInfo.registeredAddress = appconfig.pdict.registeredAreaDict[rs.service_address];//注册地址名称
businessInfo.registeredAddress = appconfig.pdict.registeredAreaDict[rs.service_address]; //注册地址名称
}
businessInfo.statusReason = rs.close_reason;//商机关闭原因
businessInfo.memoInfo = rs.business_info.memoInfo;//备注信息
businessInfo.contactsName = rs.business_info.contactsName;//联系人名称
businessInfo.contactsPhone = system.decryptStr(rs.business_info.contactsPhone);//联系人联系方式
businessInfo.createdTime = this.timeFormat(rs.created_at);//商机创建时间
businessInfo.statusReason = rs.close_reason; //商机关闭原因
businessInfo.memoInfo = rs.business_info.memoInfo; //备注信息
businessInfo.contactsName = rs.business_info.contactsName; //联系人名称
businessInfo.contactsPhone = system.decryptStr(rs.business_info.contactsPhone); //联系人联系方式
businessInfo.createdTime = this.timeFormat(rs.created_at); //商机创建时间
rarr.statusInfo = statusInfo;
rarr.businessInfo = businessInfo;
}
......@@ -208,22 +206,19 @@ class BizOptCtl extends CtlBase {
planInfo.currentStatus = ms.scheme_status;
if (ms.scheme_status && ms.scheme_status == "isReject") {
planInfo.currentStatus = "已退回";
}
else {
} else {
planInfo.currentStatus = ms.scheme_status;
}
planInfo.statusReason = ms.reject_reason;
rarr.planInfo = planInfo;
}
return system.getResult(rarr);
}
catch (error) {
} catch (error) {
console.log("eeeeeeeeeeeeeeeeeeeeee");
console.log(error);
return system.getResultError(error);
}
}
else {
} else {
return system.getResultError("参数错误！");
}
}
......@@ -254,20 +249,17 @@ class BizOptCtl extends CtlBase {
"newFacilitatorName": pobj.facilitatorName
}
}
await this.shisService.insertInfo(sInfo);//之前业务员转历史
await this.service.updateSalesmanInfoByDemandCode(pobj);//更新业务员信息
await this.shisService.insertInfo(sInfo); //之前业务员转历史
await this.service.updateSalesmanInfoByDemandCode(pobj); //更新业务员信息
return system.getResult("操作成功！");
}
else {
} else {
return system.getResultError("未找到相关数据");
}
}
catch (error) {
} catch (error) {
return system.getResultError(error);
}
}
else {
} else {
return system.getResultError("参数错误!");
}
}
......@@ -277,7 +269,7 @@ class BizOptCtl extends CtlBase {
if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.currentStatus && pobj.currentStatus != 'undefined') {
try {
await this.service.updateStatusByDemandCode(pobj);
await this.schemeService.updateStatusByDemandCode(pobj);//同时更新方案的状态
await this.schemeService.updateStatusByDemandCode(pobj); //同时更新方案的状态
var res = await this.service.findInfoByDemandCode(pobj);
if (res && res != 'undefined') {
var logInfo = {
......@@ -288,7 +280,7 @@ class BizOptCtl extends CtlBase {
"clerkName": res.salesman_name,
"clerkId": res.salesman_id
}
await this.logService.insertInfo(logInfo);//插入状态日志表
await this.logService.insertInfo(logInfo); //插入状态日志表
}
if (pobj.currentStatus == "isClosed") { //关闭需求时调用
......@@ -310,20 +302,16 @@ class BizOptCtl extends CtlBase {
var j = JSON.parse(rtn.stdout);
if (j.status == 1) {
return system.getResult("操作成功！");
}
else {
} else {
return system.getResultError("更新方案状态出错！");
}
}
else {
} else {
return system.getResult("操作成功！");
}
}
catch (error) {
} catch (error) {
return system.getResultError(error);
}
}
else {
} else {
return system.getResultError("参数错误!");
}
}
......@@ -336,30 +324,31 @@ class BizOptCtl extends CtlBase {
//pobj.currentStatus = "beforeSubmission";//加上当前状态为待提交方案
// pobj.channelSource = "tencentCloud";//目前渠道只有腾讯
// pobj.sourceNumber = "1111111";
pobj.businessType = appconfig.pdict.dyDict[pobj.businessType];
// pobj.businessType = appconfig.pdict.dyDict[pobj.businessType];
var buInfo = await this.service.insertInfo(pobj);
var logInfo = {
"flowType": "BIZ",
"flowId": buInfo.id,
"statusCode": pobj.currentStatus,
"clerkName": pobj.clerkName,
"statusCode": pobj.bussinessStatus,
"clerkName": pobj.salesmanName,
"clerkId": pobj.salesmanId
}
await this.logService.insertInfo(logInfo);//插入状态日至表
await this.logService.insertInfo(logInfo); //插入状态日至表
return {
"status": 1, //1代表成功，否则失败
"message": "操作成功",
"data": "",
"requestId": ""
};
}
catch (error) {
} catch (error) {
console.log("TTTTTTTTTTTTTTTTTTTTTTT");
console.log(error);
return system.getResultError(error);
}
}
else {
} else {
return system.getResultError("参数错误!");
}
}
......
tx-fi-tax/app/base/db/impl/bizchance/bizoptDao.js
......@@ -5,7 +5,7 @@ class BizoptDao extends Dao {
super(Dao.getModelName(BizoptDao));
}
extraWhere(qobj, qw, qc) {//根据业务员id获取商机信息的组装条件
extraWhere(qobj, qw, qc) { //根据业务员id获取商机信息的组装条件
qc.raw = true;
//检查查询的用户所属公司是否是平台运营公司-1,如果是则不需要添加公司查询条件添加公司查询条件, 不添加路径条件,返回所有数据
if (qobj.company_id == 1) {
......@@ -15,7 +15,9 @@ class BizoptDao extends Dao {
qw["facilitator_id"] = Number(qobj.company_id)
// 为空说明是管理员,不需设置组织结构过滤
if (qobj.opath && qobj.opath != "") {
qw["salesman_opcode"] = { [this.db.Op.like]: `%${qobj.opath}%` }
qw["salesman_opcode"] = {
[this.db.Op.like]: `%${qobj.opath}%`
}
}
//不是来自平台前端查询
if (qobj.bizpath && qobj.bizpath.indexOf("pmx") < 0) {
......@@ -24,17 +26,17 @@ class BizoptDao extends Dao {
[this.db.Op.eq]: "bookkeeping"
}
if (qobj.bizpath && qobj.bizpath != "") {
if (qobj.bizpath.indexOf("demandAllocation") > 0) {//从需求分配列表过来的
if (qobj.bizpath.indexOf("demandAllocation") > 0) { //从需求分配列表过来的
qw["business_status"] = {
[this.db.Op.eq]: "received"
};
}
if (qobj.bizpath.indexOf("demandfollow") > 0) {//从需求跟进列表过来的
if (qobj.bizpath.indexOf("demandfollow") > 0) { //从需求跟进列表过来的
qw["business_status"] = {
[this.db.Op.in]: ["beforeFollowUp", "followingUp", "beforeSubmission"]
};
}
if (qobj.bizpath.indexOf("distributionManagement") > 0) {//从分配记录列表过来的
if (qobj.bizpath.indexOf("distributionManagement") > 0) { //从分配记录列表过来的
qw["business_status"] = {
[this.db.Op.ne]: "received"
};
......@@ -57,8 +59,7 @@ class BizoptDao extends Dao {
var setobj = { "business_status": qobj.business_status };
if (qobj.close_reason && qobj.close_reason != 'undefined') {
setobj["close_reason"] = qobj.close_reason;
}
else {
} else {
setobj["close_reason"] = "";
}
var whereobj = { "demand_code": qobj.demand_code };
......@@ -95,47 +96,31 @@ class BizoptDao extends Dao {
var obj = {
"demand_code": qobj.businessMode,
"business_type": qobj.businessType,
"business_status": qobj.currentStatus,
"business_info": {}
"business_status": qobj.bussinessStatus,
"business_info": {},
"source_number": qobj.sourceNumber,
"service_address": qobj.serviceAddress,
"facilitator_id": qobj.favilitatorID,
"facilitator_name": qobj.favilitatorName,
"source_name": qobj.sourceName,
};
if (qobj.channelSource && qobj.channelSource != 'undefined') {
obj.source_name = qobj.channelSource;
}
if (qobj.sourceNumber && qobj.sourceNumber != 'undefined') {
obj.source_number = qobj.sourceNumber;
//business_info START
if (qobj.topOrgCode && qobj.topOrgCode != 'undefined') {
obj.business_info.topOrgCode = qobj.topOrgCode
}
if (qobj.serviceCode && qobj.serviceCode != 'undefined') {
obj.service_address = qobj.serviceCode;
if (qobj.intentionBizId && qobj.intentionBizId != 'undefined') {
obj.business_info.intentionBizId = qobj.intentionBizId;
}
if (qobj.memoInfo && qobj.memoInfo != 'undefined') {
obj.business_info.memoInfo = qobj.memoInfo;
}
if (qobj.statusReason && qobj.statusReason != 'undefined') {
obj.close_reason = qobj.statusReason;
if (qobj.contactsPhone && qobj.contactsPhone != 'undefined') {
obj.business_info.contactsPhone = qobj.contactsPhone; //已经加密
}
if (qobj.contactsName && qobj.contactsName != 'undefined') {
obj.business_info.contactsName = qobj.contactsName;
}
if (qobj.contactsPhone && qobj.contactsPhone != 'undefined') {
obj.business_info.contactsPhone = qobj.contactsPhone;//已经加密
}
if (qobj.serviceName && qobj.serviceName != 'undefined') {
obj.business_info.serviceName = qobj.serviceName;
}
if (qobj.businessName && qobj.businessName != 'undefined') {
obj.business_info.businessName = qobj.businessName;
}
if (qobj.UserName && qobj.UserName != 'undefined') {
obj.business_info.userName = qobj.UserNames;
}
if (qobj.companyName && qobj.companyName != 'undefined') {
obj.business_info.companyName = qobj.companyName;
}
if (qobj.servicerCode && qobj.servicerCode != 'undefined') {
obj.facilitator_id = qobj.servicerCode;
}
if (qobj.servicerName && qobj.servicerName != 'undefined') {
obj.facilitator_name = qobj.servicerName;
//bussiness_info END
//other
if (qobj.closeReason && qobj.closeReason != 'undefined') {
obj.close_reason = qobj.closeReason;
}
if (qobj.salesmanOpcode && qobj.salesmanOpcode != 'undefined') {
obj.salesman_opcode = qobj.salesmanOpcode;
......@@ -143,12 +128,13 @@ class BizoptDao extends Dao {
if (qobj.salesmanId && qobj.salesmanId != 'undefined') {
obj.salesman_id = qobj.salesmanId;
}
if (qobj.clerkName && qobj.clerkName != 'undefined') {
obj.salesman_name = qobj.clerkName;
if (qobj.salesmanName && qobj.salesmanName != 'undefined') {
obj.salesman_name = qobj.salesmanName;
}
if (qobj.clerkPhone && qobj.clerkPhone != 'undefined') {
obj.salesman_phone = qobj.clerkPhone;
if (qobj.salesmanPhone && qobj.salesmanPhone != 'undefined') {
obj.salesman_phone = qobj.salesmanPhone;
}
return await this.create(obj, t);
}
......
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