Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/service/report_memory.js

@@ -780,7 +780,7 @@ module.exports = app => {
             await this.ctx.service.tender.checkTender(tid);
             await this.ctx.service.stage.checkStage(sid);
 
-            const data = await this.ctx.service.stageJgcl.getStageData(this.ctx.stage.id);
+            const data = await this.ctx.service.stageJgcl.getStageData(this.ctx.stage);
             const preData = await this.ctx.service.stageJgcl.getPreStageData(this.ctx.stage.order);
             for (const d of data) {
                 const pd = this.ctx.helper._.find(preData, {uuid: d.uuid});
@@ -806,7 +806,7 @@ module.exports = app => {
             await this.ctx.service.tender.checkTender(tid);
             await this.ctx.service.stage.checkStage(sid);
 
-            const data = await this.ctx.service.stageOther.getStageData(this.ctx.stage.id);
+            const data = await this.ctx.service.stageOther.getStageData(this.ctx.stage);
             const preData = await this.ctx.service.stageOther.getPreStageData(this.ctx.stage.order);
             for (const d of data) {
                 const pd = this.ctx.helper._.find(preData, {uuid: d.uuid});

app/service/stage_jgcl.js

@@ -182,7 +182,7 @@ module.exports = app => {
         }
 
         async updateHistory(stage, transaction) {
-            const datas = await this.getStageData(stage.id);
+            const datas = await this.getStageData(stage);
             if (datas.length === 0) return;
 
             const filter = {stimes: this.ctx.stage.curTimes, sorder: this.ctx.stage.curOrder};
@@ -211,7 +211,7 @@ module.exports = app => {
             if (!stage || !preStage) {
                 throw '标段数据有误';
             }
-            const preDatas = await this.getStageData(preStage.id);
+            const preDatas = await this.getStageData(preStage);
             if (preDatas.length > 0) {
                 for (const pd of preDatas) {
                     delete pd.id;

app/service/stage_other.js

@@ -155,7 +155,7 @@ module.exports = app => {
         }
 
         async updateHistory(stage, transaction) {
-            const datas = await this.getStageData(stage.id);
+            const datas = await this.getStageData(stage);
             if (datas.length === 0) return;
 
             const filter = {stimes: this.ctx.stage.curTimes, sorder: this.ctx.stage.curOrder};
@@ -180,7 +180,7 @@ module.exports = app => {
             if (!stage || !preStage) {
                 throw '标段数据有误';
             }
-            const preDatas = await this.getStageData(preStage.id);
+            const preDatas = await this.getStageData(preStage);
             if (preDatas.length > 0) {
                 for (const pd of preDatas) {
                     delete pd.id;