update 2.4

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

@@ -49,13 +49,14 @@ class AliyunQcService {
     };
     //(文网文状态2020-9-26)
     this.wangwenStatusReference = {
-      601: "完成账户注册",
-      602: "服务商提交资料",
+      601: "服务商提交资料",
+      602: "完成账户注册",
       603: "服务商完成提交资料到⼯信部",
       604: "⼯商部已受理",
       605: "⼯商部不予受理",
       606: "⼯商部通过",
-      607: "⼯商部未通过"
+      607: "⼯商部未通过",
+      608: "用户驳回"
     };
     //(文网文状态2020-9-26)
     this.wangwenSolutionStatusReference = {
@@ -998,10 +999,15 @@ class AliyunQcService {
     var material = solutionContent.customerMaterial || {};
     if (ab.extInfo) {
       // 退回修改理由
+<<<<<<< HEAD
       var extInfoJson = JSON.parse(ab.extInfo);
       if(ab.extInfo.rejectReason) {
         ab.rejectReason = ab.extInfo.rejectReason,
         solutionContent.note = ab.rejectReason
+=======
+      if (ab.extInfo.rejectReason) {
+        ab.rejectReason = ab.extInfo.rejectReason
+>>>>>>> 6f53c3c29ddcc51fd1cf02d87cf354bda70b546d
       }
       material.businessLicenseArr = ab.extInfo.businessLicenseArr;
       material.idCardListArr = ab.idCardListArr;
@@ -1010,7 +1016,7 @@ class AliyunQcService {
     solutionContent = JSON.stringify(solutionContent);
 
     var updateObj = {
-      id: ns.id, 
+      id: ns.id,
       solutionContent: solutionContent,
       channelDeliverId: ab.bizId,
       note: ab.rejectReason
@@ -1033,7 +1039,6 @@ class AliyunQcService {
   * (文网文)2020-9-26
   */
   async serviceSubmitOption(pobj) {
-    console.log('wwwwwwwwww', pobj)
     var ab = pobj.actionBody;
     var user = pobj.userInfo;
     if (!user || !user.id) {
@@ -1063,12 +1068,12 @@ class AliyunQcService {
     if (!solutionContent) {
       return system.getResultFail(-402, "方案交付信息有误");
     }
-    if (solutionContent.applicationStatus && solutionContent.applicationStatus > ab.ApplicationStatus) {
-      return system.getResultFail(-403, "操作失败，交付流程未按顺序执行");
-    }
-    if (solutionContent.ApplicationStatus && solutionContent.ApplicationStatus == ab.ApplicationStatus) {
-      return system.getResultFail(-405, "操作失败，该流程状态已提交，不能重复提交");
-    }
+    // if (solutionContent.applicationStatus && solutionContent.applicationStatus > ab.ApplicationStatus) {
+    //   return system.getResultFail(-403, "操作失败，交付流程未按顺序执行");
+    // }
+    // if (solutionContent.ApplicationStatus && solutionContent.ApplicationStatus == ab.ApplicationStatus) {
+    //   return system.getResultFail(-405, "操作失败，该流程状态已提交，不能重复提交");
+    // }
     //获取需求信息
     var needinfo = await this.needinfoDao.model.findOne({
       where: { needNo: needsolutioninfo.needNo }, raw: true
@@ -1081,29 +1086,31 @@ class AliyunQcService {
       return system.getResultFail(-202, "serviceProviderSubmitMateria" + needinfo.statusName + ",不能执行此操作");
     }
     var solutionFlowList = solutionContent.solutionFlowList || [];
-    if (ab.ApplicationStatus == 601) {//完成账户注册
+    
+    if (ab.ApplicationStatus == 601) {//服务商提交资料
+      if (solutionContent.status == "USER_UPLOAD_PRODUCE" || solutionContent.status == "USER_REFUSE_PRODUCE") {
+        solutionContent.ApplicationStatus = 601;
+      solutionFlowList.push({
+        status: "PARTNER_SUBMIT_MATERIAL", statusName: this.wangwenSolutionStatusReference.PARTNER_SUBMIT_MATERIAL, updated_at: new Date()
+      });
+      solutionContent.status = "PARTNER_SUBMIT_MATERIAL";
+      solutionContent.statusName = this.wangwenSolutionStatusReference.PARTNER_SUBMIT_MATERIAL;
+      }else{
+        return system.getResultFail(-601, "交付流程错误，请先完成账户注册");
+      }
+    }
+    if (ab.ApplicationStatus == 602) {//完成账户注册
       if (solutionContent.status != "USER_CONFIRM_PRODUCE") {
-        return system.getResultFail(-601, "交付流程错误，用户确认递交⽂件后才能执行此操作");
+        return system.getResultFail(-602, "交付流程错误，用户确认递交⽂件后才能执行此操作");
       }
-      solutionContent.ApplicationStatus = 601;
       solutionFlowList.push({
         status: "CERT_ACCOUNT_REGISTERED", statusName: this.wangwenSolutionStatusReference.CERT_ACCOUNT_REGISTERED, updated_at: new Date()
       });
       solutionContent.status = "CERT_ACCOUNT_REGISTERED";
       solutionContent.statusName = this.wangwenSolutionStatusReference.CERT_ACCOUNT_REGISTERED;
     }
-    if (ab.ApplicationStatus == 602) {//服务商提交资料
-      if (solutionContent.status != "CERT_ACCOUNT_REGISTERED") {
-        return system.getResultFail(-602, "交付流程错误，请先完成账户注册");
-      }
-      solutionFlowList.push({
-        status: "PARTNER_SUBMIT_MATERIAL", statusName: this.wangwenSolutionStatusReference.PARTNER_SUBMIT_MATERIAL, updated_at: new Date()
-      });
-      solutionContent.status = "PARTNER_SUBMIT_MATERIAL";
-      solutionContent.statusName = this.wangwenSolutionStatusReference.PARTNER_SUBMIT_MATERIAL;
-    }
     if (ab.ApplicationStatus == 603) {//服务商完成提交资料到⼯信部
-      if (solutionContent.status != "PARTNER_SUBMIT_MATERIAL") {
+      if (solutionContent.status != "CERT_ACCOUNT_REGISTERED") {
         return system.getResultFail(-603, "交付流程错误，请先完成资料递交");
       }
       solutionFlowList.push({
@@ -1113,7 +1120,7 @@ class AliyunQcService {
       solutionContent.statusName = this.wangwenSolutionStatusReference.CERT_MATERIAL_SUBMITTED;
     }
     if (ab.ApplicationStatus == 604) {//⼯商部已受理
-      if (solutionContent.status != "PARTNER_SUBMIT_MATERIAL") {
+      if (solutionContent.status != "CERT_MATERIAL_SUBMITTED") {
         return system.getResultFail(-604, "交付流程错误，请先完成资料递交");
       }
       solutionFlowList.push({
@@ -1309,7 +1316,7 @@ class AliyunQcService {
   }
 
   //关闭需求(文网文) 2020-9-28
-  async closeNeed() {
+  async closeNeed(pobj) {
     var ab = pobj.actionBody;
     var app = pobj.appInfo;
     if (!app || !app.uapp_id) {
@@ -1345,7 +1352,7 @@ class AliyunQcService {
     // 查询需求沟通记录
     // 2020 0820 lin 修改channel传过来的参数 为 note/needNo 
     pobj.actionBody.Note = ["noteTime", moment().format("YYYY-MM-DD HH:mm:ss"), "note", pobj.actionBody.note];
-    let needRes = await this.findOne({ channelNeedNo: pobj.actionBody.needNo});
+    let needRes = await this.findOne({ channelNeedNo: pobj.actionBody.needNo });
     // 没有需求单直接返回
     if (!needRes) {
       return system.getResult("没有这个需求单");