icp

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

@@ -213,7 +213,7 @@ class NeedsolutionService extends ServiceBase {
     if (pageSize > 500) {
     if (pageSize > 500) {
       pageSize = 500;
       pageSize = 500;
     }
     }
-    var bizType = ab.bizType || "esp.companyreg";// esp.companyreg_cloud
+    var bizType = ab.bizType;// || "esp.companyreg";// esp.companyreg_cloud
     var pageIndex = Number(ab.pageIndex || 1);
     var pageIndex = Number(ab.pageIndex || 1);
     var from = pageIndex == 1 ? 0 : Number((pageIndex - 1) * pageSize);
     var from = pageIndex == 1 ? 0 : Number((pageIndex - 1) * pageSize);
     //select  * from log where data->'$.id' = 142;
     //select  * from log where data->'$.id' = 142;
@@ -221,8 +221,10 @@ class NeedsolutionService extends ServiceBase {
     var sqlCount = "select count(1) as dataCount from n_need_solution where 1=1 ";
     var sqlCount = "select count(1) as dataCount from n_need_solution where 1=1 ";
     sql = sql+" and createUserId="+user.id;
     sql = sql+" and createUserId="+user.id;
     sqlCount = sqlCount+" and createUserId="+user.id;
     sqlCount = sqlCount+" and createUserId="+user.id;
+    if(bizType){
       sql = sql+" and solutionContent->'$.bizType' = '"+bizType+"'";
       sql = sql+" and solutionContent->'$.bizType' = '"+bizType+"'";
       sqlCount = sqlCount+" and solutionContent->'$.bizType' = '"+bizType+"'";
       sqlCount = sqlCount+" and solutionContent->'$.bizType' = '"+bizType+"'";
+    }
     var paramWhere = {};
     var paramWhere = {};
     if (ab.solutionNo) {//方案号
     if (ab.solutionNo) {//方案号
       sql += " and solutionNo = :solutionNo";
       sql += " and solutionNo = :solutionNo";
@@ -572,7 +574,7 @@ class NeedsolutionService extends ServiceBase {
     for(var i=0;i<ns.length;i++){
     for(var i=0;i<ns.length;i++){
       var fa = ns[i];
       var fa = ns[i];
       if(fa.status!="yzf"){
       if(fa.status!="yzf"){
-        return system.getResultFail(-207,"需求方案已存在，不能重复提交");
+        // return system.getResultFail(-207,"需求方案已存在，不能重复提交");
       }
       }
     }
     }
     // ab.solutionContent.bizType=needinfo.channelTypeCode;
     // ab.solutionContent.bizType=needinfo.channelTypeCode;
@@ -584,7 +586,7 @@ class NeedsolutionService extends ServiceBase {
     if(!solution){
     if(!solution){
       return system.getResultFail(-103,"方案交付信息有误");
       return system.getResultFail(-103,"方案交付信息有误");
     }
     }
-    ab.solutionContent.solution.IcpType = needinfo.channelTypeCode;
+    ab.solutionContent.solution.IcpType = ab.solutionContent.solution.IcpType || 1;//needinfo.channelTypeCode;
     ab.solutionContent.applicationStatusList = [{
     ab.solutionContent.applicationStatusList = [{
       "OfficialFileURL":"",
       "OfficialFileURL":"",
       "ApplicationStatus":"submitIcpProgramme",
       "ApplicationStatus":"submitIcpProgramme",