solution

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

@@ -89,6 +89,7 @@ class NeedsolutionService extends ServiceBase {
     ab.solutionContent = JSON.stringify(ab.solutionContent);
     ab.solutionContent = JSON.stringify(ab.solutionContent);
     var self = this;
     var self = this;
     return await this.db.transaction(async function (t) {
     return await this.db.transaction(async function (t) {
+      ab["needNo"] = needinfo.needNo;
       var od = await self.dao.create(ab,t);
       var od = await self.dao.create(ab,t);
       if(od && od.id){
       if(od && od.id){
         var pushflag = 0;//推送标志 值为1推送小记
         var pushflag = 0;//推送标志 值为1推送小记
@@ -164,14 +165,14 @@ class NeedsolutionService extends ServiceBase {
     // }
     // }
     //获取需求信息
     //获取需求信息
     var needinfo = await this.needinfoDao.model.findOne({
     var needinfo = await this.needinfoDao.model.findOne({
-      where:{channelNeedNo:ab.needNo},raw:true
+      where:{needNo:ab.needNo},raw:true
     });
     });
     if(!needinfo || !needinfo.id){
     if(!needinfo || !needinfo.id){
       return system.getResultFail(-102,"未知需求信息");
       return system.getResultFail(-102,"未知需求信息");
     }
     }
     var ns = await this.dao.model.findAll({
     var ns = await this.dao.model.findAll({
       where:{needNo:needinfo.needNo,createUserId:user.id},raw:true,
       where:{needNo:needinfo.needNo,createUserId:user.id},raw:true,
-      attributes:["needNo","solutionNo","orderNo","solutionContent","status","statusName"]
+      attributes:["needNo","solutionNo","channelSolutionNo","orderNo","solutionContent","status","statusName"]
     });
     });
     return system.getResultSuccess(ns);
     return system.getResultSuccess(ns);
   }
   }
@@ -329,7 +330,11 @@ class NeedsolutionService extends ServiceBase {
       return system.getResultFail(-103,"方案状态错误，只能废弃待确认方案");
       return system.getResultFail(-103,"方案状态错误，只能废弃待确认方案");
     }
     }
     await this.dao.update({id:ns.id,status:"yzf"});//方案废弃
     await this.dao.update({id:ns.id,status:"yzf"});//方案废弃
-    return system.getResultSuccess();
+    //获取方案信息
+    ns = await this.dao.model.findOne({
+      where:{solutionNo:ab.solutionNo,createUserId:user.id},raw:true
+    });
+    return system.getResultSuccess(ns);
   }
   }
   //根据需求关闭方案（关闭需求后调用）
   //根据需求关闭方案（关闭需求后调用）
   async abolishProgrammeByNeed(pobj){
   async abolishProgrammeByNeed(pobj){