|
@@ -249,9 +249,10 @@ module.exports = app => {
|
|
|
// const ledgerData = ctx.stage.ledgerHis
|
|
|
// ? await ctx.helper.loadLedgerDataFromOss(ctx.stage.ledgerHis.bills_file)
|
|
|
// : await ctx.service.ledger.getAllDataByCondition({ where: { tender_id: ctx.tender.id } });
|
|
|
- const ledgerData = ctx.stage.ledgerHis
|
|
|
- ? await ctx.service.ledger.loadDataFromOss(ctx.tender.id, ctx.stage.ledgerHis.bills_file)
|
|
|
- : await ctx.service.ledger.getAllDataByCondition({ columns: ledgerColumn, where: { tender_id: ctx.tender.id } });
|
|
|
+ // const ledgerData = ctx.stage.ledgerHis
|
|
|
+ // ? await ctx.service.ledger.loadDataFromOss(ctx.tender.id, ctx.stage.ledgerHis.bills_file)
|
|
|
+ // : await ctx.service.ledger.getAllDataByCondition({ columns: ledgerColumn, where: { tender_id: ctx.tender.id } });
|
|
|
+ const ledgerData = await ctx.service.ledger.getAllDataByCondition({ columns: ledgerColumn, where: { tender_id: ctx.tender.id } });
|
|
|
const dgnData = await ctx.service.stageBillsDgn.getDgnData(ctx.tender.id);
|
|
|
const importData = await ctx.service.stageImportChange.getImportLid(ctx.stage.id);
|
|
|
let curStageData;
|
|
@@ -277,9 +278,10 @@ module.exports = app => {
|
|
|
}
|
|
|
async _getStagePosData(ctx, posColumn) {
|
|
|
let curStageData;
|
|
|
- const posData = ctx.stage.ledgerHis
|
|
|
- ? await ctx.service.ledger.loadDataFromOss(ctx.tender.id, ctx.stage.ledgerHis.pos_file)
|
|
|
- : await ctx.service.pos.getAllDataByCondition({ columns: posColumn, where: { tid: ctx.tender.id } });
|
|
|
+ // const posData = ctx.stage.ledgerHis
|
|
|
+ // ? await ctx.service.ledger.loadDataFromOss(ctx.tender.id, ctx.stage.ledgerHis.pos_file)
|
|
|
+ // : await ctx.service.pos.getAllDataByCondition({ columns: posColumn, where: { tid: ctx.tender.id } });
|
|
|
+ const posData = ctx.service.pos.getAllDataByCondition({ columns: posColumn, where: { tid: ctx.tender.id } });
|
|
|
// 根据当前人,或指定对象查询数据
|
|
|
if (ctx.stage.readOnly) {
|
|
|
curStageData = await ctx.service.stagePos.getAuditorStageData2(ctx.tender.id,
|