From 3c666c64397ea20410140bf1ac72e3bcde066e22 Mon Sep 17 00:00:00 2001
From: Rui_Li <877258667@qq.com>
Date: Mon, 18 Apr 2022 14:22:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=20=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/controller/ReportController.java       | 15 +++++++++++++++
 .../com/gaotao/modules/report/dao/ReportDao.java  |  2 +-
 .../modules/report/dao/impl/ReportDaoImpl.java    |  7 ++++++-
 .../modules/report/service/ReportService.java     |  9 +++++++++
 .../report/service/impl/ReportServiceImpl.java    | 11 ++++++++++-
 5 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/report/controller/ReportController.java b/src/main/java/com/gaotao/modules/report/controller/ReportController.java
index bcb2ffb..39ff8dc 100644
--- a/src/main/java/com/gaotao/modules/report/controller/ReportController.java
+++ b/src/main/java/com/gaotao/modules/report/controller/ReportController.java
@@ -183,6 +183,21 @@ public class ReportController {
                 .put("msg", "操作成功!");
     }
 
+    /**
+     * @Author LR
+     * @Description 删除定制报表的查询列
+     * @DateTime  2022/4/18 13:28
+     * @Param [inData]
+     * @return com.gaotao.common.utils.R
+     **/
+    @RequestMapping(value = "deleteCustomerReportSearchColumn")
+    public R deleteCustomerReportSearchColumn(@RequestBody CustomerSearchColumnData inData){
+        reportService.deleteCustomerReportSearchColumn(inData);
+        return R.ok()
+                .put("code", 200)
+                .put("msg", "操作成功!");
+    }
+
 
 
 
diff --git a/src/main/java/com/gaotao/modules/report/dao/ReportDao.java b/src/main/java/com/gaotao/modules/report/dao/ReportDao.java
index ed8c884..821732d 100644
--- a/src/main/java/com/gaotao/modules/report/dao/ReportDao.java
+++ b/src/main/java/com/gaotao/modules/report/dao/ReportDao.java
@@ -110,7 +110,7 @@ public interface ReportDao {
      * @Param [reportId]
      * @return void
      **/
-    void deleteCustomerReportSearchColumnByReportId(String reportId);
+    void deleteCustomerReportSearchColumn(String reportId, String columnField);
 
     /**
      * @Author LR
diff --git a/src/main/java/com/gaotao/modules/report/dao/impl/ReportDaoImpl.java b/src/main/java/com/gaotao/modules/report/dao/impl/ReportDaoImpl.java
index a323a19..d140b40 100644
--- a/src/main/java/com/gaotao/modules/report/dao/impl/ReportDaoImpl.java
+++ b/src/main/java/com/gaotao/modules/report/dao/impl/ReportDaoImpl.java
@@ -143,10 +143,15 @@ public class ReportDaoImpl implements ReportDao {
     }
 
     @Override
-    public void deleteCustomerReportSearchColumnByReportId(String reportId) {
+    public void deleteCustomerReportSearchColumn(String reportId, String columnField) {
         StringBuilder sql = new StringBuilder();
         Map<String, Object> paramMap = new HashMap<>();
         sql.append("DELETE FROM customer_report_search_column WHERE report_id = :reportId");
+        //判断条件
+        if(!(null == columnField || "".equals(columnField))){
+            sql.append(" AND column_field = :columnField");
+            paramMap.put("columnField", columnField);
+        }
         paramMap.put("reportId", reportId);
         parameterJdbcTemplate.update(sql.toString(), paramMap);
     }
diff --git a/src/main/java/com/gaotao/modules/report/service/ReportService.java b/src/main/java/com/gaotao/modules/report/service/ReportService.java
index 747ea1b..d4d5512 100644
--- a/src/main/java/com/gaotao/modules/report/service/ReportService.java
+++ b/src/main/java/com/gaotao/modules/report/service/ReportService.java
@@ -102,4 +102,13 @@ public interface ReportService {
      * @return void
      **/
     void deleteCustomerReport(SearchReportData inData);
+
+    /**
+     * @Author LR
+     * @Description 删除定制报表的查询列
+     * @DateTime  2022/4/18 13:29
+     * @Param [inData]
+     * @return void
+     **/
+    void deleteCustomerReportSearchColumn(CustomerSearchColumnData inData);
 }
diff --git a/src/main/java/com/gaotao/modules/report/service/impl/ReportServiceImpl.java b/src/main/java/com/gaotao/modules/report/service/impl/ReportServiceImpl.java
index 29974d5..89f87ef 100644
--- a/src/main/java/com/gaotao/modules/report/service/impl/ReportServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/report/service/impl/ReportServiceImpl.java
@@ -363,10 +363,19 @@ public class ReportServiceImpl implements ReportService {
             throw new RRException("已经使用的报表无法删除");
         }
         //继续 1. 先删除条件表
-        reportDao.deleteCustomerReportSearchColumnByReportId(reportId);
+        reportDao.deleteCustomerReportSearchColumn(reportId, null);
         //2. 删除查询列
         reportDao.deleteCustomerReportColumnByReportId(reportId);
         //2. 删除主表
         reportDao.deleteCustomerReportByReportId(reportId);
     }
+
+    @Override
+    public void deleteCustomerReportSearchColumn(CustomerSearchColumnData inData) {
+        //公共参数
+        String reportId = inData.getReportId();
+        String columnField = inData.getColumnField();
+        //执行删除操作
+        reportDao.deleteCustomerReportSearchColumn(reportId, columnField);
+    }
 }