Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/service/change_apply.js

@@ -442,7 +442,7 @@ module.exports = app => {
 
         async getListByArchives(tid, ids) {
             if (ids.length === 0) return [];
-            const sql = 'SELECT a.* FROM ?? as c LEFT JOIN (SELECT caid, MAX(end_time) as end_time FROM ?? WHERE ' +
+            const sql = 'SELECT c.* FROM ?? as c LEFT JOIN (SELECT caid, MAX(end_time) as end_time FROM ?? WHERE ' +
                 'tid = ? AND caid in (' + this.ctx.helper.getInArrStrSqlFilter(ids) + ') GROUP BY caid) as ca ON c.id = ca.caid WHERE' +
                 ' c.tid = ? AND c.id in (' + this.ctx.helper.getInArrStrSqlFilter(ids) + ') AND c.status = ? ORDER BY ca.end_time DESC';
             const params = [this.tableName, this.ctx.service.changeApplyAudit.tableName, tid, tid, audit.status.checked];

app/service/change_plan.js

@@ -465,7 +465,7 @@ module.exports = app => {
 
         async getListByArchives(tid, ids) {
             if (ids.length === 0) return [];
-            const sql = 'SELECT a.* FROM ?? as c LEFT JOIN (SELECT cpid, MAX(end_time) as end_time FROM ?? WHERE ' +
+            const sql = 'SELECT c.* FROM ?? as c LEFT JOIN (SELECT cpid, MAX(end_time) as end_time FROM ?? WHERE ' +
                 'tid = ? AND cpid in (' + this.ctx.helper.getInArrStrSqlFilter(ids) + ') GROUP BY cpid) as ca ON c.id = ca.cpid WHERE' +
                 ' c.tid = ? AND c.id in (' + this.ctx.helper.getInArrStrSqlFilter(ids) + ') AND c.status = ? ORDER BY ca.end_time DESC';
             const params = [this.tableName, this.ctx.service.changePlanAudit.tableName, tid, tid, audit.status.checked];

app/service/change_project.js

@@ -416,7 +416,7 @@ module.exports = app => {
 
         async getListByArchives(tid, ids) {
             if (ids.length === 0) return [];
-            const sql = 'SELECT a.* FROM ?? as c LEFT JOIN (SELECT cpid, MAX(end_time) as end_time FROM ?? WHERE ' +
+            const sql = 'SELECT c.* FROM ?? as c LEFT JOIN (SELECT cpid, MAX(end_time) as end_time FROM ?? WHERE ' +
                 'tid = ? AND cpid in (' + this.ctx.helper.getInArrStrSqlFilter(ids) + ') GROUP BY cpid) as ca ON c.id = ca.cpid WHERE' +
                 ' c.tid = ? AND c.id in (' + this.ctx.helper.getInArrStrSqlFilter(ids) + ') AND c.status = ? ORDER BY ca.end_time DESC';
             const params = [this.tableName, this.ctx.service.changeProjectAudit.tableName, tid, tid, audit.status.checked];

app/view/report/index_archive.ejs

@@ -320,9 +320,9 @@
 
             $("#optionSelectableChanges").empty();
             if (CHANGE_LIST.length > 0) {
-                for (let i = CHANGE_LIST.length; i > 0; i--) {
-                    if (parseInt(CHANGE_LIST[i - 1].status) === 3 && CHANGE_LIST[i - 1].code !== current_change_code) {
-                        const str = '<a class="dropdown-item" style="cursor:pointer" onclick="changeCurrentChange(this)" change_id = "' + CHANGE_LIST[i - 1].id + '" change_code = "' + CHANGE_LIST[i - 1].code + '">' + CHANGE_LIST[i - 1].code + '</a>';
+                for (let i = 0; i < CHANGE_LIST.length; i++) {
+                    if (parseInt(CHANGE_LIST[i].status) === 3 && CHANGE_LIST[i].code !== current_change_code) {
+                        const str = '<a class="dropdown-item" style="cursor:pointer" onclick="changeCurrentChange(this)" change_id = "' + CHANGE_LIST[i].id + '" change_code = "' + CHANGE_LIST[i].code + '">' + CHANGE_LIST[i].code + '</a>';
                         $("#optionSelectableChanges").append(str);
                     }
                 }