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

app/service/change.js

@@ -1060,6 +1060,13 @@ module.exports = app => {
             const result = await this.db.queryOne(sql, sqlParam);
             return result.count !== 0;
         }
+
+        async getAllCheckedChanges(tid) {
+            return await this.getAllDataByCondition({
+                where: {tid: tid, status: audit.flow.status.checked},
+                orders: [['in_time', 'desc']]
+            })
+        }
     }
     return Change;
 };

app/service/report_memory.js

@@ -654,7 +654,7 @@ module.exports = app => {
             const self = this;
             try {
                 const decimal = this.ctx.tender.info.decimal, ctx = this.ctx;
-                const change = await this.ctx.service.change.getListByStatus(tid, 3);
+                const change = await this.ctx.service.change.getAllCheckedChanges(tid);
                 for (const c of change) {
                     const types = ctx.helper._.map(c.type.split(','), function (t) {
                         return self._getChangeConstName(changeConst.type, ctx.helper._.toInteger(t));