laolan

center-order/app/base/service/impl/qcutils/baseqcSve.js

@@ -47,28 +47,6 @@ class BaseQcService {
 			511: "⼯商部通过",
 			512: "⼯商部未通过"
 		};
-		//(文网文状态2020-9-26)
-		this.wangwenStatusReference = {
-			601: "服务商提交资料",
-			602: "完成账户注册",
-			603: "服务商完成提交资料到⼯信部",
-			604: "⼯商部已受理",
-			605: "⼯商部不予受理",
-			606: "⼯商部通过",
-			607: "⼯商部未通过",
-			608: "用户驳回"
-		};
-		//(文网文状态2020-9-26)
-		this.wangwenSolutionStatusReference = {
-			"SOLUTION_SUBMIT": "提交服务单",
-			"PARTNER_SUBMIT_MATERIAL": "服务商提交资料",
-			"CERT_ACCOUNT_REGISTERED": "完成账户注册",
-			"CERT_MATERIAL_SUBMITTED": "服务商完成提交资料到⼯信部",
-			"CERT_GXB_ACCEPT": "⼯商部已受理",
-			"CERT_GXB_SUCCESS": "⼯商部通过",
-			"CERT_GXB_FAIL": "⼯商部未通过",
-			"CERT_GXB_REFUSE": "⼯商部不予受理"
-		};
 	}
 
 	//根据需求关闭ICP方案（关闭需求后调用）
@@ -94,7 +72,7 @@ class BaseQcService {
 			//2020-12-11 laolan xiugai
 			uappId['uapp_id'] = needinfo.uapp_id;
 		}
-		if (needinfo.status == "ygb") {
+		if (needinfo.status == "ygb" || needinfo.status == "ycd") {
 			return system.getResultFail(-202, "该方案需求状态为" + needinfo.statusName + ",不能执行此操作");
 		}
 		//获取方案信息
@@ -106,8 +84,10 @@ class BaseQcService {
 			if (ns.status == "ywc") {
 				return system.getResultFail(-103, "方案状态错误，不能废弃已完成方案");
 			}
-			var flowStatus = ns.solutionContent && ns.solutionContent.status ? ns.solutionContent.status : "";
-			if (flowStatus && ["SOLUTION_SUBMIT", "USER_CONFIRM_PRODUCE","GXB_REFUSE", "CLOSE"].indexOf(flowStatus) >= 0) {
+      var flowStatus = ns.solutionContent && ns.solutionContent.status ? ns.solutionContent.status : "";
+      if (flowStatus && [
+        "SOLUTION_SUBMIT", "PAID", "USER_UPLOADED", "MATERIAL_UNCONFIRM", "USER_CONFIRMED", "GXB_REFUSE", "CLOSE"
+    ].indexOf(flowStatus) >= 0) {
 				var self = this;
 				return await this.needsolutionDao.db.transaction(async function (t) {
 					var needObj = {