报表，交互表，提供用户选择数据

app/service/report.js

@@ -221,6 +221,9 @@ module.exports = app => {
             }
             for (const filter of filters) {
                 switch (filter) {
+                    case 'mem_custom_select':
+                        rst[filter] = customSelect;
+                        break;
                     case 'mem_stage_im_tz':
                         rst[filter] = await service.reportMemory.getStageImTzData(params.tender_id, params.stage_id, memFieldKeys[filter]);
                         break;

builder_report_index_define.js

@@ -1679,6 +1679,31 @@ const jh_gather_im_change = {
     ],
 };
 
+const custom_select = {
+    name: '【用户交互】用户选择信息 数据表(mem_custom_select)',
+    remark: '',
+    id: 63,
+    key: 'mem_custom_select',
+    prefix: '【用户交互】用户选择信息',
+    cols: [
+        // audit_select
+        { name: '审批人选择-id', field: 'audit_select.aid', type: dataType.arr, map: 'arr' },
+        { name: '审批人选择-名称', field: 'audit_select.name', type: dataType.arr, map: 'arr' },
+        { name: '审批人选择-单位', field: 'audit_select.company', type: dataType.arr, map: 'arr' },
+        { name: '审批人选择-角色', field: 'audit_select.role', type: dataType.arr, map: 'arr' },
+        { name: '审批人选择-审批轮', field: 'audit_select.times', type: dataType.arr, map: 'arr' },
+        { name: '审批人选择-审批顺序', field: 'audit_select.order', type: dataType.arr, map: 'arr' },
+        // gather_select
+        { name: '标段汇总-类型', field: 'gather_select.type', type: dataType.str },
+        { name: '标段汇总-汇总年月', field: 'gather_select.month', type: dataType.str },
+        { name: '标段汇总-汇总区间(时间)', field: 'gather_select.zone', type: dataType.str },
+        { name: '标段汇总-汇总期', field: 'gather_select.stage', type: dataType.int },
+        { name: '标段汇总-汇总区间(期)', field: 'gather_select.stage_zone', type: dataType.int },
+        // stage_select
+        { name: '期汇总-选择期', field: 'stage_select.stages', type: dataType.str},
+    ]
+};
+
 const recursiveMkdirSync = async function(pathName) {
     if (!fs.existsSync(pathName)) {
         const upperPath = path.dirname(pathName);
@@ -1704,7 +1729,11 @@ const addFields = function(table, col) {
     data.DataType = col.type;
     data.TableName = table.key;
     data.descr = '';
-    data.mapExpression = "$PROJECT.REPORT.getProperty('" + table.key + "', '" + col.field + "')";
+    if (col.map && col.map === 'arr') {
+        data.mapExpression = `$PROJECT.REPORT.getArrayProperty('${table.key}', '${col.field}')`;
+    } else {
+        data.mapExpression = `$PROJECT.REPORT.getProperty('${table.key}', '${col.field}')`;
+    }
     if (col.tag) {
         switch (tag.type) {
             case 'up':
@@ -1787,6 +1816,7 @@ const defines = [
     gcl_gather_bills, gcl_gather_xmj,
     ledger_tag, stage_tag, all_tag,
     jh_im_change, jh_gather_im_change,
+    custom_select,
 ];
 for (const d of defines) {
     exportTableDefine(d);