Bug #2979 台账修订相关

app/controller/revise_controller.js

@@ -63,13 +63,15 @@ module.exports = app => {
                 const ledgerRevise = await ctx.service.ledgerRevise.getReviseList(ctx.tender.id);
                 if (ledgerRevise.length > 0) {
                     const revise = ledgerRevise[0];
-                    if (revise.status === audit.revise.status.checked || !revise.valid) {
-                        revise.lastest = true;
-                    } else {
-                        if (ledgerRevise.length > 1) ledgerRevise[1].lastest = true;
-                        // if (revise.status === audit.revise.status.checking) {
-                        //     revise.curAuditor = await ctx.service.reviseAudit.getCurAuditor(revise.id, revise.times);
-                        // }
+                    if (ctx.page === 1) {
+                        if (revise.status === audit.revise.status.checked || !revise.valid) {
+                            revise.lastest = true;
+                        } else {
+                            if (ledgerRevise.length > 1) ledgerRevise[1].lastest = true;
+                            // if (revise.status === audit.revise.status.checking) {
+                            //     revise.curAuditor = await ctx.service.reviseAudit.getCurAuditor(revise.id, revise.times);
+                            // }
+                        }
                     }
                 }
                 for (const lr of ledgerRevise) {
@@ -303,7 +305,7 @@ module.exports = app => {
             renderData.posSpread.readOnly = true;
             renderData.readOnly = true;
             renderData.history = true;
-            renderData.historyRevise = await ctx.service.ledgerRevise.getReviseList(ctx.tender.id);
+            renderData.historyRevise = await ctx.service.ledgerRevise.getAllReviseList(ctx.tender.id);
             await this.layout('revise/info.ejs', renderData, 'revise/info_modal.ejs');
         }
 
@@ -494,7 +496,7 @@ module.exports = app => {
                 const [ledgerSpread, posSpread] = this._getSpreadSetting(revise);
                 ledgerSpread.readOnly = true;
                 posSpread.readOnly = true;
-                const historyRevise = await ctx.service.ledgerRevise.getReviseList(ctx.tender.id);
+                const historyRevise = await ctx.service.ledgerRevise.getAllReviseList(ctx.tender.id);
                 // 获取审批流程中右边列表
                 const auditHistory = [];
                 const times = revise.status === audit.revise.status.checkNo ? revise.times - 1 : revise.times;

app/service/ledger_revise.js

@@ -42,6 +42,22 @@ module.exports = app => {
             return await this.db.query(sql, sqlParam);
         }
 
+        /**
+         * 获取全部修订
+         * @param tid
+         * @returns {Promise<*>}
+         */
+        async getAllReviseList (tid) {
+            const sql = 'SELECT lc.id, lc.tid, lc.corder, lc.in_time, lc.uid, lc.begin_time, lc.end_time, lc.times, lc.status, lc.valid,' +
+                '    pa.name As user_name, pa.role As user_role, pa.company As user_company' +
+                '  FROM ' + this.tableName + ' As lc' +
+                '  INNER JOIN ' + this.ctx.service.projectAccount.tableName + ' As pa ON lc.uid = pa.id' +
+                '  WHERE lc.tid = ?' +
+                '  ORDER BY lc.in_time DESC';
+            const sqlParam = [tid];
+            return await this.db.query(sql, sqlParam);
+        }
+
         async getLastestRevise(tid, valid = true) {
             const sql = 'SELECT lc.*,' +
                 '    pa.name As user_name, pa.role As user_role, pa.company As user_company' +