报表数据预设调整

app/public/report/js/rpt_change_rela.js

@@ -9,7 +9,7 @@ const rptChangeRela = (function (){
     let curType = '';
     const initList = function () {
         const header = info[curType].colHeader;
-        $('#scr-header').html(`<tr class="text-center"><th>${header[0]}</th><th>${header[1]}</th><th>${header[2]}</th></tr>`);
+        $('#scr-header').html(`<tr class="text-center"><th>${header[0]}</th><th style="vertical-align: middle">${header[1]}</th><th style="vertical-align: middle">${header[2]}</th></tr>`);
         const html = [], arr = data[curType];
         for (const a of arr) {
             const checked = a.selected ? 'checked' : '';

app/service/tender_cache.js

@@ -189,12 +189,15 @@ module.exports = app => {
             const tp = JSON.parse(orgCache.stage_flow_cur_tp);
             if (stageTp) this._.assign(tp, stageTp);
             data.stage_flow_pre_uid = orgCache.stage_flow_cur_uid;
-            data.stage_flow_pre_info = orgCache.stage_flow_cur_info;
+            const info = JSON.parse(orgCache.stage_flow_cur_info);
+            info.time = new Date();
+            data.stage_flow_pre_info = JSON.stringify(info);
             data.stage_flow_pre_tp = JSON.stringify(tp);
-            data.stage_flow_cur_uid = auditor.id;
-            const cur_flow_info = await this.ctx.service.projectAccount.getAccountCacheData(auditor.id);
-            cur_flow_info.stage_order = stage.order;
-            cur_flow_info.stage_status = stage.status;
+
+            data.stage_flow_cur_uid = auditor.aid;
+            const cur_flow_info = await this.ctx.service.projectAccount.getAccountCacheData(auditor.aid);
+            cur_flow_info.order = stage.order;
+            cur_flow_info.status = auditConst.stage.status.checking;
             data.stage_flow_cur_info = JSON.stringify(cur_flow_info);
             data.stage_flow_cur_tp = JSON.stringify(tp);
             await transaction.update(this.tableName, data);

db_script/tender_cache.js

@@ -56,92 +56,92 @@ const tenderRange = [
 describe('refreshTenderCache.js', () => {
     it('refreshTenderCache', function* () {
         const ctx = app.mockContext();
-        const tenders = yield ctx.app.mysql.query('SELECT * FROM zh_tender WHERE id > ? and id <= ?', tenderRange[0]);
-        console.log(tenderRange[0], tenders.length);
-        for (const t of tenders) {
-            yield ctx.service.tenderCache.refreshTenderCache(t);
-            console.log(`complete ${t.name}(${t.id})`);
-        }
-    });
-    it('refreshTenderCache', function* () {
-        const ctx = app.mockContext();
-        const tenders = yield ctx.app.mysql.query('SELECT * FROM zh_tender WHERE id > ? and id <= ?', tenderRange[1]);
-        console.log(tenderRange[1], tenders.length);
-        for (const t of tenders) {
-            yield ctx.service.tenderCache.refreshTenderCache(t);
-            console.log(`complete ${t.name}(${t.id})`);
-        }
-    });
-    it('refreshTenderCache', function* () {
-        const ctx = app.mockContext();
-        const tenders = yield ctx.app.mysql.query('SELECT * FROM zh_tender WHERE id > ? and id <= ?', tenderRange[2]);
-        console.log(tenderRange[2], tenders.length);
-        for (const t of tenders) {
-            yield ctx.service.tenderCache.refreshTenderCache(t);
-            console.log(`complete ${t.name}(${t.id})`);
-        }
-    });
-    it('refreshTenderCache', function* () {
-        const ctx = app.mockContext();
-        const tenders = yield ctx.app.mysql.query('SELECT * FROM zh_tender WHERE id > ? and id <= ?', tenderRange[3]);
-        console.log(tenderRange[3], tenders.length);
-        for (const t of tenders) {
-            yield ctx.service.tenderCache.refreshTenderCache(t);
-            console.log(`complete ${t.name}(${t.id})`);
-        }
-    });
-    it('refreshTenderCache', function* () {
-        const ctx = app.mockContext();
-        const tenders = yield ctx.app.mysql.query('SELECT * FROM zh_tender WHERE id > ? and id <= ?', tenderRange[4]);
-        console.log(tenderRange[4], tenders.length);
-        for (const t of tenders) {
-            yield ctx.service.tenderCache.refreshTenderCache(t);
-            console.log(`complete ${t.name}(${t.id})`);
-        }
-    });
-    it('refreshTenderCache', function* () {
-        const ctx = app.mockContext();
-        const tenders = yield ctx.app.mysql.query('SELECT * FROM zh_tender WHERE id > ? and id <= ?', tenderRange[5]);
-        console.log(tenderRange[5], tenders.length);
-        for (const t of tenders) {
-            yield ctx.service.tenderCache.refreshTenderCache(t);
-            console.log(`complete ${t.name}(${t.id})`);
-        }
-    });
-    it('refreshTenderCache', function* () {
-        const ctx = app.mockContext();
-        const tenders = yield ctx.app.mysql.query('SELECT * FROM zh_tender WHERE id > ? and id <= ?', tenderRange[6]);
-        console.log(tenderRange[6], tenders.length);
-        for (const t of tenders) {
-            yield ctx.service.tenderCache.refreshTenderCache(t);
-            console.log(`complete ${t.name}(${t.id})`);
-        }
-    });
-    it('refreshTenderCache', function* () {
-        const ctx = app.mockContext();
         const tenders = yield ctx.app.mysql.query('SELECT * FROM zh_tender WHERE id > ? and id <= ?', tenderRange[7]);
-        console.log(tenderRange[7], tenders.length);
-        for (const t of tenders) {
-            yield ctx.service.tenderCache.refreshTenderCache(t);
-            console.log(`complete ${t.name}(${t.id})`);
-        }
-    });
-    it('refreshTenderCache', function* () {
-        const ctx = app.mockContext();
-        const tenders = yield ctx.app.mysql.query('SELECT * FROM zh_tender WHERE id > ? and id <= ?', tenderRange[8]);
-        console.log(tenderRange[8], tenders.length);
-        for (const t of tenders) {
-            yield ctx.service.tenderCache.refreshTenderCache(t);
-            console.log(`complete ${t.name}(${t.id})`);
-        }
-    });
-    it('refreshTenderCache', function* () {
-        const ctx = app.mockContext();
-        const tenders = yield ctx.app.mysql.query('SELECT * FROM zh_tender WHERE id > ? and id <= ?', tenderRange[9]);
-        console.log(tenderRange[9], tenders.length);
+        console.log(tenderRange[0], tenders.length);
         for (const t of tenders) {
             yield ctx.service.tenderCache.refreshTenderCache(t);
             console.log(`complete ${t.name}(${t.id})`);
         }
     });
+    // it('refreshTenderCache', function* () {
+    //     const ctx = app.mockContext();
+    //     const tenders = yield ctx.app.mysql.query('SELECT * FROM zh_tender WHERE id > ? and id <= ?', tenderRange[1]);
+    //     console.log(tenderRange[1], tenders.length);
+    //     for (const t of tenders) {
+    //         yield ctx.service.tenderCache.refreshTenderCache(t);
+    //         console.log(`complete ${t.name}(${t.id})`);
+    //     }
+    // });
+    // it('refreshTenderCache', function* () {
+    //     const ctx = app.mockContext();
+    //     const tenders = yield ctx.app.mysql.query('SELECT * FROM zh_tender WHERE id > ? and id <= ?', tenderRange[2]);
+    //     console.log(tenderRange[2], tenders.length);
+    //     for (const t of tenders) {
+    //         yield ctx.service.tenderCache.refreshTenderCache(t);
+    //         console.log(`complete ${t.name}(${t.id})`);
+    //     }
+    // });
+    // it('refreshTenderCache', function* () {
+    //     const ctx = app.mockContext();
+    //     const tenders = yield ctx.app.mysql.query('SELECT * FROM zh_tender WHERE id > ? and id <= ?', tenderRange[3]);
+    //     console.log(tenderRange[3], tenders.length);
+    //     for (const t of tenders) {
+    //         yield ctx.service.tenderCache.refreshTenderCache(t);
+    //         console.log(`complete ${t.name}(${t.id})`);
+    //     }
+    // });
+    // it('refreshTenderCache', function* () {
+    //     const ctx = app.mockContext();
+    //     const tenders = yield ctx.app.mysql.query('SELECT * FROM zh_tender WHERE id > ? and id <= ?', tenderRange[4]);
+    //     console.log(tenderRange[4], tenders.length);
+    //     for (const t of tenders) {
+    //         yield ctx.service.tenderCache.refreshTenderCache(t);
+    //         console.log(`complete ${t.name}(${t.id})`);
+    //     }
+    // });
+    // it('refreshTenderCache', function* () {
+    //     const ctx = app.mockContext();
+    //     const tenders = yield ctx.app.mysql.query('SELECT * FROM zh_tender WHERE id > ? and id <= ?', tenderRange[5]);
+    //     console.log(tenderRange[5], tenders.length);
+    //     for (const t of tenders) {
+    //         yield ctx.service.tenderCache.refreshTenderCache(t);
+    //         console.log(`complete ${t.name}(${t.id})`);
+    //     }
+    // });
+    // it('refreshTenderCache', function* () {
+    //     const ctx = app.mockContext();
+    //     const tenders = yield ctx.app.mysql.query('SELECT * FROM zh_tender WHERE id > ? and id <= ?', tenderRange[6]);
+    //     console.log(tenderRange[6], tenders.length);
+    //     for (const t of tenders) {
+    //         yield ctx.service.tenderCache.refreshTenderCache(t);
+    //         console.log(`complete ${t.name}(${t.id})`);
+    //     }
+    // });
+    // it('refreshTenderCache', function* () {
+    //     const ctx = app.mockContext();
+    //     const tenders = yield ctx.app.mysql.query('SELECT * FROM zh_tender WHERE id > ? and id <= ?', tenderRange[7]);
+    //     console.log(tenderRange[7], tenders.length);
+    //     for (const t of tenders) {
+    //         yield ctx.service.tenderCache.refreshTenderCache(t);
+    //         console.log(`complete ${t.name}(${t.id})`);
+    //     }
+    // });
+    // it('refreshTenderCache', function* () {
+    //     const ctx = app.mockContext();
+    //     const tenders = yield ctx.app.mysql.query('SELECT * FROM zh_tender WHERE id > ? and id <= ?', tenderRange[8]);
+    //     console.log(tenderRange[8], tenders.length);
+    //     for (const t of tenders) {
+    //         yield ctx.service.tenderCache.refreshTenderCache(t);
+    //         console.log(`complete ${t.name}(${t.id})`);
+    //     }
+    // });
+    // it('refreshTenderCache', function* () {
+    //     const ctx = app.mockContext();
+    //     const tenders = yield ctx.app.mysql.query('SELECT * FROM zh_tender WHERE id > ? and id <= ?', tenderRange[9]);
+    //     console.log(tenderRange[9], tenders.length);
+    //     for (const t of tenders) {
+    //         yield ctx.service.tenderCache.refreshTenderCache(t);
+    //         console.log(`complete ${t.name}(${t.id})`);
+    //     }
+    // });
 });