Skip to content

Z
zhichan
Commit 1b29ad7b by sxy
Options

fix: 资质信息交付流程联调调整

parent 6f7f9378
Showing with 165 additions and 33 deletions
icp-deliver/app/base/controller/impl/bizchance/schemeCtl.js
......@@ -23,7 +23,7 @@ class SchemeCtl extends CtlBase {
if (!pobj.bizopt_id) {
return system.getResult(null, "bizopt_id can not be empty，100290");
}
const rs = await this.service.findOne(pobj);
const rs = await this.service.findOne({ bizopt_id: pobj.bizopt_id });
return system.getResult(rs);
}
}
......
icp-deliver/app/base/controller/impl/delivery/deliverCtl.js
......@@ -14,9 +14,10 @@ class DeliverCtl extends CtlBase {
const rs = await this.service.findAndCountAll(pobj);
let result = [];
for (let val of rs.results.rows) {
val.company_name = val.delivery_info.company;
val.customer_number = val.delivery_info.phone;
val.customer_name = val.delivery_info.person;
val.company_name = val.delivery_info.companyName;
val.customer_number = val.delivery_info.contactsPhone;
val.customer_name = val.delivery_info.contactsName;
val.service_address = val.delivery_info.serviceName;
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');
if (val.delivery_status === system.ANNUALREPORT.TAKEEFFECT) {
......@@ -155,5 +156,17 @@ class DeliverCtl extends CtlBase {
return system.getResult(null, err.message)
}
}
async toCollecting(pobj) {
if (!pobj.id) {
return system.getResult(null, "deliver_id can not be empty，100290");
}
try {
let rs = await this.service.toCollecting(pobj);
return system.getResult(rs);
} catch (err) {
return system.getResult(null, err.message)
}
}
}
module.exports = DeliverCtl;
icp-deliver/app/base/controller/impl/delivery/materialCtl.js
......@@ -252,5 +252,17 @@ class MaterialCtl extends CtlBase {
});
return system.getResultSuccess();
}
// 返回 下载url
async getUrl(pobj) {
if (!pobj.deliver_id) {
return system.getResult(null, "id can not be empty，100290");
}
const rs = await this.service.findOne({ deliver_id: pobj.deliver_id }, ["downloadUrl", "ifDownload"]);
if (!rs) {
return system.getResult(null, "查不到数据");
}
return system.getResult(rs);
}
}
module.exports = MaterialCtl;
icp-deliver/app/base/db/dao.base.js
......@@ -260,9 +260,13 @@ class Dao {
}
return await this.model.findAndCountAll(tmpWhere);
}
async findOne(obj) {
async findOne(obj, attributes = []) {
if (attributes.length > 0) {
return this.model.findOne({ "where": obj, attributes, row: true });
} else {
return this.model.findOne({ "where": obj, row: true });
}
}
async findById(oid) {
return this.model.findById(oid);
}
......
icp-deliver/app/base/db/impl/bizchance/bizoptDao.js
const system = require("../../../system");
const Sequelize = require('sequelize');
const Dao = require("../../dao.base");
const url = require("url");
class BizoptDao extends Dao {
......@@ -10,18 +11,35 @@ class BizoptDao extends Dao {
}
extraWhere(qobj, qw, qc) {
qc.raw = true;
qc.where.business_type = qc.where.business_type && [system.SERVICECODE.EDI, system.SERVICECODE.ICP].includes(qc.where.business_type) ? qc.where.business_type : {
[this.db.Op.in]: [system.SERVICECODE.EDI, system.SERVICECODE.ICP]
qc.where.business_type = qc.where.business_type ? qc.where.business_type : {
$in: [system.SERVICECODE.EDI, system.SERVICECODE.ICP]
}
switch (qobj.bizpath) {
case "/businessManagement/wailt":
qc.where.business_status = qc.where.business_status || {
[this.db.Op.in]: [system.BUSSTATUS.WAITINGSCHEME, system.BUSSTATUS.WAITINGCONFIRM]
$in: [system.BUSSTATUS.WAITINGSCHEME, system.BUSSTATUS.WAITINGCONFIRM]
}
break
case "/businessManagement/all":
break
}
// ---- JSON 查询 start-----
qc.where["$and"] = []
if (qc.where.linkman) {
qc.where["$and"].push(Sequelize.where(
Sequelize.literal('business_info->"$.contactsName"'),
qc.where.linkman));
delete qc.where.linkman;
}
if (qc.where.phone_number) {
qc.where["$and"].push(Sequelize.where(
Sequelize.literal('business_info->"$.contactsPhone"'),
qc.where.phone_number));
delete qc.where.phone_number;
}
// ---- JSON 查询 end-----
qc.include = [
{
model: this.db.models.scheme,
......
icp-deliver/app/base/db/impl/common/connection.js
const Sequelize = require('sequelize');
const settings = require("../../../../config/settings")
const Op = Sequelize.Op
const fs = require("fs")
const path = require("path");
var glob = require("glob");
......@@ -9,9 +10,47 @@ class DbFactory {
this.db = new Sequelize(dbConfig.dbname,
dbConfig.user,
dbConfig.password,
dbConfig.config);
{
...dbConfig.config,
operatorsAliases: {
$eq: Op.eq,
$ne: Op.ne,
$gte: Op.gte,
$gt: Op.gt,
$lte: Op.lte,
$lt: Op.lt,
$not: Op.not,
$in: Op.in,
$notIn: Op.notIn,
$is: Op.is,
$like: Op.like,
$notLike: Op.notLike,
$iLike: Op.iLike,
$notILike: Op.notILike,
$regexp: Op.regexp,
$notRegexp: Op.notRegexp,
$iRegexp: Op.iRegexp,
$notIRegexp: Op.notIRegexp,
$between: Op.between,
$notBetween: Op.notBetween,
$overlap: Op.overlap,
$contains: Op.contains,
$contained: Op.contained,
$adjacent: Op.adjacent,
$strictLeft: Op.strictLeft,
$strictRight: Op.strictRight,
$noExtendRight: Op.noExtendRight,
$noExtendLeft: Op.noExtendLeft,
$and: Op.and,
$or: Op.or,
$any: Op.any,
$all: Op.all,
$values: Op.values,
$col: Op.col
}
});
this.db.Sequelize = Sequelize;
this.db.Op = Sequelize.Op;
this.db.Op = Op;
this.initModels();
this.initRelations();
}
......
icp-deliver/app/base/db/impl/delivery/deliverDao.js
......@@ -13,13 +13,13 @@ class DeliverDao extends Dao {
let type = qobj.bizpath.split('/')[1];
if (type === 'deliveryManagement') {
qc.where.product_code = qc.where.product_code && [system.SERVICECODE.EDI, system.SERVICECODE.ICP].includes(qc.where.product_code) ? qc.where.product_code : {
[this.db.Op.in]: [system.SERVICECODE.EDI, system.SERVICECODE.ICP]
$in: [system.SERVICECODE.EDI, system.SERVICECODE.ICP]
}
switch (qobj.bizpath) {
case "/deliveryManagement/wait":
qc.where.delivery_status = qc.where.delivery_status || {
[this.db.Op.in]: [system.SERVERSESTATUS.RECEIVED, system.SERVERSESTATUS.COLLECTING,
$in: [system.SERVERSESTATUS.RECEIVED, system.SERVERSESTATUS.COLLECTING,
system.SERVERSESTATUS.SUBMITING, system.SERVERSESTATUS.DISPOSEING, system.SERVERSESTATUS.POSTING
]
}
......@@ -29,7 +29,7 @@ class DeliverDao extends Dao {
}
} else if (type === "annualReport") {
qc.where.product_code = qc.where.product_code && [system.SERVICECODE.ICPANNUALREPORT, system.SERVICECODE.EDIANNUALREPORT].includes(qc.where.product_code) ? qc.where.product_code : {
[this.db.Op.in]: [system.SERVICECODE.EDIANNUALREPORT, system.SERVICECODE.ICPANNUALREPORT]
$in: [system.SERVICECODE.EDIANNUALREPORT, system.SERVICECODE.ICPANNUALREPORT]
}
// ---- 兼容 年报 状态 未申报、已申报 start
......@@ -45,7 +45,7 @@ class DeliverDao extends Dao {
attributes: ['status', "year"],
where: {
year: {
[this.db.Op.or]: [
$or: [
new Date().getFullYear(),
null
]
......@@ -66,12 +66,12 @@ class DeliverDao extends Dao {
switch (qobj.bizpath) {
case "/annualReport/wait":
qc.where.delivery_status = qc.where.delivery_status || {
[this.db.Op.in]: [system.ANNUALREPORT.TAKEEFFECT]
$in: [system.ANNUALREPORT.TAKEEFFECT]
}
break
case "/annualReport/all":
qc.where.delivery_status = qc.where.delivery_status || {
[this.db.Op.in]: [system.ANNUALREPORT.TAKEEFFECT, system.ANNUALREPORT.SUCCESS]
$in: [system.ANNUALREPORT.TAKEEFFECT, system.ANNUALREPORT.SUCCESS]
}
break
}
......
icp-deliver/app/base/service/impl/delivery/deliverSve.js
......@@ -52,7 +52,7 @@ class DeliverService extends ServiceBase {
}
// 推送到商城
await pushTx.submitMaterials(deliverData, pobj.cache_info)
await pushTx.submitMaterials(deliverData, JSON.parse(JSON.stringify(pobj.cache_info)))
return this.db.transaction(async (t) => {
......@@ -114,7 +114,7 @@ class DeliverService extends ServiceBase {
break
}
await pushTx.pushChangeOrder(txstatus, deliverData.source_number);
await pushTx.pushChangeOrder(txstatus, deliverData.delivery_code);
await this.dao.updateByWhere({
delivery_status: status
......@@ -131,6 +131,34 @@ class DeliverService extends ServiceBase {
return "success"
}
// 点击详情 将 订单状态 从 已接单更新为收集材料中
async toCollecting(pobj) {
const deliverData = await this.dao.findOne({
id: pobj.id
});
if (!deliverData) {
throw new Error("没有此交付单");
}
if (system.SERVERSESTATUS.RECEIVED === deliverData.delivery_status) {
await pushTx.pushChangeOrder(pushTx.TXSTATUS.COLLECTING, deliverData.delivery_code);
await this.dao.updateByWhere({
delivery_status: system.SERVERSESTATUS.COLLECTING
}, {
id: pobj.id
});
this.statuslogDao.create({
flow_type: system.FLOWCODE.DELIVERY,
flow_id: pobj.id,
status_code: system.SERVERSESTATUS.COLLECTING,
salesman_id: pobj.userid,
salesman_name: pobj.username
});
}
return "success"
}
async addQualification(pobj) {
/**
* 1. 保存资质信息
......@@ -147,11 +175,13 @@ class DeliverService extends ServiceBase {
}
let annualReportData;
let annualReportArry = [];
if (deliverData.master_source_number) {
// 年报逻辑
if (deliverData.master_source_number && deliverData.delivery_info && deliverData.delivery_info.annualReport) {
annualReportData = await this.dao.findOne({
master_source_number: deliverData.master_source_number,
id: {
[this.db.Op.ne]: deliverData.id
$ne: deliverData.id
}
});
if (annualReportData && annualReportData.delivery_status === System.ANNUALREPORT.RECEIVED) {
......@@ -206,21 +236,22 @@ class DeliverService extends ServiceBase {
throw new Error("该交付单状态下不可提交");
}
// 推送 关闭交付
await pushTx.pushChangeOrder(pushTx.TXSTATUS.CLOSED, deliverData.source_number, {
await pushTx.pushChangeOrder(pushTx.TXSTATUS.CLOSED, deliverData.delivery_code, {
close_reason: pobj.close_reason
});
// 年报逻辑
let annualReportData;
if (deliverData.master_source_number) {
if (deliverData.master_source_number && deliverData.delivery_info && deliverData.delivery_info.annualReport) {
annualReportData = await this.dao.findOne({
master_source_number: deliverData.master_source_number,
id: {
[this.db.Op.ne]: deliverData.id
$ne: deliverData.id
}
});
// 推送 关闭交付 资质
if (annualReportData) {
await pushTx.pushChangeOrder(pushTx.TXSTATUS.CLOSED, annualReportData.source_number, {
await pushTx.pushChangeOrder(pushTx.TXSTATUS.CLOSED, annualReportData.demand_code, {
close_reason: "对应的资质交付关闭了"
});
}
......@@ -280,7 +311,7 @@ class DeliverService extends ServiceBase {
proposerInfo.recipientInfo = pobj.recipientInfo;
await pushTx.pushChangeOrder(pushTx.TXSTATUS.POSTING, result.source_number, {
await pushTx.pushChangeOrder(pushTx.TXSTATUS.POSTING, result.delivery_code, {
qualification: result.qualification,
recipientInfo: pobj.recipientInfo
});
......@@ -321,7 +352,7 @@ class DeliverService extends ServiceBase {
let data = await this.dao.findOne({
master_source_number: annualReportResult.master_source_number,
id: {
[this.db.Op.ne]: annualReportResult.id
$ne: annualReportResult.id
}
});
if (!data) {
......@@ -351,6 +382,7 @@ class DeliverService extends ServiceBase {
const deliverData = await this.dao.findOne({
id: annualReportData.deliver_id
});
// 年报逻辑
let isChange = false;
if (deliverData && deliverData.delivery_status === system.ANNUALREPORT.TAKEEFFECT) {
const annualReports = await this.annualreportDao.findAll({
......@@ -367,8 +399,9 @@ class DeliverService extends ServiceBase {
// 推送年报信息
await pushTx.pushDeclareReport({ id: pobj.id, file: pobj.file }, deliverData);
//修改年报订单状态
if (isChange) {
await pushTx.pushChangeOrder(pushTx.TXSTATUS.SUCCESS, deliverData.source_number);
await pushTx.pushChangeOrder(pushTx.TXSTATUS.SUCCESS, deliverData.delivery_code);
}
return this.db.transaction(async (t) => {
......
icp-deliver/app/base/service/sve.base.js
......@@ -69,8 +69,8 @@ class ServiceBase {
async getPageList(pageIndex, pageSize, whereObj = null, orderObj = null, attributesObj = null, includeObj = null) {
return this.dao.getPageList(pageIndex, pageSize, whereObj, orderObj, attributesObj, includeObj);
}
async findOne(obj) {
return this.dao.findOne(obj);
async findOne(obj, attributes = []) {
return this.dao.findOne(obj, attributes);
}
async findById(oid) {
return this.dao.findById(oid);
......
icp-deliver/app/base/utils/totxClient.js
......@@ -8,6 +8,7 @@ const BUSINESSTYPE = {
EDI: "/qcfw/edi/"
}
const TXSTATUS = {
COLLECTING: "70",//手机材料中
SUBMITING: "80",//递交材料中
DISPOSEING: "90",//工信部处理中
POSTING: "150",//证书已邮寄
......@@ -39,7 +40,11 @@ const pushScheme = async (bizData, schemeData) => {
solutionContent: {
scheme_info: schemeData.scheme_info,
remark_info: schemeData.remark_info,
businessType: BUSINESSTYPE[bizData.business_type]
businessType: BUSINESSTYPE[bizData.business_type],
servicerName: bizData.facilitator_name,
servicerCode: bizData.facilitator_id,
clerkName: bizData.salesman_name,
clerkPhone: bizData.salesman_phone
}
}
}
......@@ -94,13 +99,21 @@ const pushChangeOrder = async (status, orderNum, data = {}) => {
*/
const submitMaterials = async (deliverData, materials) => {
let status;
if (deliverData.delivery_status === system.SERVERSESTATUS.COLLECTING) {
if (deliverData.delivery_status === system.SERVERSESTATUS.COLLECTING || deliverData.delivery_status === system.SERVERSESTATUS.SUBMITING) {
status = TXSTATUS.SUBMITING;
}
if (deliverData.delivery_status === system.SERVERSESTATUS.DISPOSEING) {
status = TXSTATUS.DISPOSEING;
}
await pushChangeOrder(status, deliverData.source_number, materials);
materials.proposerInfo.businessInformation.ifListed = materials.proposerInfo.businessInformation.ifListed === "true"
await pushChangeOrder(status, deliverData.delivery_code, {
servicerName: deliverData.facilitator_name,
servicerCode: deliverData.facilitator_id,
clerkId: deliverData.salesman_id,
clerkName: deliverData.salesman_name,
clerkPhone: deliverData.salesman_phone,
...materials
});
}
const pushDeclareReport = async (annualReport, deliverData) => {
......@@ -115,7 +128,7 @@ const pushDeclareReport = async (annualReport, deliverData) => {
item.status = item.status === system.ANNUALREPORT.WAITDECLARE ? "待申报" : "已申报"
return item
})
await pushChangeOrder(TXSTATUS.DECLARESUCCESS, deliverData.source_number, result)
await pushChangeOrder(TXSTATUS.DECLARESUCCESS, deliverData.delivery_code, result)
}
......
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