Commit 6f53c3c2 by 兰国旗

laolan

parent 92156d47
...@@ -49,13 +49,14 @@ class AliyunQcService { ...@@ -49,13 +49,14 @@ class AliyunQcService {
}; };
//(文网文状态2020-9-26) //(文网文状态2020-9-26)
this.wangwenStatusReference = { this.wangwenStatusReference = {
601: "完成账户注册", 601: "服务商提交资料",
602: "服务商提交资料", 602: "完成账户注册",
603: "服务商完成提交资料到⼯信部", 603: "服务商完成提交资料到⼯信部",
604: "⼯商部已受理", 604: "⼯商部已受理",
605: "⼯商部不予受理", 605: "⼯商部不予受理",
606: "⼯商部通过", 606: "⼯商部通过",
607: "⼯商部未通过" 607: "⼯商部未通过",
608: "用户驳回"
}; };
//(文网文状态2020-9-26) //(文网文状态2020-9-26)
this.wangwenSolutionStatusReference = { this.wangwenSolutionStatusReference = {
...@@ -1030,7 +1031,6 @@ class AliyunQcService { ...@@ -1030,7 +1031,6 @@ class AliyunQcService {
* (文网文)2020-9-26 * (文网文)2020-9-26
*/ */
async serviceSubmitOption(pobj) { async serviceSubmitOption(pobj) {
console.log('wwwwwwwwww', pobj)
var ab = pobj.actionBody; var ab = pobj.actionBody;
var user = pobj.userInfo; var user = pobj.userInfo;
if (!user || !user.id) { if (!user || !user.id) {
...@@ -1060,12 +1060,12 @@ class AliyunQcService { ...@@ -1060,12 +1060,12 @@ class AliyunQcService {
if (!solutionContent) { if (!solutionContent) {
return system.getResultFail(-402, "方案交付信息有误"); return system.getResultFail(-402, "方案交付信息有误");
} }
if (solutionContent.applicationStatus && solutionContent.applicationStatus > ab.ApplicationStatus) { // if (solutionContent.applicationStatus && solutionContent.applicationStatus > ab.ApplicationStatus) {
return system.getResultFail(-403, "操作失败,交付流程未按顺序执行"); // return system.getResultFail(-403, "操作失败,交付流程未按顺序执行");
} // }
if (solutionContent.ApplicationStatus && solutionContent.ApplicationStatus == ab.ApplicationStatus) { // if (solutionContent.ApplicationStatus && solutionContent.ApplicationStatus == ab.ApplicationStatus) {
return system.getResultFail(-405, "操作失败,该流程状态已提交,不能重复提交"); // return system.getResultFail(-405, "操作失败,该流程状态已提交,不能重复提交");
} // }
//获取需求信息 //获取需求信息
var needinfo = await this.needinfoDao.model.findOne({ var needinfo = await this.needinfoDao.model.findOne({
where: { needNo: needsolutioninfo.needNo }, raw: true where: { needNo: needsolutioninfo.needNo }, raw: true
...@@ -1078,29 +1078,31 @@ class AliyunQcService { ...@@ -1078,29 +1078,31 @@ class AliyunQcService {
return system.getResultFail(-202, "serviceProviderSubmitMateria" + needinfo.statusName + ",不能执行此操作"); return system.getResultFail(-202, "serviceProviderSubmitMateria" + needinfo.statusName + ",不能执行此操作");
} }
var solutionFlowList = solutionContent.solutionFlowList || []; var solutionFlowList = solutionContent.solutionFlowList || [];
if (ab.ApplicationStatus == 601) {//完成账户注册
if (solutionContent.status != "USER_CONFIRM_PRODUCE") { if (ab.ApplicationStatus == 601) {//服务商提交资料
return system.getResultFail(-601, "交付流程错误,用户确认递交⽂件后才能执行此操作"); if (solutionContent.status == "USER_UPLOAD_PRODUCE" || solutionContent.status == "USER_REFUSE_PRODUCE") {
}
solutionContent.ApplicationStatus = 601; solutionContent.ApplicationStatus = 601;
solutionFlowList.push({ solutionFlowList.push({
status: "CERT_ACCOUNT_REGISTERED", statusName: this.wangwenSolutionStatusReference.CERT_ACCOUNT_REGISTERED, updated_at: new Date() status: "PARTNER_SUBMIT_MATERIAL", statusName: this.wangwenSolutionStatusReference.PARTNER_SUBMIT_MATERIAL, updated_at: new Date()
}); });
solutionContent.status = "CERT_ACCOUNT_REGISTERED"; solutionContent.status = "PARTNER_SUBMIT_MATERIAL";
solutionContent.statusName = this.wangwenSolutionStatusReference.CERT_ACCOUNT_REGISTERED; solutionContent.statusName = this.wangwenSolutionStatusReference.PARTNER_SUBMIT_MATERIAL;
}else{
return system.getResultFail(-601, "交付流程错误,请先完成账户注册");
} }
if (ab.ApplicationStatus == 602) {//服务商提交资料 }
if (solutionContent.status != "CERT_ACCOUNT_REGISTERED") { if (ab.ApplicationStatus == 602) {//完成账户注册
return system.getResultFail(-602, "交付流程错误,请先完成账户注册"); if (solutionContent.status != "USER_CONFIRM_PRODUCE") {
return system.getResultFail(-602, "交付流程错误,用户确认递交⽂件后才能执行此操作");
} }
solutionFlowList.push({ solutionFlowList.push({
status: "PARTNER_SUBMIT_MATERIAL", statusName: this.wangwenSolutionStatusReference.PARTNER_SUBMIT_MATERIAL, updated_at: new Date() status: "CERT_ACCOUNT_REGISTERED", statusName: this.wangwenSolutionStatusReference.CERT_ACCOUNT_REGISTERED, updated_at: new Date()
}); });
solutionContent.status = "PARTNER_SUBMIT_MATERIAL"; solutionContent.status = "CERT_ACCOUNT_REGISTERED";
solutionContent.statusName = this.wangwenSolutionStatusReference.PARTNER_SUBMIT_MATERIAL; solutionContent.statusName = this.wangwenSolutionStatusReference.CERT_ACCOUNT_REGISTERED;
} }
if (ab.ApplicationStatus == 603) {//服务商完成提交资料到⼯信部 if (ab.ApplicationStatus == 603) {//服务商完成提交资料到⼯信部
if (solutionContent.status != "PARTNER_SUBMIT_MATERIAL") { if (solutionContent.status != "CERT_ACCOUNT_REGISTERED") {
return system.getResultFail(-603, "交付流程错误,请先完成资料递交"); return system.getResultFail(-603, "交付流程错误,请先完成资料递交");
} }
solutionFlowList.push({ solutionFlowList.push({
...@@ -1110,7 +1112,7 @@ class AliyunQcService { ...@@ -1110,7 +1112,7 @@ class AliyunQcService {
solutionContent.statusName = this.wangwenSolutionStatusReference.CERT_MATERIAL_SUBMITTED; solutionContent.statusName = this.wangwenSolutionStatusReference.CERT_MATERIAL_SUBMITTED;
} }
if (ab.ApplicationStatus == 604) {//⼯商部已受理 if (ab.ApplicationStatus == 604) {//⼯商部已受理
if (solutionContent.status != "PARTNER_SUBMIT_MATERIAL") { if (solutionContent.status != "CERT_MATERIAL_SUBMITTED") {
return system.getResultFail(-604, "交付流程错误,请先完成资料递交"); return system.getResultFail(-604, "交付流程错误,请先完成资料递交");
} }
solutionFlowList.push({ solutionFlowList.push({
......
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