|
@@ -2282,12 +2282,12 @@ module.exports = app => {
|
|
|
return change;
|
|
return change;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- async checkRevising(tenderId, cid) {
|
|
|
|
|
|
|
+ async checkRevising(tenderId, cid, order_by) {
|
|
|
let flag = false;
|
|
let flag = false;
|
|
|
// 判断修订及变更清单里是否有新增部位清单
|
|
// 判断修订及变更清单里是否有新增部位清单
|
|
|
const lastRevise = await this.ctx.service.ledgerRevise.getLastestRevise(tenderId);
|
|
const lastRevise = await this.ctx.service.ledgerRevise.getLastestRevise(tenderId);
|
|
|
if (lastRevise && lastRevise.status !== audit.revise.status.checked) {
|
|
if (lastRevise && lastRevise.status !== audit.revise.status.checked) {
|
|
|
- const changeAuditList = await this.ctx.service.changeAuditList.getList(cid);
|
|
|
|
|
|
|
+ const changeAuditList = await this.ctx.service.changeAuditList.getList(cid, order_by);
|
|
|
const changeLedgerList = await this.ctx.service.changeLedger.getAllDataByCondition({ where: { tender_id: tenderId } });
|
|
const changeLedgerList = await this.ctx.service.changeLedger.getAllDataByCondition({ where: { tender_id: tenderId } });
|
|
|
const changePosList = await this.ctx.service.changePos.getAllDataByCondition({ where: { tid: tenderId } });
|
|
const changePosList = await this.ctx.service.changePos.getAllDataByCondition({ where: { tid: tenderId } });
|
|
|
for (const cl of changeAuditList) {
|
|
for (const cl of changeAuditList) {
|