Merge branch 'center-order' of gitlab.gongsibao.com:jiangyong/zhichan into center-order

center-order/app/base/api/impl/action/icpapi.js

@@ -60,6 +60,9 @@ class IcpAPI extends APIBase {
             case "getIcpProgrammeDetail"://获取方案详情（内部调用）
             case "getIcpProgrammeDetail"://获取方案详情（内部调用）
                 opResult = await this.needsolutionSve.getIcpProgrammeDetail(pobj);
                 opResult = await this.needsolutionSve.getIcpProgrammeDetail(pobj);
                 break;
                 break;
+            case "getProgrammeInfoByChannelNeedNo"://获取需求方案列表
+                opResult = await this.needsolutionSve.getProgrammeInfoByChannelNeedNo(pobj);
+                break;
             default:
             default:
                 opResult = system.getResult(null, "action_type参数错误");
                 opResult = system.getResult(null, "action_type参数错误");
                 break;
                 break;

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

@@ -10,6 +10,7 @@ class NeedinfoService extends ServiceBase {
   }
   }
   async getItemByNeedNo(pobj) {
   async getItemByNeedNo(pobj) {
     var item = await this.dao.getItemByNeedNo(pobj.actionBody.needNo);
     var item = await this.dao.getItemByNeedNo(pobj.actionBody.needNo);
+    console.log(system.getResultSuccess(item));
     if (!item) {
     if (!item) {
       return system.getResult(null, "需求数据为空，30210");
       return system.getResult(null, "需求数据为空，30210");
     }
     }
@@ -84,6 +85,10 @@ class NeedinfoService extends ServiceBase {
       channelTypeName: actionBody.channel_type_name,
       channelTypeName: actionBody.channel_type_name,
       status: "wts"
       status: "wts"
     }
     }
+    if(nobj.channelTypeCode==7||nobj.channelTypeCode==5){
+      nobj.province=nobj.city,
+      nobj.city="";
+    }
     await this.dao.create(nobj);
     await this.dao.create(nobj);
     return system.getResultSuccess();
     return system.getResultSuccess();
   }
   }
@@ -114,5 +119,5 @@ class NeedinfoService extends ServiceBase {
 }
 }
 module.exports = NeedinfoService;
 module.exports = NeedinfoService;
 
 
-// var a=new NeedinfoService();
-// a.needinfo2fq();
+var a=new NeedinfoService();
+var b=a.getItemByNeedNo({actionBody:{needNo:"N202004132334EjurnEr"}});
\ No newline at end of file