icp solution

center-order/app/base/service/impl/dbneed/needsolutionSve.js

@@ -618,7 +618,12 @@ class NeedsolutionService extends ServiceBase {
     if(!solution){
       return system.getResultFail(-103,"方案交付信息有误");
     }
-    ab.solutionContent.solution.IcpType = ab.solutionContent.solution.IcpType || 1;//needinfo.channelTypeCode;
+    if(needinfo.channelTypeCode=="7"){//edi
+      ab.solutionContent.solution.IcpType=2;
+    }
+    if(needinfo.channelTypeCode=="6"){//icp
+      ab.solutionContent.solution.IcpType=1;
+    }
     ab.solutionContent.applicationStatusList = [{
       "OfficialFileURL":"",
       "ApplicationStatus":"submitIcpProgramme",
@@ -682,101 +687,7 @@ class NeedsolutionService extends ServiceBase {
   }
   //修改icp方案-- 无效
   async updateIcpProgramme(pobj){
-    var ab = pobj.actionBody;
-    var user = pobj.userInfo;
-    if(!user || !user.id){
-      return system.getResultFail(-100,"未知用户");
-    }
-    ab["createUserId"]=user.id;
-    if(!ab.needNo){
-      return system.getResultFail(-101,"渠道需求号不能为空");
-    }
-    if(!ab.solutionContent){
-      return system.getResultFail(-102,"方案信息有误");
-    }
-    //获取需求信息
-    var needinfo = await this.needinfoDao.model.findOne({
-      where:{channelNeedNo:ab.needNo},raw:true
-    });
-    if(!needinfo || !needinfo.id){
-      return system.getResultFail(-201,"未知需求信息");
-    }
-    if(needinfo.status=="ycd" || needinfo.status=="ygb"){
-      return system.getResultFail(-202,"该方案需求状态为"+needinfo.statusName+",不能创建方案");
-    }
-    var bizType = ab.solutionContent.bizType;//icp业务类型
-    if(!bizType || !needinfo.typeCode || bizType!=needinfo.typeCode){
-      return system.getResultFail(-205,"方案类型错误");
-    }
-    if(!needinfo.channelTypeCode){
-      return system.getResultFail(-206,"渠道方案类型错误");
-    }
-    ab.solutionContent.bizType=needinfo.channelTypeCode;
-    
-    bizType =needinfo.channelTypeCode;
 
-    if(!ab.solutionContent.solution){
-      return system.getResultFail(-104,"业务方案信息不能为空");
-    }
-    var solution = ab.solutionContent.solution;
-    if(!solution){
-      return system.getResultFail(-103,"方案交付信息有误");
-    }
-    ab.solutionContent.solution.IcpType = needinfo.channelTypeCode;
-    if(!solution.CompanyName){
-      return system.getResultFail(-105,"公司名不能为空");
-    }
-    if(!solution.CompanyAddress){
-      return system.getResultFail(-106,"公司地址不能为空");
-    }
-    if(!solution.Area){
-      return system.getResultFail(-107,"区域不能为空");
-    }
-    ab["channelNeedNo"] = needinfo.channelNeedNo;
-    var solutionNo = await this.getBusUid("ns");
-    ab["solutionNo"] = solutionNo;
-    ab["status"] = "dqr";
-    ab.solutionContent["notes"]="";
-    ab.solutionContent["totalSum"]="";
-    ab.solutionContent = JSON.stringify(ab.solutionContent);
-    var self = this;
-    return await this.db.transaction(async function (t) {
-      ab["needNo"] = needinfo.needNo;
-      var od = await self.dao.create(ab,t);
-      if(od && od.id){
-        var pushflag = 0;//推送标志 值为1推送小记
-        var needObj={
-          id:needinfo.id
-        };
-        if(!needinfo.followManUserId){
-          needObj={
-            id:needinfo.id,
-            followManUserId: user.id,//跟进人id
-            followManName: user.channel_username,//跟进人姓名 
-            followManMobile: user.mobile,//跟进人手机号（合伙人）
-            followManOnlyCode: user.channel_userid
-          };
-        }
-        if(!needinfo.followContent){
-          var followContent = {
-            followDate:new Date(),
-            content:"icp提交到方案"
-          };
-          followContent = JSON.stringify(followContent);
-          needObj["followContent"] = followContent;
-          pushflag = 1;
-        }
-        await self.needinfoDao.update(needObj,t);
-        needinfo = await self.needinfoDao.model.findOne({
-          where:{id:needinfo.id},raw:true
-        });
-        needinfo["pushflag"]=pushflag;
-        return system.getResultSuccess({needinfo:needinfo,needsolution:od});
-      }else{
-        return system.getResultFail(-202, "提交方案失败");
-      }
-    })
-    
   }
   //提交icp材料信息
   async submitIcpMaterial(pobj){
@@ -832,9 +743,9 @@ class NeedsolutionService extends ServiceBase {
     if(!material.PartnerDomainCertificate){
       return system.getResultFail(-106,"域名证书不能为空");
     }
-    if(!material.PartnerPreviewOtherList || material.PartnerPreviewOtherList.length<1){
-      return system.getResultFail(-107,"合作方递交其他供预览文件不能为空");
-    }
+    // if(!material.PartnerPreviewOtherList || material.PartnerPreviewOtherList.length<1){
+    //   return system.getResultFail(-107,"合作方递交其他供预览文件不能为空");
+    // }
     solutionContent.material = ab.material;
     var solutionFlowList = solutionContent.solutionFlowList || [];
     solutionFlowList.push({
@@ -1033,8 +944,8 @@ class NeedsolutionService extends ServiceBase {
     if(needinfo.status=="ycd" || needinfo.status=="ygb"){
       return system.getResultFail(-105,"该方案需求状态为"+needinfo.statusName+",不能执行此操作");
     }
-    if(ns.status!="dqr"){
-      return system.getResultFail(-103,"方案状态错误，只能废弃待确认方案");
+    if(ns.status!="dqr" && ns.status!="yzf" ){
+      return system.getResultFail(-103,"方案状态错误，不能作废已完成方案");
     }
     var solutionContent = ns.solutionContent;
     //方案流程列表