|
|
@@ -227,18 +227,18 @@ module.exports = app => {
|
|
|
* @param {int} hadlimit - 分页
|
|
|
* @return {object} list - 列表
|
|
|
*/
|
|
|
- async getListByStatus(tenderId, status = 0, hadlimit = 1) {
|
|
|
+ async getListByStatus(tenderId, status = 0, hadlimit = 1, sortBy = '', orderBy = '') {
|
|
|
let sql = '';
|
|
|
let sqlParam = '';
|
|
|
if (this.ctx.tender.isTourist && status === 0) {
|
|
|
- sql = 'SELECT * FROM ?? WHERE tid = ? ORDER BY in_time DESC';
|
|
|
+ sql = 'SELECT a.* FROM ?? WHERE a.tid = ?';
|
|
|
sqlParam = [this.tableName, tenderId];
|
|
|
} else {
|
|
|
switch (status) {
|
|
|
case 0: // 包含你的所有变更令
|
|
|
sql =
|
|
|
'SELECT a.* FROM ?? AS a WHERE a.tid = ? AND ' +
|
|
|
- '(a.uid = ? OR (a.status != ? AND a.cid IN (SELECT b.cid FROM ?? AS b WHERE b.uid = ? AND a.times = b.times GROUP BY b.cid)) OR a.status = ? ) ORDER BY a.in_time DESC';
|
|
|
+ '(a.uid = ? OR (a.status != ? AND a.cid IN (SELECT b.cid FROM ?? AS b WHERE b.uid = ? AND a.times = b.times GROUP BY b.cid)) OR a.status = ? )';
|
|
|
sqlParam = [
|
|
|
this.tableName,
|
|
|
tenderId,
|
|
|
@@ -250,14 +250,14 @@ module.exports = app => {
|
|
|
];
|
|
|
break;
|
|
|
case 1: // 待处理(你的)
|
|
|
- sql = 'SELECT a.* FROM ?? as a WHERE cid in(SELECT b.cid FROM ?? as b WHERE tid = ? AND uid = ? AND status = ?) ORDER BY in_time DESC';
|
|
|
+ sql = 'SELECT a.* FROM ?? as a WHERE cid in(SELECT b.cid FROM ?? as b WHERE tid = ? AND uid = ? AND status = ?)';
|
|
|
sqlParam = [this.tableName, this.ctx.service.changeAudit.tableName, tenderId, this.ctx.session.sessionUser.accountId, audit.flow.auditStatus.checking];
|
|
|
break;
|
|
|
case 5: // 待上报(所有的)PS：取未上报，退回，修订的变更令
|
|
|
sql =
|
|
|
'SELECT a.* FROM ?? AS a WHERE ' +
|
|
|
'a.cid IN (SELECT b.cid FROM ?? AS b WHERE b.uid = ? GROUP BY b.cid) AND ' +
|
|
|
- '(a.status = ? OR a.status = ? OR a.status = ?) AND a.tid = ? ORDER BY a.in_time DESC';
|
|
|
+ '(a.status = ? OR a.status = ? OR a.status = ?) AND a.tid = ?';
|
|
|
sqlParam = [
|
|
|
this.tableName,
|
|
|
this.ctx.service.changeAudit.tableName,
|
|
|
@@ -273,23 +273,33 @@ module.exports = app => {
|
|
|
sql =
|
|
|
'SELECT a.* FROM ?? AS a WHERE ' +
|
|
|
'a.cid IN (SELECT b.cid FROM ?? AS b WHERE b.uid = ? AND a.times = b.times GROUP BY b.cid) AND ' +
|
|
|
- 'a.status = ? AND a.tid = ? ORDER BY a.in_time DESC';
|
|
|
+ 'a.status = ? AND a.tid = ?';
|
|
|
sqlParam = [this.tableName, this.ctx.service.changeAudit.tableName, this.ctx.session.sessionUser.accountId, status, tenderId];
|
|
|
break;
|
|
|
case 3: // 已完成（所有的）
|
|
|
- sql = 'SELECT a.* FROM ?? AS a WHERE a.status = ? AND a.tid = ? ORDER BY a.in_time DESC';
|
|
|
+ sql = 'SELECT a.* FROM ?? AS a WHERE a.status = ? AND a.tid = ?';
|
|
|
sqlParam = [this.tableName, status, tenderId];
|
|
|
break;
|
|
|
default:
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
+ if (sortBy && orderBy) {
|
|
|
+ if (sortBy === 'code') {
|
|
|
+ sql += ' ORDER BY CHAR_LENGTH(a.code) ' + orderBy + ',convert(a.code using gbk) ' + orderBy;
|
|
|
+ } else {
|
|
|
+ sql += ' ORDER BY a.in_time ' + orderBy;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ sql += ' ORDER BY a.in_time DESC';
|
|
|
+ }
|
|
|
if (hadlimit) {
|
|
|
const limit = this.app.config.pageSize;
|
|
|
const offset = limit * (this.ctx.page - 1);
|
|
|
const limitString = offset >= 0 ? offset + ',' + limit : limit;
|
|
|
sql += ' LIMIT ' + limitString;
|
|
|
}
|
|
|
+ console.log(sql);
|
|
|
const list = await this.db.query(sql, sqlParam);
|
|
|
return list;
|
|
|
}
|
