Pārlūkot izejas kodu

报表模板过滤

Tony Kang 1 gadu atpakaļ
vecāks
revīzija
7e0328424b
2 mainītis faili ar 10 papildinājumiem un 2 dzēšanām
  1. 4 1
      app/service/jpc_report.js
  2. 6 1
      app/service/rpt_tree_node.js

+ 4 - 1
app/service/jpc_report.js

@@ -214,7 +214,10 @@ module.exports = app => {
             }
         }
 
-        getAllPreviewPagesCommon(rawRptTpl, pageSize) {
+        async getAllPreviewPagesCommon(rawRptTpl, pageSize) {
+            // const rawDataObj = await ctx.service.report.getReportData(rptTpl.source_type, params, filter.tables, filter.memFieldKeys,
+            //     rptTpl[JV.NODE_CUSTOM_DEFINE], customSelect);
+
             const printCom = JpcEx.createNew();
             const defProperties = RPT_DEF_PROPERTIES;
             const rptTpl = JSON.parse(rawRptTpl.rpt_content);

+ 6 - 1
app/service/rpt_tree_node.js

@@ -38,12 +38,17 @@ module.exports = app => {
             return list;
         }
 
-        async getNodesByProjectId(prjIdArr) {
+        async getNodesByProjectId(prjIdArr, sourceType = 1) {
             this.initSqlBuilder();
             this.sqlBuilder.setAndWhere('pid', {
                 value: prjIdArr,
                 operate: 'in',
             });
+            this.sqlBuilder.setAndWhere('source_type', {
+                value: sourceType,
+                operate: '=',
+            });
+
             this.sqlBuilder.columns = ['id', 'name', 'rpt_type', 'pid', 'items', 'last_update_time'];
             const [sql, sqlParam] = this.sqlBuilder.build(this.tableName);