Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/service/revise_audit.js

@@ -375,7 +375,7 @@ module.exports = app => {
                 '  Left Join ' + this.ctx.service.ledgerRevise.tableName + ' As r On ra.rid = r.id' +
                 '  Left Join '+ this.ctx.service.tender.tableName +' AS t On r.tid = t.id' +
                 '  Left Join ' + this.ctx.service.projectAccount.tableName + ' As p On ra.audit_id = p.id' +
-                '  WHERE r.`valid` != 0 and t.`id` != null and ((ra.`audit_id` = ? and ra.`status` = ?) OR' +
+                '  WHERE r.`valid` != 0 and ((ra.`audit_id` = ? and ra.`status` = ?) OR' +
                 '    (r.`uid` = ? and r.`status` = ? and ra.`status` = ? and ra.`times` = (r.`times`-1)))';
             const sqlParam = [auditorId, auditConst.status.checking, auditorId, auditConst.status.checkNo, auditConst.status.checkNo];
             return await this.db.query(sql, sqlParam);

app/service/tender.js

@@ -259,22 +259,32 @@ module.exports = app => {
         async deleteTenderNoBackup(id) {
             const transaction = await this.db.beginTransaction();
             try {
-                await transaction.delete(this.tableName, {id: id});
-                await transaction.delete(this.ctx.service.tenderInfo.tableName, {tid: id});
-                await transaction.delete(this.ctx.service.ledger.tableName, {tender_id: id});
-                await transaction.delete(this.ctx.service.ledgerAudit.tableName, {tender_id: id});
-                await transaction.delete(this.ctx.service.pos.tableName, {tid: id});
-                await transaction.delete(this.ctx.service.pay.tableName, {tid: id});
-                await transaction.delete(this.ctx.service.stage.tableName, {tid: id});
-                await transaction.delete(this.ctx.service.stageAudit.tableName, {tid: id});
-                await transaction.delete(this.ctx.service.stageBills.tableName, {tid: id});
-                await transaction.delete(this.ctx.service.stagePos.tableName, {tid: id});
-                await transaction.delete(this.ctx.service.stageDetail.tableName, {tid: id});
-                await transaction.delete(this.ctx.service.stagePay.tableName, {tid: id});
-                await transaction.delete(this.ctx.service.change.tableName, {tid: id});
-                await transaction.delete(this.ctx.service.changeAudit.tableName, {tid: id});
-                await transaction.delete(this.ctx.service.changeAuditList.tableName, {tid: id});
-                await transaction.delete(this.ctx.service.changeCompany.tableName, {tid: id});
+                await transaction.delete(this.tableName, { id });
+                await transaction.delete(this.ctx.service.tenderInfo.tableName, { tid: id });
+                await transaction.delete(this.ctx.service.ledger.tableName, { tender_id: id });
+                await transaction.delete(this.ctx.service.ledgerAudit.tableName, { tender_id: id });
+                await transaction.delete(this.ctx.service.pos.tableName, { tid: id });
+                await transaction.delete(this.ctx.service.pay.tableName, { tid: id });
+
+                await transaction.delete(this.ctx.service.stage.tableName, { tid: id });
+                await transaction.delete(this.ctx.service.stageAudit.tableName, { tid: id });
+                await transaction.delete(this.ctx.service.stageBills.tableName, { tid: id });
+                await transaction.delete(this.ctx.service.stagePos.tableName, { tid: id });
+                await transaction.delete(this.ctx.service.stageDetail.tableName, { tid: id });
+                await transaction.delete(this.ctx.service.stagePay.tableName, { tid: id });
+
+                await transaction.delete(this.ctx.service.change.tableName, { tid: id });
+                await transaction.delete(this.ctx.service.changeAudit.tableName, { tid: id });
+                await transaction.delete(this.ctx.service.changeAuditList.tableName, { tid: id });
+                await transaction.delete(this.ctx.service.changeCompany.tableName, { tid: id });
+
+                await transaction.delete(this.ctx.service.ledgerRevise.tableName, { tid: id });
+                await transaction.delete(this.ctx.service.reviseAudit.tableName, { tender_id: id });
+                await transaction.delete(this.ctx.service.reviseBills.tableName, { tender_id: id });
+                await transaction.delete(this.ctx.service.revisePos.tableName, { tid: id });
+
+                await transaction.delete(this.ctx.service.signatureUsed.tableName, { tender_id: id });
+                await transaction.delete(this.ctx.service.signatureRole.tableName, { tender_id: id });
                 // 先删除附件文件
                 const attList = await this.ctx.service.changeAtt.getAllDataByCondition({ where: { tid: id } });
                 if (attList.length !== 0) {
@@ -284,7 +294,7 @@ module.exports = app => {
                         }
                     }
                 }
-                await transaction.delete(this.ctx.service.changeAtt.tableName, {tid: id});
+                await transaction.delete(this.ctx.service.changeAtt.tableName, { tid: id });
                 await transaction.commit();
                 return true;
             } catch (err) {