1、修改打印机配置按用户管理，打印配置添加用户账号，ip地址字段,打印配置删除提示

2、

industry-admin/src/api/report/print.js

@@ -41,6 +41,14 @@ export function getPrintConfigById(params) {
     });
 }
 
+/** 获得打印机ip */
+export function getClientIp() {
+  return request({
+    url: "/print/getClientIp",
+    method: "get",
+  });
+}
+
 /** 修改打印配置 */
 export function updatePrintConfigById(data) {
     return request({

industry-admin/src/views/report/runConfig/printConfig.vue

@@ -168,6 +168,14 @@
                     </el-form-item>
                 </el-col>
             </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="打印机IP地址" prop="printIp">
+                  <el-input v-model="printConfigForm.printIp" placeholder="请输入打印机IP地址" maxlength="20"
+                            style="width: 250px" :disabled="isDisable"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-form-item style="text-align: right">
                 <el-button type="primary" size="mini" @click="savePrintConfigEvent" v-if="!isDisable">确定</el-button>
                 <el-button size="mini" @click="handleClose">取消</el-button>
@@ -180,7 +188,7 @@
 import { showLoading } from '@/utils/cqcy'
 import {
     getPrint, addPrintConfig,
-    getPrintConfigById, updatePrintConfigById,
+    getPrintConfigById,getClientIp, updatePrintConfigById,
 } from "@/api/report/print";
 export default {
     data() {
@@ -194,6 +202,8 @@ export default {
                 id: "",
                 //作业名称
                 jobName: "",
+                //打印机ip地址
+                printIp:"",
                 // 打印方向
                 orientation: 2,
                 // 打印份数
@@ -235,6 +245,9 @@ export default {
                 jobName: [
                     { required: true, message: "请输入作业名称", trigger: "blur" },
                 ],
+                printIp: [
+                  { required: true, message: "请输入打印机IP地址", trigger: "blur" },
+                ],
                 orientation: [
                     { required: true, message: "请选择打印方向", trigger: "change" },
                 ],
@@ -288,6 +301,12 @@ export default {
                         this.printConfigForm = res.data
                     }
                 })
+            }else{
+              getClientIp().then((res) => {
+                if (res.data) {
+                    this.printConfigForm.printIp = res.data
+                }
+              })
             }
         },
         /** 弹出层关闭事件 */

industry-system/cqcy-ei-common/src/main/java/com/example/opc_common/entity/PrintConfig.java

@@ -103,6 +103,15 @@ public class PrintConfig {
      */
     private String printAreaValue="";
 
+    /**
+     * 创建用户
+     */
+    private String userId = "";
+    /**
+     * 打印机ip地址
+     */
+    private String printIp = "";
+
 
     private Date createTime;
 

industry-system/industry-da/src/main/java/com/example/opc_da/controller/PrintController.java

@@ -9,6 +9,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 @RestController
 @RequestMapping("print")
 @Slf4j
@@ -79,5 +81,9 @@ public class PrintController {
         }
         return printService.delPrintConfigById(id);
     }
+    @GetMapping("/getClientIp")
+    public Result getClientIp(HttpServletRequest request){
+        return printService.getClientIp(request);
+    }
 
 }

industry-system/industry-da/src/main/java/com/example/opc_da/dao/PrintDao.java

@@ -14,9 +14,9 @@ public interface PrintDao {
 
     PrintConfig getPrintConfigById(Integer id);
 
-    Long getPrintConfigCount();
+    Long getPrintConfigCount(String userId);
 
-    List<PrintConfig> getAllPrintConfig(Long startNum, Long limitNum);
+    List<PrintConfig> getAllPrintConfig(String userId,Long startNum, Long limitNum);
 
     Integer delPrintConfigById(Integer id);
 

industry-system/industry-da/src/main/java/com/example/opc_da/dao/ReportTableDao.java

@@ -239,6 +239,9 @@ public interface ReportTableDao {
      */
     List<String> getReportTableNameByPolicyId(Integer policyId);
 
+    List<String> getReportTableNameByPrintConfigId(Integer printConfigId);
+
+
     /**
      * 查询使用策略下点位的报表名称及其点位名称
      * @param policyId

industry-system/industry-da/src/main/java/com/example/opc_da/service/PrintService.java

@@ -3,6 +3,8 @@ package com.example.opc_da.service;
 import com.example.opc_common.entity.PrintConfig;
 import com.example.opc_common.util.Result;
 
+import javax.servlet.http.HttpServletRequest;
+
 public interface PrintService {
 
     Result addPrintConfig(PrintConfig printConfig);
@@ -15,4 +17,6 @@ public interface PrintService {
 
     Result delPrintConfigById(Integer id);
 
+    Result getClientIp(HttpServletRequest request);
+
 }

industry-system/industry-da/src/main/java/com/example/opc_da/service/impl/DeviceRunServiceImpl.java

@@ -33,7 +33,7 @@ public class DeviceRunServiceImpl implements DeviceRunService {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "已经存在此数据组名称了，请更改后再试");
         }
         if (deviceRunDao.addDeviceRun(deviceRun) <= 0) {
-            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "添加数据组失败");
+            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "添加设备运行参数失败");
         }
         List<DeviceRunItem> deviceRunItemList = deviceRun.getDeviceRunItemList();
         if (Blank.isNotEmpty(deviceRunItemList)) {
@@ -43,7 +43,7 @@ public class DeviceRunServiceImpl implements DeviceRunService {
             }
             deviceRunDao.addDeviceRunItem(deviceRun.getId(), deviceRunItemList);
         }
-        return Result.ok("添加数据组成功");
+        return Result.ok("添加设备运行参数成功");
     }
 
     @Override
@@ -53,7 +53,7 @@ public class DeviceRunServiceImpl implements DeviceRunService {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "已经存在此数据组名称了，请更改后再试");
         }
         if (deviceRunDao.updateDeviceRun(deviceRun) <= 0) {
-            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "修改数据组失败");
+            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "修改设备运行参数失败");
         }
         Integer id = deviceRun.getId();
         deviceRunDao.delDeviceRunItemByDeviceId(id);
@@ -65,7 +65,7 @@ public class DeviceRunServiceImpl implements DeviceRunService {
             }
             deviceRunDao.addDeviceRunItem(id, deviceRunItemList);
         }
-        return Result.ok("修改数据组成功");
+        return Result.ok("修改设备运行参数成功");
     }
 
     @Override
@@ -81,10 +81,10 @@ public class DeviceRunServiceImpl implements DeviceRunService {
     @Override
     public synchronized Result delDeviceRunById(Integer id) {
         if (deviceRunDao.delDeviceRunById(id) <= 0) {
-            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "删除数据组失败");
+            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "删除设备运行参数失败");
         }
         deviceRunDao.delDeviceRunItemByDeviceId(id);
-        return Result.ok("删除数据组成功");
+        return Result.ok("删除设备运行参数成功");
     }
 
     @Override

industry-system/industry-da/src/main/java/com/example/opc_da/service/impl/MainRunServiceImpl.java

@@ -38,7 +38,7 @@ public class MainRunServiceImpl implements MainRunService {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "已经存在此数据组名称了，请更改后再试");
         }
         if (mainRunDao.addMainRun(mainRun) <= 0) {
-            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "添加数据组失败");
+            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "添加主要运行参数失败");
         }
         List<MainRunItem> mainRunItemList = mainRun.getMainRunItemList();
         if (Blank.isNotEmpty(mainRunItemList)) {
@@ -48,7 +48,7 @@ public class MainRunServiceImpl implements MainRunService {
             }
             mainRunDao.addMainRunItem(mainRun.getId(), mainRunItemList);
         }
-        return Result.ok("添加数据组成功");
+        return Result.ok("添加主要运行参数成功");
     }
 
     @Override
@@ -58,7 +58,7 @@ public class MainRunServiceImpl implements MainRunService {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "已经存在此数据组名称了，请更改后再试");
         }
         if (mainRunDao.updateMainRun(mainRun) <= 0) {
-            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "修改数据组失败");
+            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "修改主要运行参数失败");
         }
         Integer id = mainRun.getId();
         mainRunDao.delMainRunItemByMainId(id);
@@ -70,7 +70,7 @@ public class MainRunServiceImpl implements MainRunService {
             }
             mainRunDao.addMainRunItem(id, mainRunItemList);
         }
-        return Result.ok("修改数据组成功");
+        return Result.ok("修改主要运行参数成功");
     }
 
     @Override
@@ -98,7 +98,7 @@ public class MainRunServiceImpl implements MainRunService {
             });
             fileService.deleleFiles(fileIdList);
         }
-        return Result.ok("删除数据组成功");
+        return Result.ok("删除主要运行参数成功");
     }
 
     @Override

industry-system/industry-da/src/main/java/com/example/opc_da/service/impl/PrintServiceImpl.java

@@ -1,15 +1,20 @@
 package com.example.opc_da.service.impl;
 
+import cn.hutool.extra.servlet.ServletUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.example.opc_common.entity.PrintConfig;
 import com.example.opc_common.enums.ResultEnum;
+import com.example.opc_common.util.Blank;
 import com.example.opc_common.util.Result;
 import com.example.opc_da.dao.PrintDao;
+import com.example.opc_da.dao.ReportTableDao;
 import com.example.opc_da.service.PrintService;
+import com.example.opc_da.util.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 @Transactional
@@ -18,9 +23,15 @@ public class PrintServiceImpl implements PrintService {
 
     @Autowired
     private PrintDao printDao;
+    @Autowired
+    private UserUtil userUtil;
+    @Autowired
+    private ReportTableDao reportTableDao;
 
     @Override
     public Result addPrintConfig(PrintConfig printConfig) {
+        String currentUserId = userUtil.getCurrentUserId();
+        printConfig.setUserId(currentUserId);
         if (printDao.addPrintConfig(printConfig) <= 0) {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "新增打印配置失败");
         }
@@ -37,10 +48,11 @@ public class PrintServiceImpl implements PrintService {
 
     @Override
     public Result getAllPrintConfig(Integer page, Integer limit) {
+        String currentUserId = userUtil.getCurrentUserId();
         JSONObject jsonObject = new JSONObject();
-        Long count = printDao.getPrintConfigCount();
+        Long count = printDao.getPrintConfigCount(currentUserId);
         Long startNum = Long.valueOf((page - 1) * limit);
-        List<PrintConfig> printConfigList = printDao.getAllPrintConfig(startNum, Long.valueOf(limit));
+        List<PrintConfig> printConfigList = printDao.getAllPrintConfig(currentUserId,startNum, Long.valueOf(limit));
         jsonObject.put("count", count);
         jsonObject.put("printConfigList", printConfigList);
         return Result.ok(jsonObject);
@@ -48,10 +60,23 @@ public class PrintServiceImpl implements PrintService {
 
     @Override
     public Result delPrintConfigById(Integer id) {
-        int count = 0;
-        if (count > 0) {
-            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "此打印配置被配置在打印任务中，不能删除");
+        //int count = 0;
+        //获得已配置打印机的报表列表
+        List<String> reportTableNameList = reportTableDao.getReportTableNameByPrintConfigId(id);
+        if (Blank.isNotEmpty(reportTableNameList)) {
+            String message = "此打印配置已被配置在报表【";
+            for (int i = 0; i < reportTableNameList.size(); i++) {
+                if (i != 0) {
+                    message += ",";
+                }
+                message += reportTableNameList.get(i);
+            }
+            message += "】中，删除失败";
+            return Result.no(ResultEnum.OPERATION_ERROR.getRespCode(), message);
         }
+//        if (count > 0) {
+//            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "此打印配置被配置在打印任务中，不能删除");
+//        }
         if (printDao.delPrintConfigById(id) <= 0) {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "删除打印配置失败");
         }
@@ -63,4 +88,11 @@ public class PrintServiceImpl implements PrintService {
         return Result.ok(printDao.getPrintConfigById(id));
     }
 
+    @Override
+    public Result getClientIp(HttpServletRequest request){
+        String clientIP = ServletUtil.getClientIP(request, "");
+        clientIP = "0:0:0:0:0:0:0:1".equals(clientIP) ? "127.0.0.1" : clientIP;
+        return Result.ok(clientIP);
+    }
+
 }

industry-system/industry-da/src/main/java/com/example/opc_da/validate/reportTable/AutomaticMaReportTableValidate.java

@@ -5,6 +5,7 @@ import cn.hutool.extra.servlet.ServletUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.example.opc_common.entity.DictType;
+import com.example.opc_common.entity.PrintConfig;
 import com.example.opc_common.entity.ReportDataPolicyItem;
 import com.example.opc_common.entity.ReportTable;
 import com.example.opc_common.enums.ResultEnum;
@@ -14,6 +15,7 @@ import com.example.opc_common.util.ConstantStr;
 import com.example.opc_common.util.Result;
 import com.example.opc_da.config.SpringContextUtils;
 import com.example.opc_da.dao.DictDao;
+import com.example.opc_da.dao.PrintDao;
 import com.example.opc_da.dao.ReportTableDao;
 import com.example.opc_da.task.AutoTableQuartzTask;
 import com.example.opc_da.task.AutoTableTimerTask;
@@ -32,6 +34,8 @@ public class AutomaticMaReportTableValidate extends AutomaticReportTableValidate
     ReportTableDao reportTableDao = SpringContextUtils.getBean(ReportTableDao.class);
     DictDao dictDao = SpringContextUtils.getBean(DictDao.class);
 
+    PrintDao printDao = SpringContextUtils.getBean(PrintDao.class);
+
     @Override
     public ReportTable getData(ReportTable reportTable) {
         Integer runState = reportTable.getRunState();
@@ -135,9 +139,15 @@ public class AutomaticMaReportTableValidate extends AutomaticReportTableValidate
                 return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "报表配置打印时，需要配置打印配置");
             }
         }
-        String clientIP = ServletUtil.getClientIP(request, "");
-        clientIP = "0:0:0:0:0:0:0:1".equals(clientIP) ? "127.0.0.1" : clientIP;
-        reportTable.setPrintIp(clientIP);
+        //获得客户端ip地址
+//        String clientIP = ServletUtil.getClientIP(request, "");
+//        clientIP = "0:0:0:0:0:0:0:1".equals(clientIP) ? "127.0.0.1" : clientIP;
+//        reportTable.setPrintIp(clientIP);
+
+        //获得打印机配置中的ip地址
+        PrintConfig printConfig = printDao.getPrintConfigById(reportTable.getPrintConfigId());
+        reportTable.setPrintIp(printConfig.getPrintIp());
+
         String cron = reportTable.getCron();
         if (Blank.isEmpty(cron)) {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "定时器配置不能为空");

industry-system/industry-da/src/main/java/com/example/opc_da/validate/reportTable/DeviceMaReportTableValidate.java

@@ -4,6 +4,7 @@ import cn.hutool.extra.servlet.ServletUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.example.opc_common.entity.DictType;
+import com.example.opc_common.entity.PrintConfig;
 import com.example.opc_common.entity.ReportDataPolicyItem;
 import com.example.opc_common.entity.ReportTable;
 import com.example.opc_common.enums.ResultEnum;
@@ -13,6 +14,7 @@ import com.example.opc_common.util.ConstantStr;
 import com.example.opc_common.util.Result;
 import com.example.opc_da.config.SpringContextUtils;
 import com.example.opc_da.dao.DictDao;
+import com.example.opc_da.dao.PrintDao;
 import com.example.opc_da.dao.ReportTableDao;
 import com.example.opc_da.task.DeviceTableQuartzTask;
 import com.example.opc_da.task.DeviceTableTimerTask;
@@ -30,6 +32,7 @@ import java.util.*;
 public class DeviceMaReportTableValidate extends DeviceReportTableValidate {
     ReportTableDao reportTableDao = SpringContextUtils.getBean(ReportTableDao.class);
     DictDao dictDao = SpringContextUtils.getBean(DictDao.class);
+    PrintDao printDao = SpringContextUtils.getBean(PrintDao.class);
 
     @Override
     public ReportTable getData(ReportTable reportTable) {
@@ -111,9 +114,14 @@ public class DeviceMaReportTableValidate extends DeviceReportTableValidate {
                 return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "报表配置打印时，需要配置打印配置");
             }
         }
-        String clientIP = ServletUtil.getClientIP(request, "");
-        clientIP = "0:0:0:0:0:0:0:1".equals(clientIP) ? "127.0.0.1" : clientIP;
-        reportTable.setPrintIp(clientIP);
+
+//        String clientIP = ServletUtil.getClientIP(request, "");
+//        clientIP = "0:0:0:0:0:0:0:1".equals(clientIP) ? "127.0.0.1" : clientIP;
+
+        //获得打印机配置中的ip地址
+        PrintConfig printConfig = printDao.getPrintConfigById(reportTable.getPrintConfigId());
+        reportTable.setPrintIp(printConfig.getPrintIp());
+
         String cron = reportTable.getCron();
         if (Blank.isEmpty(cron)) {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "定时器配置不能为空");

industry-system/industry-da/src/main/java/com/example/opc_da/validate/reportTable/EventMaReportTableValidate.java

@@ -2,6 +2,7 @@ package com.example.opc_da.validate.reportTable;
 
 import cn.hutool.extra.servlet.ServletUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.example.opc_common.entity.PrintConfig;
 import com.example.opc_common.entity.ReportTable;
 import com.example.opc_common.enums.ResultEnum;
 import com.example.opc_common.exception.CustomException;
@@ -9,6 +10,7 @@ import com.example.opc_common.util.Blank;
 import com.example.opc_common.util.ConstantStr;
 import com.example.opc_common.util.Result;
 import com.example.opc_da.config.SpringContextUtils;
+import com.example.opc_da.dao.PrintDao;
 import com.example.opc_da.dao.ReportTableDao;
 
 import javax.servlet.http.HttpServletRequest;
@@ -19,6 +21,7 @@ import javax.servlet.http.HttpServletRequest;
 public class EventMaReportTableValidate extends EventReportTableValidate {
 
     ReportTableDao reportTableDao = SpringContextUtils.getBean(ReportTableDao.class);
+    PrintDao printDao = SpringContextUtils.getBean(PrintDao.class);
 
     @Override
     public ReportTable getData(ReportTable reportTable) {
@@ -76,9 +79,14 @@ public class EventMaReportTableValidate extends EventReportTableValidate {
                 return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "报表配置打印时，需要配置打印配置");
             }
         }
-        String clientIP = ServletUtil.getClientIP(request, "");
-        clientIP = "0:0:0:0:0:0:0:1".equals(clientIP) ? "127.0.0.1" : clientIP;
-        reportTable.setPrintIp(clientIP);
+
+//        String clientIP = ServletUtil.getClientIP(request, "");
+//        clientIP = "0:0:0:0:0:0:0:1".equals(clientIP) ? "127.0.0.1" : clientIP;
+
+        //获得打印机配置中的ip地址
+        PrintConfig printConfig = printDao.getPrintConfigById(reportTable.getPrintConfigId());
+        reportTable.setPrintIp(printConfig.getPrintIp());
+
         if (reportTableDao.setAutoTableTime(reportTable) <= 0) {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "修改失败");
         }

industry-system/industry-da/src/main/resources/mapper/PrintDao.xml

@@ -5,7 +5,7 @@
     <sql id="printConfig">
         id
         ,print_name,job_name,orientation,copies,page_type, width,height,margin_left,margin_top,margin_right,margin_bottom,
-        unit,sides,chromaticity,fit_to_pages,scale,page_range,page_range_start,page_range_end,print_area,print_area_value,create_time
+        unit,sides,chromaticity,fit_to_pages,scale,page_range,page_range_start,page_range_end,print_area,print_area_value,create_time,user_id,print_ip
     </sql>
 
     <insert id="addPrintConfig">
@@ -13,10 +13,10 @@
                                     margin_top,
                                     margin_right, margin_bottom,
                                     unit, sides, chromaticity, fit_to_pages, scale, page_range, page_range_start,
-                                    page_range_end, print_area, print_area_value, create_time)
+                                    page_range_end, print_area, print_area_value, create_time,user_id,print_ip)
             value (#{printName},#{jobName},#{orientation},#{copies},#{pageType},#{width},#{height},#{marginLeft},#{marginTop},
             #{marginRight},#{marginBottom},#{unit},#{sides},#{chromaticity},#{fitToPages},#{scale},#{pageRange},
-            #{pageRangeStart},#{pageRangeEnd},#{printArea},#{printAreaValue},now())
+            #{pageRangeStart},#{pageRangeEnd},#{printArea},#{printAreaValue},now(),#{userId},#{printIp})
     </insert>
 
     <update id="updatePrintConfig">
@@ -40,7 +40,9 @@
             page_range_start=#{pageRangeStart},
             page_range_end=#{pageRangeEnd},
             print_area=#{printArea},
-            print_area_value=#{printAreaValue}
+            print_area_value=#{printAreaValue},
+            user_id=#{userId},
+            print_ip=#{printIp}
         where id = #{id}
     </update>
 
@@ -60,12 +62,14 @@
     <select id="getPrintConfigCount" resultType="java.lang.Long">
         select count(*)
         from t_print_config
+        where user_id=#{userId}
     </select>
 
     <select id="getAllPrintConfig" resultType="com.example.opc_common.entity.PrintConfig">
         select
         <include refid="printConfig"/>
         from t_print_config
+        where user_id=#{userId}
         order by create_time DESC
         limit #{startNum},#{limitNum}
     </select>

industry-system/industry-da/src/main/resources/mapper/ReportTableDao.xml

@@ -1174,6 +1174,13 @@
 		ORDER BY trt.report_table_name
     </select>
 
+    <select id="getReportTableNameByPrintConfigId" resultType="String">
+        select DISTINCT trt.report_table_name
+        from t_print_config tpc,t_report_table trt
+        where tpc.id = trt.print_config_id and tpc.id = #{printConfigId}
+        ORDER BY trt.report_table_name
+    </select>
+
 
     <select id="getReportTableAndItemByPolicyIdAndItemIdList" resultType="map">
         SELECT ti.id,ti.itemReadName,GROUP_CONCAT(ti.reportTableId SEPARATOR ',') reportTableId