导入合同明细相关

app/service/cost_stage_detail.js

@@ -283,8 +283,9 @@ 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;
-            const validPays = await this.db.query(paySql, [beginTime, endTime]);
+                           `    WHERE cp.cid IN(${ids.map(x => { return `'${x}'`}).join(', ')}) AND cp.pay_time >= ? AND cp.pay_time <= ?` + usedFilter +
+                           '    ORDER BY c.code asc';
+            const validPays = (ids && ids.length > 0) ? await this.db.query(paySql, [beginTime, endTime]) : [];
 
             const insertDetails = [];
             for (const pay of validPays) {
@@ -311,6 +312,7 @@ module.exports = app => {
             const detailDatas = await this.getAllDataByCondition({ columns: ['id'], where: { ledger_id: ledgerId, stage_id: this.ctx.costStage.id } });
             const billsUpdate = await this._getLedgerUpdateData(insertDetails, ledgerId, []);
             billsUpdate.is_deal = 1;
+            billsUpdate.tax = 0;
             const conn = await this.db.beginTransaction();
             try {
                 await conn.delete(this.tableName, { stage_id: this.ctx.costStage.id, ledger_id: ledgerId });