Browse Source

交叉表合计容错处理

TonyKang 4 years ago
parent
commit
e116ff7cea

+ 6 - 2
modules/reports/rpt_component/jpc_cross_tab.js

@@ -235,8 +235,12 @@ JpcCrossTabSrv.prototype.createNew = function(){
                     for (let di = 0; di < data_fields.length; di++) {
                         rowGrandTotal.push(0.0);
                         for (let k = 0; k < me.sortedRowSequence[i][j].length; k++) {
-                            //3. start to sum
-                            rowGrandTotal[di] = rowGrandTotal[di] + 1.0 * JpcFieldHelper.getValue(data_fields[di], me.sortedRowSequence[i][j][k]);
+                            // 3. start to sum
+                            let vTtl = parseFloat(JpcFieldHelper.getValue(data_fields[di], me.sortedRowSequence[i][j][k]));
+                            if (isNaN(vTtl)) {
+                                vTtl = 0;
+                            }
+                            rowGrandTotal[di] = rowGrandTotal[di] + vTtl;
                         }
                     }
                     me.col_sum_fields_value_total[i].push(rowGrandTotal);

+ 2 - 2
test/unit/reports/test_rpt_test_template.js

@@ -56,7 +56,7 @@ let demoPrjId = - 1;
 // let demoRptId = 551; //表05
 // let demoRptId = 1104; //内蒙2017 表09
 
-let demoRptId = 1143;
+let demoRptId = 1162;
 
 let pagesize = "A4";
 
@@ -72,7 +72,7 @@ let userId_me = "5b6a60b1c4ba33000dd417c0"; //我的
 // demoPrjId = 2260; //QA:
 // demoPrjId = 5029; //
 // demoPrjId = 5029; //项目名称过长
-demoPrjId = 22936; //
+demoPrjId = 23964; //
 // demoPrjId = 4107; //UAT:
 //*/
 let userId_Dft = userId_Leng;