Pārlūkot izejas kodu

数据预处理,交叉,调整

MaiXinRong 5 gadi atpakaļ
vecāks
revīzija
2b2be11bf1

+ 5 - 1
app/lib/rpt_data_analysis.js

@@ -1012,6 +1012,8 @@ const gatherSelectConverse = {
         table: ['mem_gather_stage_bills'],
     },
     _commonConverse: function (helper, data, count) {
+        console.log(count);
+        console.log(data);
         const result = [];
         const reg = new RegExp('^t_[0-9]+_');
         for (let i = 0; i < count; i++) {
@@ -1038,7 +1040,9 @@ const gatherSelectConverse = {
         const gsDefine = csRela.tplDefine.gather_select;
         if (!gsDefine || !gsDefine.enable || !gsDefine.setting || gsDefine.setting === '') return;
         const gsCustom = csRela.cDefine ? csRela.cDefine.gather_select : null;
-        const count = gsCustom.tenders.length - gsDefine.setting.special.length;
+        const count = gsDefine.setting.special
+            ? gsCustom.tenders.length - gsDefine.setting.special.length
+            : gsCustom.tenders.length;
 
         for (const t of options.table) {
             switch (t) {

+ 19 - 2
test/app/service/report_memory_temp.test.js

@@ -13,6 +13,8 @@ const path = require('path');
 let savePath;
 const mockData = {};
 
+const reportDataAnalysis = require('../../../app/lib/rpt_data_analysis');
+
 describe('test/app/service/report_memory.test.js', () => {
     // 准备测试数据
     before(function* () {
@@ -36,8 +38,23 @@ describe('test/app/service/report_memory.test.js', () => {
     // 期部位明细数据
     it('test getStagePos', function* () {
         const ctx = app.mockContext(mockData);
+        const select = {
+            tenders: [{tid: 2283}, {tid: 2281}],
+            type: 'final',
+        };
+        const define = {
+            enable: true,
+            setting: JSON.stringify({
+                title: '请选择汇总的标段',
+                type: 'final',
+            })
+        };
 
-        const result = yield ctx.service.reportMemory.getMaterialGl(2418, 2);
-        yield ctx.helper.saveBufferFile(JSON.stringify(result, "", "\t"), path.join(savePath, 'test-result.json'));
+        const data = {};
+        data.mem_gather_stage_pay = yield ctx.service.rptGatherMemory.getGatherStagePay([], define, select);
+        yield ctx.helper.saveBufferFile(JSON.stringify(data.mem_gather_stage_pay, "", "\t"), path.join(savePath, 'mem_gather_stage_pay.json'));
+        reportDataAnalysis.analysisObj.gatherSelectConverse.fun(ctx, data, [], {table: ['mem_gather_stage_pay']}, {
+            tplDefine: {gather_select: define}, cDefine: {gather_select: select}});
+        yield ctx.helper.saveBufferFile(JSON.stringify(data.mem_gather_stage_pay, "", "\t"), path.join(savePath, 'mem_gather_stage_pay_converse.json'));
     });
 });