|
@@ -2,21 +2,21 @@
|
|
|
* Created by Tony on 2017/3/13.
|
|
|
*/
|
|
|
|
|
|
-let mongoose = require('mongoose');
|
|
|
-let async = require('async');
|
|
|
+import mongoose from "mongoose";
|
|
|
+import async from "async";
|
|
|
|
|
|
-let JV = require('../rpt_component/jpc_value_define');
|
|
|
+import JV from "../rpt_component/jpc_value_define";
|
|
|
|
|
|
let Template = mongoose.model('rpt_templates');
|
|
|
-let rptTplFacade = require('../facade/rpt_template_facade');
|
|
|
-let demoTemplateFacade = require('../facade/rpt_tpl_data_demo_facade');
|
|
|
+import rptTplFacade from "../facade/rpt_template_facade";
|
|
|
+import demoTemplateFacade from "../facade/rpt_tpl_data_demo_facade";
|
|
|
|
|
|
-let JpcEx = require('../rpt_component/jpc_ex');
|
|
|
-let rptUtil = require("../util/rpt_util");
|
|
|
-let rpt_xl_util = require('../util/rpt_excel_util');
|
|
|
-let rpt_pdf_util = require('../util/rpt_pdf_util');
|
|
|
-let fs = require('fs');
|
|
|
-let strUtil = require('../../../public/stringUtil');
|
|
|
+import JpcEx from "../rpt_component/jpc_ex";
|
|
|
+import rptUtil from "../util/rpt_util";
|
|
|
+import rpt_xl_util from "../util/rpt_excel_util";
|
|
|
+import rpt_pdf_util from "../util/rpt_pdf_util";
|
|
|
+import fs from "fs";
|
|
|
+import strUtil from "../../../public/stringUtil";
|
|
|
|
|
|
//统一回调函数
|
|
|
let callback = function(req, res, err, data){
|
|
@@ -66,7 +66,7 @@ function getAllPagesCommonOrg(rpt_id, pageSize, option, cb) {
|
|
|
}
|
|
|
}
|
|
|
);
|
|
|
-};
|
|
|
+}
|
|
|
|
|
|
function getAllPagesCommon(rpt_id, pageSize, cb) {
|
|
|
let rptTpl = null;
|
|
@@ -76,23 +76,23 @@ function getAllPagesCommon(rpt_id, pageSize, cb) {
|
|
|
let tplData = {};
|
|
|
if (rptTpl[JV.NODE_FIELD_MAP]) {
|
|
|
//1. 离散数据
|
|
|
- if (rptTpl[JV.NODE_FIELD_MAP][JV.NODE_DISCRETE_FIELDS] && rptTpl[JV.NODE_FIELD_MAP][JV.NODE_DISCRETE_FIELDS].leng > 0) {
|
|
|
+ if (rptTpl[JV.NODE_FIELD_MAP][JV.NODE_DISCRETE_FIELDS] && rptTpl[JV.NODE_FIELD_MAP][JV.NODE_DISCRETE_FIELDS].length > 0) {
|
|
|
tplData[JV.DATA_DISCRETE_DATA] = [];
|
|
|
}
|
|
|
//2. 主数据
|
|
|
- if (rptTpl[JV.NODE_FIELD_MAP][JV.NODE_MASTER_FIELDS] && rptTpl[JV.NODE_FIELD_MAP][JV.NODE_MASTER_FIELDS].leng > 0) {
|
|
|
+ if (rptTpl[JV.NODE_FIELD_MAP][JV.NODE_MASTER_FIELDS] && rptTpl[JV.NODE_FIELD_MAP][JV.NODE_MASTER_FIELDS].length > 0) {
|
|
|
tplData[JV.DATA_MASTER_DATA] = [];
|
|
|
}
|
|
|
//3. 从数据
|
|
|
- if (rptTpl[JV.NODE_FIELD_MAP][JV.NODE_DETAIL_FIELDS] && rptTpl[JV.NODE_FIELD_MAP][JV.NODE_DETAIL_FIELDS].leng > 0) {
|
|
|
+ if (rptTpl[JV.NODE_FIELD_MAP][JV.NODE_DETAIL_FIELDS] && rptTpl[JV.NODE_FIELD_MAP][JV.NODE_DETAIL_FIELDS].length > 0) {
|
|
|
tplData[JV.DATA_DETAIL_DATA] = [];
|
|
|
}
|
|
|
//2. Ex主数据
|
|
|
- if (rptTpl[JV.NODE_FIELD_MAP][JV.NODE_MASTER_FIELDS_EX] && rptTpl[JV.NODE_FIELD_MAP][JV.NODE_MASTER_FIELDS_EX].leng > 0) {
|
|
|
+ if (rptTpl[JV.NODE_FIELD_MAP][JV.NODE_MASTER_FIELDS_EX] && rptTpl[JV.NODE_FIELD_MAP][JV.NODE_MASTER_FIELDS_EX].length > 0) {
|
|
|
tplData[JV.DATA_MASTER_DATA_EX] = [];
|
|
|
}
|
|
|
//3. Ex从数据
|
|
|
- if (rptTpl[JV.NODE_FIELD_MAP][JV.NODE_DETAIL_FIELDS_EX] && rptTpl[JV.NODE_FIELD_MAP][JV.NODE_DETAIL_FIELDS_EX].leng > 0) {
|
|
|
+ if (rptTpl[JV.NODE_FIELD_MAP][JV.NODE_DETAIL_FIELDS_EX] && rptTpl[JV.NODE_FIELD_MAP][JV.NODE_DETAIL_FIELDS_EX].length > 0) {
|
|
|
tplData[JV.DATA_DETAIL_DATA_EX] = [];
|
|
|
}
|
|
|
//4. 重点: 开始组装$PROJECT对象
|
|
@@ -108,7 +108,7 @@ function getAllPagesCommon(rpt_id, pageSize, cb) {
|
|
|
cb('No report template was found!', null);
|
|
|
}
|
|
|
})
|
|
|
-};
|
|
|
+}
|
|
|
|
|
|
module.exports = {
|
|
|
getReportAllPages: function(req, res){
|
|
@@ -125,7 +125,6 @@ module.exports = {
|
|
|
rptName = req.params.rptName,
|
|
|
isOneSheet = req.params.isOneSheet,
|
|
|
option = req.params.option;
|
|
|
- ;
|
|
|
let dftOption = option||JV.PAGING_OPTION_NORMAL;
|
|
|
getAllPagesCommonOrg(rpt_id, pageSize, dftOption, function(err, pageRst){
|
|
|
fs.writeFileSync('D:/GitHome/ConstructionOperation/tmp/testRpt.js', JSON.stringify(pageRst));
|
|
@@ -151,7 +150,6 @@ module.exports = {
|
|
|
pageSize = req.params.size,
|
|
|
rptName = req.params.rptName,
|
|
|
option = req.params.option;
|
|
|
- ;
|
|
|
let parallelFucs = [];
|
|
|
let dftOption = option||JV.PAGING_OPTION_NORMAL;
|
|
|
for (let id of rpt_ids) {
|