Skip to content

Z
zhichan
Commit 478eb2e7 by 高宇强
Options

gyq

parent 19645d24
Showing with 85 additions and 141 deletions
ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js
......@@ -35,10 +35,12 @@ class DeliverybillDao extends Dao {
return await this.updateByWhere(setobj,whereobj,t);
}
// /*根据交付单更新交付材料信息*/
// async UpdateInfoByDeliverCode(qobj,t){
// // var
// }
/*根据交付单更新交付材料信息*/
async UpdateInfoByDeliverCode(qobj,t){//公司注册、云上园区注册时填写交付材料
var whereobj = {"delivery_code":qobj.deliverNumber};
var setobj = {"delivery_info":qobj.deliveryInfo};
return await this.updateByWhere(setobj,whereobj,t);
}
/*插入交付单信息*/
async insertInfo(qobj,t){//到时候看交付单信息后再确定
......
ic-deliver/app/base/db/impl/bizchance/materialDao.js
......@@ -5,149 +5,63 @@ class MaterialDao extends Dao {
super(Dao.getModelName(MaterialDao));
}
/*根据交付单id获取注册材料信息详情*/
async findInfoByDeliverId(qobj){
var qcwhere = {"delivery_id":qobj.deliverId};
/*根据交付单编号获取注册材料信息详情*/
async findInfoByDeliverNumber(qobj){
var qcwhere = {"delivery_code":qobj.deliverNumber};
return await this.findOne(qcwhere);
}
/*根据交付单id更新交付单编号*/
async updateInfoByDeliverId(qobj,t){
var setobj = {"delivery_code":qobj.deliverNumber};
var whereobj = {"delivery_id":qobj.deliverId};
return await this.updateByWhere(setobj,whereobj,t);
}
/*插入注册材料信息*/
async insertInfo(qobj,t){
var obj = {
"delivery_id":qobj.deliverId
};
if (qobj.deliverNumber && qobj.deliverNumber != 'undefined'){
obj["delivery_code"] = qobj.deliverNumber;
}
if (qobj.companyName && qobj.companyName != 'undefined'){
obj.company_info.companyName = qobj.companyName;
}
if (qobj.spareName && qobj.spareName != 'undefined'){
obj.company_info.spareName = qobj.spareName;
}
if (qobj.taxpayerType && qobj.taxpayerType != 'undefined'){
obj.company_info.taxpayerType = qobj.taxpayerType;
}
if (qobj.companyProperties && qobj.companyProperties != 'undefined'){
obj.company_info.companyProperties = qobj.companyProperties;
}
if (qobj.addressType && qobj.addressType != 'undefined'){
obj.company_info.addressType = pobj.company_info.addressType;
/*根据交付单编号更新交材料详情*/
async updateInfoByDeliverNumber(qobj,t){
var whereobj = {"delivery_code":qobj.deliverNumber};
var setobj = {};
if (qobj.companyInfo && qobj.company_info != 'undefined'){
setobj.company_info = qobj.companyInfo;
}
if (qobj.fullAddress && qobj.fullAddress != 'undefined'){
obj.company_info.fullAddress = qobj.fullAddress;
if (qobj.registeredInfo && qobj.registeredInfo != 'undefined'){
setobj.registered_info = qobj.registeredInfo;
}
if (pobj.engagedIndustry && pobj.engagedIndustry != 'undefined'){
obj.company_info.engagedIndustry = qobj.engagedIndustry;
if (qobj.contributionInfo && qobj.contributionInfo != 'undefined'){
setobj.contribution_info = qobj.contributionInfo;
}
if (pobj.businessScope && pobj.businessScope != 'undefined'){
obj.company_info.businessScope = pobj.businessScope;
if (qobj.positionInfo && qobj.positionInfo != 'undefined'){
setobj.position_info = qobj.positionInfo;
}
if (pobj.operatingPeriod && pobj.operatingPeriod != 'undefined'){
obj.company_info.operatingPeriod = pobj.operatingPeriod;
if (qobj.managerInfo && qobj.managerInfo != 'undefined'){
setobj.position_info = setobj.position_info;
}
if (pobj.individualType && pobj.individualType != 'undefined'){
obj.company_info.individualType = pobj.individualType;
if (qobj.regInfo && qobj.regInfo != 'undefined'){
setobj.file_info = qobj.regInfo;
}
if (pobj.registeredCapital && pobj.registeredCapital != 'undefined'){
obj.company_info.registeredCapital = pobj.registeredCapital;
if (qobj.expressInfo && qobj.expressInfo != 'undefined'){
setobj.express_info = qobj.expressInfo;
}
if (pobj.creditCode && pobj.creditCode != 'undefined'){
obj.company_info.creditCode = pobj.creditCode;
}
if (pobj.companyType && pobj.companyType != 'undefined'){
obj.company_info.companyType = pobj.companyType;
}
if (pobj.establishedTime && pobj.establishedTime != 'undefined'){
obj.company_info.establishedTime = pobj.establishedTime;
}
if (pobj.shareholderName && pobj.shareholderName != 'undefined'){
obj.company_info.shareholderName = pobj.shareholderName;
}
if (pobj.registeredCapital && pobj.registeredCapital != 'undefined'){
obj.registered_info.registeredCapital = pobj.registeredCapital;
}
if (pobj.registeredDate && pobj.registeredDate != 'undefined'){
obj.registered_info.registeredDate = pobj.registeredDate;
return await this.updateByWhere(setobj,whereobj,t);
}
/*插入注册材料信息*/
async insertInfo(qobj,t){//公司注册，云上园区注册时的信息
var obj = {
"delivery_code":qobj.deliverNumber
};
if (qobj.deliverId && qobj.deliverId != 'undefined'){
obj["delivery_id"] = qobj.deliverId;
}
if (pobj.reserveProportion && pobj.reserveProportion != 'undefined'){
obj.registered_info.reserveProportion = pobj.reserveProportion;
if (qobj.companyInfo && qobj.companyInfo != 'undefined'){
obj.company_info = qobj.companyInfo;
}
if (pobj.contributionInfo && pobj.contributionInfo != 'undefined'){
obj.contribution_info.contributionInfo = pobj.contributionInfo;
if (pobj.registeredInfo && pobj.registeredInfo != 'undefined'){
obj.registered_info = pobj.registeredInfo;
}
if (pobj.positionInfo && pobj.positionInfo != 'undefined'){
obj.position_info.positionInfo = pobj.positionInfo;
}
if (pobj.managerName && pobj.managerName != 'undefined'){
obj.position_info.managerName = pobj.managerName;
}
if (pobj.managerName && pobj.managerName != 'undefined'){
obj.position_info.managerName = pobj.managerName;
}
if (pobj.IdentificationNumber && pobj.IdentificationNumber != 'undefined'){
obj.position_info.IdentificationNumber = pobj.IdentificationNumber;
}
if (pobj.phoneNumber && pobj.phoneNumber != 'undefined'){
obj.position_info.phoneNumber = pobj.phoneNumber;
}
if (pobj.contactAddress && pobj.contactAddress != 'undefined'){
obj.position_info.contactAddress = pobj.contactAddress;
}
if (pobj.legalpersonCertificate && pobj.legalpersonCertificate != 'undefined'){
obj.file_info.legalpersonCertificate = pobj.legalpersonCertificate;
}
if (pobj.cfoCertificate && pobj.cfoCertificate != 'undefined'){
obj.file_info.cfoCertificate = pobj.cfoCertificate;
}
if (pobj.titleCertificate && pobj.titleCertificate != 'undefined'){
obj.file_info.titleCertificate = pobj.titleCertificate;
}
if (pobj.naturalpersonCertificate && pobj.naturalpersonCertificate != 'undefined'){
obj.file_info.naturalpersonCertificate = obj.naturalpersonCertificate;
}
if (pobj.socialCertificate && pobj.socialCertificate != 'undefined'){
obj.file_info.socialCertificate = pobj.socialCertificate;
}
if (pobj.directorCertificate && pobj.directorCertificate != 'undefined'){
obj.file_info.directorCertificate = pobj.directorCertificate;
}
if (pobj.managerCertificate && pobj.managerCertificate != 'undefined'){
obj.file_info.managerCertificate = pobj.managerCertificate;
}
if (pobj.supervisorCertificate && pobj.supervisorCertificate != 'undefined'){
obj.file_info.supervisorCertificate = pobj.supervisorCertificate;
}
if (pobj.managerCertificate && pobj.managerCertificate != 'undefined'){
obj.file_info.managerCertificate = pobj.managerCertificate;
}
if (pobj.trackingNumber && pobj.trackingNumber != 'undefined'){
obj.express_info.trackingNumber = pobj.trackingNumber;
}
if (pobj.logisticsCompany && pobj.logisticsCompany != 'undefined'){
obj.express_info.logisticsCompany = pobj.logisticsCompany;
}
if (pobj.addresseeName && pobj.addresseeName != 'undefined'){
obj.express_info.addresseeName = pobj.addresseeName;
}
if (pobj.addresseePhone && pobj.addresseePhone != 'undefined'){
obj.express_info.addresseePhone = pobj.addresseePhone;
}
if (pobj.addresseeEmail && pobj.addresseeEmail != 'undefined'){
obj.express_info.addresseeEmail = pobj.addresseeEmail;
obj.position_info = pobj.positionInfo;
}
if (pobj.addresseeAddress && pobj.addresseeAddress != 'undefined'){
obj.express_info.addresseeAddress = pobj.addresseeAddress;
if (pobj.regInfo && pobj.regInfo != 'undefined'){
obj.file_info = pobj.regInfo;
}
if (pobj.expressStatus && pobj.expressStatus != 'undefined'){
obj.express_info.expressStatus = pobj.expressStatus;
if (pobj.expressInfo && pobj.expressInfo != 'undefined'){
obj.express_info = pobj.expressInfo;
}
return await this.create(obj,t);
}
......
ic-deliver/app/base/db/metadata/app/platform.js
......@@ -45,7 +45,7 @@ module.exports = {
"engraving":"刻章环节",//5个工作日内，只有选择了刻章服务时才有该状态
"posting":"证件邮寄环节",//3个工作日内，公司注册、云上园区
"paid":"已付款",//增值服务
"inservice":"服务中",//增值服务
"inservice":"已交付",//增值服务
"completed":"已完成",//税务报道、税控申请、银行开户、工商年报、工商变更、社保开户、刻章服务
"signed":"已签收",//公司注册、云上园区
"expired":"已到期",//代理记账、注册地址
......@@ -73,13 +73,18 @@ module.exports = {
"diliverSataus3":{// 税务报道、税控申请、银行开户、工商年报、工商变更、社保开户、刻章服务交付状态
"paid":"已付款",
"received":"已接单",
"inservice":"服务中",
"inservice":"已交付",
"completed":"已完成"
},
"payStatus":{//交付状态
"已交付":"已交付",
"待交付":"待交付",
"已关闭":"已关闭"
},
"diliverSataus4": {//代理记账、注册地址交付状态
"paid":"已付款",
"received":"已接单",
"inservice":"服务中",
"inservice":"已交付",
"expired":"已到期"
},
"registeredAreaDict": {//注册地区
......@@ -179,6 +184,21 @@ module.exports = {
"icCheckCase":"/ic/gsnj/",
"icChangeCase":"/ic/gschangs/",
"ssOpenCase":"/ic/sbopen/"
},
"ddyDict":{//和庄冰的交付单对应关系
"paid":1,
"received":2,
"inservice":3,
"collecting":10,
"uploading":11,
"checking":12,
"auditing":13,
"engraving":14,
"posting":15,
"signed":16,
"completed":17,
"expired":18,
"closed":19
}
}
}
......
ic-deliver/app/base/service/impl/bizchance/deliverybillSve.js
......@@ -24,9 +24,17 @@ class DeliverybillService extends ServiceBase {
return await self.dao.updateStatusByDeliverCode(qobj,t);
});
}
/*更新交付单信息 */
async UpdateInfoByDeliverCode(qobj){
var self=this;
return self.db.transaction(async function (t) {
return await self.dao.UpdateInfoByDeliverCode(qobj,t);
});
}
/*插入交付单信息*/
async insertInfo(qobj){
async insertInfo(qobj){//从队列取数据的时候用
var self=this;
return self.db.transaction(async function (t) {
return await self.dao.insertInfo(qobj,t);
......
ic-deliver/app/base/service/impl/bizchance/materialSve.js
......@@ -12,16 +12,16 @@ class MaterialService extends ServiceBase {
// return apps;
// }
/*根据交付单id获取注册材料信息详情*/
async findInfoByDeliverId(qobj){
return await this.dao.findInfoByDeliverId(qobj);
/*根据交付单编号获取注册材料信息详情*/
async findInfoByDeliverNumber(qobj){
return await this.dao.findInfoByDeliverNumber(qobj);
}
/* 根据交付单id更新交付单编号信息 */
async updateInfoByDeliverId(qobj){
/* 根据交付单编号更新交付单编号信息 */
async updateInfoByDeliverNumber(qobj){
var self=this;
return self.db.transaction(async function (t) {
return await self.dao.updateInfoByDeliverId(qobj,t);
return await self.dao.updateInfoByNumber(qobj,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