Skip to content

Z
zhichan
Commit 5f4ca675 by sxy
Options

fix: 调整方案商机 字段

parent 0e893f81
Showing with 100 additions and 44 deletions
icp-deliver/app/base/controller/impl/bizchance/bizoptCtl.js
......@@ -19,7 +19,7 @@ class BizOptCtl extends CtlBase {
val.customer_name = val.business_info.person;
val.updated_at = moment(val.updated_at).format('YYYY-MM-DD HH:mm:ss');
val.created_at = moment(val.created_at).format('YYYY-MM-DD HH:mm:ss');
val.schemeStatus = val["scheme.status"];
val.schemeStatus = val["scheme.scheme_status"];
result.push(val);
}
rs.results.rows = result;
......
icp-deliver/app/base/controller/impl/delivery/deliverybillCtl.js 0 → 100644
var system = require("../../../system");
const http = require("http");
const querystring = require('querystring');
var settings = require("../../../../config/settings");
const CtlBase = require("../../ctl.base");
const moment = require("moment");
class DeliverybillCtl extends CtlBase {
constructor() {
super("delivery", CtlBase.getServiceName(DeliverybillCtl));
}
async findAndCountAll(pobj, qobj, req) {
//设置查询条件
const rs = await this.service.findAndCountAll(pobj);
return system.getResult(rs);
}
}
module.exports = DeliverybillCtl;
icp-deliver/app/base/db/impl/bizchance/bizoptDao.js
......@@ -22,7 +22,7 @@ class BizoptDao extends Dao {
qc.include = [
{
model: this.db.models.scheme,
attributes: ["status"]
attributes: ["scheme_status"]
}
]
return qw;
......
icp-deliver/app/base/db/models/delivery/business_opportunity.js
......@@ -26,11 +26,11 @@ module.exports = (db, DataTypes) => {
allowNull: true,
type: DataTypes.STRING
},
source: { // 渠道来源
allowNull: false,
source_name: { //渠道来源
allowNull: true,
type: DataTypes.STRING
},
address: { // 区域地址
service_address: { // 区域地址
allowNull: false,
type: DataTypes.STRING
},
......@@ -38,12 +38,12 @@ module.exports = (db, DataTypes) => {
allowNull: true,
type: DataTypes.STRING
},
service_company_id: { // 公司id
allowNull: false,
facilitator_id: { // 服务商id
allowNull: true,
type: DataTypes.STRING
},
service_company_name: { // 公司名称
allowNull: false,
facilitator_name: { // 服务商名称
allowNull: true,
type: DataTypes.STRING
},
salesman_opcode: { // 组织架构路径
......@@ -58,7 +58,7 @@ module.exports = (db, DataTypes) => {
allowNull: true,
type: DataTypes.STRING
},
salesman_phone_number: { // 业务员联系方式
salesman_phone: { // 业务员联系方式
allowNull: true,
type: DataTypes.STRING
}
......
icp-deliver/app/base/db/models/delivery/delivery_bill.js
......@@ -5,17 +5,25 @@ const appconfig = system.getSysConfig();
* 交付单表
*/
module.exports = (db, DataTypes) => {
return db.define("delivery_bill", {
return db.define("deliverybill", {
delivery_code: { //交付单编号
allowNull: false,
allowNull: true,
type: DataTypes.STRING
},
source_number: { // 来源单号 （订单编号)
allowNull: false,
source_number: { // 来源单号
allowNull: true,
type: DataTypes.STRING
},
source: { // 渠道来源
allowNull: false,
source_name: { // 渠道名称
allowNull: true,
type: DataTypes.STRING
},
demand_code: {// 商机编号
allowNull: true,
type: DataTypes.STRING
},
scheme_number: {// 方案编号
allowNull: true,
type: DataTypes.STRING
},
product_code: { // 产品编码
......@@ -26,15 +34,15 @@ module.exports = (db, DataTypes) => {
allowNull: false,
type: DataTypes.STRING
},
address: { // 区域地址
service_address: { // 区域地址
allowNull: false,
type: DataTypes.STRING
},
service_info: { //服务概况
delivery_info: { //服务概况
allowNull: false,
type: DataTypes.JSON
},
status: {// 服务单流转状态
delivery_status: {// 服务单流转状态
allowNull: false,
type: DataTypes.STRING
},
......@@ -50,13 +58,12 @@ module.exports = (db, DataTypes) => {
allowNull: true,
type: DataTypes.STRING
},
service_company_id: { // 公司id
allowNull: false,
facilitator_id: { // 服务商id
allowNull: true,
type: DataTypes.STRING
},
service_company_name: { // 公司名称
allowNull: false,
facilitator_name: { // 服务商名称
allowNull: true,
type: DataTypes.STRING
},
salesman_opcode: { // 组织架构路径
......@@ -71,7 +78,7 @@ module.exports = (db, DataTypes) => {
allowNull: true,
type: DataTypes.STRING
},
salesman_phone_number: { // 业务员联系方式
salesman_phone: { // 业务员联系方式
allowNull: true,
type: DataTypes.STRING
}
......
icp-deliver/app/base/db/models/delivery/scheme.js
......@@ -12,14 +12,14 @@ module.exports = (db, DataTypes) => {
type: DataTypes.STRING
},
scheme_number: { //方案编号
allowNull: false,
allowNull: true,
type: DataTypes.STRING
},
scheme_info: {//方案详情
allowNull: false,
type: DataTypes.JSON
},
status: { //方案状态
scheme_status: { //方案状态
allowNull: false,
type: DataTypes.STRING
},
......@@ -27,10 +27,39 @@ module.exports = (db, DataTypes) => {
allowNull: true,
type: DataTypes.STRING
},
remark: { //备注
remark_info: { //备注
allowNull: true,
type: DataTypes.STRING
},
bizopt_id: { //商机id
allowNull: false,
type: DataTypes.STRING
},
facilitator_id: { //服务商id
allowNull: true,
type: DataTypes.STRING
},
facilitator_name: { //服务商名称
allowNull: true,
type: DataTypes.STRING
},
salesman_opcode: { //组织架构路径
allowNull: true,
type: DataTypes.STRING
},
salesman_id: { //业务员id
allowNull: true,
type: DataTypes.STRING
},
salesman_name: { //业务员名称
allowNull: true,
type: DataTypes.STRING
},
salesman_phone: { //业务员联系方式
allowNull: true,
type: DataTypes.STRING
}
}, {
paranoid: false,//假的删除
underscored: true,
......@@ -38,7 +67,7 @@ module.exports = (db, DataTypes) => {
freezeTableName: true,
//freezeTableName: true,
// define the table's name
tableName: 'scheme',
tableName: 'scheme_information',
validate: {
},
......
icp-deliver/app/base/db/models/delivery/status_log.js
......@@ -14,7 +14,11 @@ module.exports = (db, DataTypes) => {
allowNull: false,
type: DataTypes.STRING
},
status: { // 流转状态
status_date: { // 状态日期
allowNull: true,
type: DataTypes.DATE
},
status_code: { // 流转状态
allowNull: false,
type: DataTypes.STRING
}
......
icp-deliver/app/base/service/impl/bizchance/bizoptSve.js
......@@ -21,8 +21,8 @@ class BizoptService extends ServiceBase {
customer_number: data.business_info.phone,
annual_report: data.business_info.annual_report || false,
content: data.business_info.content,
address: data.address,
source: data.source,
service_address: data.service_address,
source_name: data.source_name,
business_status: data.business_status,
source_number: data.source_number,
updated_at: moment(data.updated_at).format('YYYY-MM-DD HH:mm:ss'),
......@@ -34,13 +34,12 @@ class BizoptService extends ServiceBase {
schemeData = {
id: data.scheme.id,
scheme_number: data.scheme.scheme_number,
status: data.scheme.status,
address: data.address,
reject_reason: data.scheme.reject_reason || "无",
scheme_status: data.scheme.scheme_status,
reject_reason: data.scheme.reject_reason,
company_name: data.scheme.scheme_info.company,
address: data.scheme.scheme_info.address,
annual_report: data.scheme.scheme_info.annual_report || false,
remark: data.scheme.remark || "无",
remark_info: data.scheme.remark_info,
updated_at: moment(data.scheme.updated_at).format('YYYY-MM-DD HH:mm:ss'),
created_at: moment(data.scheme.created_at).format('YYYY-MM-DD HH:mm:ss'),
}
......@@ -85,18 +84,18 @@ class BizoptService extends ServiceBase {
this.statuslogDao.create({
flow_type: system.FLOWCODE.BIZ,
flow_id: pobj.bizId,
status: system.BUSSTATUS.CLOSED
status_code: system.BUSSTATUS.CLOSED
});
if (schemeResult) {
await this.schemeDao.updateByWhere({
status: system.SCHEMESTATUS.CLOSED
scheme_status: system.SCHEMESTATUS.CLOSED
}, {
id: schemeResult.id
}, t);
this.statuslogDao.create({
flow_type: system.FLOWCODE.SCHEME,
flow_id: schemeResult.id,
status: system.SCHEMESTATUS.CLOSED
status_code: system.SCHEMESTATUS.CLOSED
});
}
return "success"
......
icp-deliver/app/base/service/impl/bizchance/schemeSve.js
......@@ -23,7 +23,7 @@ class SchemeService extends ServiceBase {
let schemeData = await this.dao.findOne({
bizopt_id: data.bizopt_id
})
if (schemeData && [system.SCHEMESTATUS.WAITINGCONFIRM, system.SCHEMESTATUS.CLOSED].includes(schemeData.status)) {
if (schemeData && [system.SCHEMESTATUS.WAITINGCONFIRM, system.SCHEMESTATUS.CLOSED].includes(schemeData.scheme_status)) {
throw new Error("此方案状态下不可操作");
}
if (!schemeData) {
......@@ -48,14 +48,14 @@ class SchemeService extends ServiceBase {
this.statuslogDao.create({
flow_type: system.FLOWCODE.BIZ,
flow_id: data.bizopt_id,
status: system.BUSSTATUS.WAITINGCONFIRM
status_code: system.BUSSTATUS.WAITINGCONFIRM
});
let scheme_id = null;
if (schemeData) {
await this.dao.updateByWhere({
...data,
demand_code: bizData.demand_code,
status: system.SCHEMESTATUS.WAITINGCONFIRM
scheme_status: system.SCHEMESTATUS.WAITINGCONFIRM
}, {
id: schemeData.id
}, t);
......@@ -64,7 +64,7 @@ class SchemeService extends ServiceBase {
let schemeResult = await this.dao.create({
...data,
demand_code: bizData.demand_code,
status: system.SCHEMESTATUS.WAITINGCONFIRM,
scheme_status: system.SCHEMESTATUS.WAITINGCONFIRM,
bizopt_id: data.bizopt_id
}, t);
scheme_id = schemeResult.id;
......@@ -72,7 +72,7 @@ class SchemeService extends ServiceBase {
this.statuslogDao.create({
flow_type: system.FLOWCODE.SCHEME,
flow_id: scheme_id,
status: system.SCHEMESTATUS.WAITINGCONFIRM
status_code: system.SCHEMESTATUS.WAITINGCONFIRM
});
return { bizId: data.bizopt_id };
} catch (err) {
......
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