|
|
@@ -284,7 +284,7 @@ module.exports = app => {
|
|
|
const usedFilter = !used || used === '全部' ? '' : this.db.format(` AND cp.used = ?`, [used]);
|
|
|
const paySql = `SELECT cp.*, c.c_code, c.name, c.party_b, c.tax FROM ${this.ctx.service.contractPay.tableName} cp LEFT JOIN ${this.ctx.service.contract.tableName} c ON cp.cid = c.id ` +
|
|
|
` WHERE cp.cid IN(${ids.map(x => { return `'${x}'`}).join(', ')}) AND cp.pay_time >= ? AND cp.pay_time <= ?` + usedFilter +
|
|
|
- ' ORDER BY c.code asc';
|
|
|
+ ' ORDER BY c.c_code ASC';
|
|
|
const validPays = (ids && ids.length > 0) ? await this.db.query(paySql, [beginTime, endTime]) : [];
|
|
|
|
|
|
const insertDetails = [];
|