材差期汇总表

app/middleware/auto_finish_logger.js

@@ -33,7 +33,6 @@ module.exports = options => {
         } else {
             logData = {
                 requestTime: ctx.logTime, responseTime, runTime,
-                data: ctx.body,
             };
         }
         const bLogger = runTime > 500 ? ctx.getLogger('warning') : ctx.getLogger('finish');

app/service/rpt_stage_sum_memory.js

@@ -277,9 +277,10 @@ module.exports = app => {
                 const curMaterial = material.status === auditConst.material.status.checked
                     ? await this.ctx.service.materialBillsHistory.getAllDataByCondition({ where: { mid: material.id } })
                     : await this.ctx.service.materialBills.getAllDataByCondition({ where: { tid }});
+                const relaId = material.status === auditConst.material.status.checked ? 'mb_id' : 'id';
 
                 this.ctx.helper.assignRelaData(materialData, [
-                    {data: curMaterial, fields, prefix: prefix, relaId: 'mb_id', defaultData: defaultData}
+                    {data: curMaterial, fields, prefix: prefix, relaId, defaultData: defaultData}
                 ]);
             }
 

db_script/ledger_his.js

@@ -58,13 +58,12 @@ const querySql = async function(sql, sqlParam) {
 };
 
 const getTableName = function(tender, table) {
-    // switch(table) {
-    //     case 'ledger': return 'zh_ledger_' + (tender.id % 10);
-    //     case 'pos': return 'zh_pos_' + (tender.id % 20);
-    //     case 'revise_bills': return 'zh_revise_bills_' + (tender.id % 10);
-    //     case 'revise_pos': return 'zh_revise_pos_' + (tender.id % 20);
-    // }
-    return table.indexOf('pos') > 0 ? `zh_${table}_${tender.id % 20}` : `zh_${table}_${tender.id % 10}`;
+    switch(table) {
+        case 'ledger': return 'zh_ledger_' + (tender.id % 10);
+        case 'pos': return 'zh_pos_' + (tender.id % 20);
+        case 'revise_bills': return 'zh_revise_bills_' + (tender.id % 10);
+        case 'revise_pos': return 'zh_revise_pos_' + (tender.id % 20);
+    }
 };
 
 const saveLedgerHis = async function(tender) {
@@ -115,7 +114,7 @@ const doCompleteTender = async function(t) {
                 await querySql('Update zh_ledger_revise Set his_id = ? Where id = ?', [r.his_id, r.id]);
             } else {
                 if (r.status !== 1) withoutHisRevise.push(r);
-            }
+
         }
         if (!his_id || t.measure_type === measureType.gcl.value) his_id = await saveLedgerHis(t);
         await querySql('Update zh_tender Set his_id = ? Where id = ?', [his_id, t.id]);

db_script/recover_ledger_his.js

@@ -0,0 +1,48 @@
+const fs = require('fs');
+const path = require('path');
+
+const measureType = require('../app/const/tender').measureType;
+
+const mysql = require('mysql');
+const oss = require('ali-oss');
+const config = process.argv.splice(2)[0];
+if (['local', 'uat', 'default'].indexOf(config) < 0) throw `参数错误: ${config}`;
+const options = require(`../config/config.${config}`)({ baseDir: __dirname + '/app', root: __dirname, name: 'calc' });
+
+const pool = mysql.createPool(options.mysql.client);
+const ossOption = {
+    bucket: options.oss.clients.his.bucket,
+    accessKeyId: options.oss.default.accessKeyId,
+    accessKeySecret: options.oss.default.accessKeySecret,
+    endpoint: options.oss.default.endpoint,
+    timeout: options.oss.default.timeout,
+};
+const ossClient = new oss(ossOption);
+
+const querySql = async function(sql, sqlParam) {
+    return new Promise(function(resolve, reject) {
+        pool.getConnection(function(err, conn) {
+            if (err) {
+                if (err) console.log(err);
+                reject(err);
+            } else {
+                conn.query(sql, sqlParam, function(err, rows, fields) {
+                    if (err) console.log(err);
+                    // 释放连接
+                    conn.release();
+                    // 传递Promise回调对象
+                    resolve(rows);
+                });
+            }
+        });
+    });
+};
+
+const getTableName = function(tender, table) {
+    switch(table) {
+        case 'ledger': return 'zh_ledger_' + (tender.id % 10);
+        case 'pos': return 'zh_pos_' + (tender.id % 20);
+        case 'revise_bills': return 'zh_revise_bills_' + (tender.id % 10);
+        case 'revise_pos': return 'zh_revise_pos_' + (tender.id % 20);
+    }
+};