|
@@ -102,7 +102,7 @@ module.exports = app => {
|
|
switch (status) {
|
|
switch (status) {
|
|
case auditConst.status.checking:
|
|
case auditConst.status.checking:
|
|
case auditConst.status.checked:
|
|
case auditConst.status.checked:
|
|
- cur = await this.db.queryOne(`SELECT * From ${this.tableName} where tender_id = ? AND times = ? AND status = ? ORDER By times DESC, ` + '`order` DESC', [tenderId, times, status]);
|
|
|
|
|
|
+ cur = await this.db.queryOne(`SELECT * From ${this.tableName} where tender_id = ? AND times = ? AND status = ? ORDER By times DESC, ` + '`audit_order` DESC', [tenderId, times, status]);
|
|
if (!cur) return [];
|
|
if (!cur) return [];
|
|
|
|
|
|
sql = 'SELECT la.`audit_id`, pa.`name`, pa.`company`, pa.`role`, la.`times`, la.`tender_id`, la.audit_order, la.audit_type, la.audit_ledger_id ' +
|
|
sql = 'SELECT la.`audit_id`, pa.`name`, pa.`company`, pa.`role`, la.`times`, la.`tender_id`, la.audit_order, la.audit_type, la.audit_ledger_id ' +
|
|
@@ -112,7 +112,7 @@ module.exports = app => {
|
|
auditor = await this.db.query(sql, sqlParam);
|
|
auditor = await this.db.query(sql, sqlParam);
|
|
break;
|
|
break;
|
|
case auditConst.status.checkNo:
|
|
case auditConst.status.checkNo:
|
|
- cur = await this.db.queryOne(`SELECT * From ${this.tableName} where tender_id = ? AND times = ? AND status = ? ORDER By times DESC, ` + '`order` DESC', [tenderId, parseInt(times) - 1, status]);
|
|
|
|
|
|
+ cur = await this.db.queryOne(`SELECT * From ${this.tableName} where tender_id = ? AND times = ? AND status = ? ORDER By times DESC, ` + '`audit_order` DESC', [tenderId, parseInt(times) - 1, status]);
|
|
if (!cur) return [];
|
|
if (!cur) return [];
|
|
|
|
|
|
sql = 'SELECT la.`audit_id`, pa.`name`, pa.`company`, pa.`role`, la.`times`, la.`tender_id`, la.audit_order, la.audit_type, la.audit_ledger_id ' +
|
|
sql = 'SELECT la.`audit_id`, pa.`name`, pa.`company`, pa.`role`, la.`times`, la.`tender_id`, la.audit_order, la.audit_type, la.audit_ledger_id ' +
|