提交遗漏

app/controller/ledger_controller.js

@@ -479,7 +479,7 @@ module.exports = app => {
                 const posData = this.ctx.tender.data.measure_type === measureType.tz.value
                     ? (ctx.tender.ledgerReadOnly
                         ? await ctx.helper.loadLedgerDataFromOss(ctx.tender.his.pos_file)
-                        : await ctx.service.pos.getData(ctx.tender.id))
+                        : await ctx.service.pos.getPosData({tid: ctx.tender.id}))
                     : [];
                 const ledgerTags = await this.ctx.service.ledgerTag.getDatas(ctx.tender.id);
                 ctx.body = { err: 0, msg: '', data: { bills: ledgerData, pos: posData, tags: ledgerTags } };

app/controller/stage_controller.js

@@ -271,7 +271,7 @@ module.exports = app => {
                 preStageData;
             const posData = ctx.stage.ledgerHis
                 ? await ctx.helper.loadLedgerDataFromOss(ctx.stage.ledgerHis.pos_file)
-                : await ctx.service.pos.getData(ctx.tender.id);
+                : await ctx.service.pos.getPosDataWithAddStageOrder({ tid: ctx.tender.id });
             // 根据当前人，或指定对象查询数据
             // console.time('cur');
             if (ctx.stage.readOnly) {
@@ -1349,7 +1349,7 @@ module.exports = app => {
                         : await ctx.service.ledger.getData(ctx.tender.id);
                     result.main.pos = ctx.stage.ledgerHis
                         ? await ctx.helper.loadLedgerDataFromOss(ctx.stage.ledgerHis.pos_file)
-                        : await ctx.service.pos.getData(ctx.tender.id);
+                        : await ctx.service.pos.getPosData({ tid: ctx.tender.id });
                 }
                 for (const order of data.roles) {
                     const data = { order, bills: [], pos: [] };

app/extend/helper.js

@@ -1474,8 +1474,11 @@ module.exports = {
     },
 
     async loadLedgerDataFromOss(url) {
-        const File = await this.ctx.app.hisOss.get(ctx.app.config.hisOssPath + url);
+        console.time(url);
+        const File = await this.ctx.app.hisOss.get(this.ctx.app.config.hisOssPath + url);
         if (File.res.status !== 200) return '获取修订台账有误';
-        return JSON.parse(File.content);
+        const result = JSON.parse(File.content);
+        console.timeEnd(url);
+        return result;
     },
 };

app/service/ledger_history.js

@@ -51,7 +51,7 @@ module.exports = app => {
             await this.ctx.oss.put(billsHis, Buffer.from(JSON.stringify(bills), 'utf8'));
 
             const posHis = `${this.ctx.session.sessionProject.id}/${tender.id}/ledger/pos${timestamp}.json`;
-            const pos = await this.ctx.service.pos.getData(tender.id);
+            const pos = await this.ctx.service.pos.getPosData({ tid: tender.id });
             await this.ctx.oss.put(posHis, Buffer.from(JSON.stringify(pos), 'utf8'));
 
             const result = await this.db.insert(this.tableName, {
@@ -111,7 +111,7 @@ module.exports = app => {
             await this.ctx.oss.put(billsHis, Buffer.from(JSON.stringify(bills), 'utf8'));
 
             const posHis = `${this.ctx.session.sessionProject.id}/${change.tid}/ledger/pos${timestamp}-c.json`;
-            const pos = await this.ctx.service.pos.getData(change.tid);
+            const pos = await this.ctx.service.pos.getPosData({ tid: change.tid });
             if (newPosNodes.length > 0) pos.push(...newPosNodes);
             await this.ctx.oss.put(posHis, Buffer.from(JSON.stringify(pos), 'utf8'));