From f22c15f3c4c52dd798301312aad6c5e29c7f6dae Mon Sep 17 00:00:00 2001
From: bupengxiang <bupengxiang@syxysoft.com>
Date: Fri, 28 Apr 2023 21:44:03 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E4=B8=AD=E5=88=A0=E9=99=A4=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PowerApplyController.java      | 22 ++++++++++++++++++-
 .../mapper/mysql/ReportManageMapper.xml       |  2 +-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/PowerApplyController.java b/adc-da-report/src/main/java/com/adc/da/report/controller/PowerApplyController.java
index dc8edcd..e26f332 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/controller/PowerApplyController.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/controller/PowerApplyController.java
@@ -2,6 +2,7 @@ package com.adc.da.report.controller;
 
 
 import com.adc.da.report.eo.PowerApply;
+import com.adc.da.report.service.IPowerApplyActService;
 import com.adc.da.report.service.IPowerApplyService;
 import com.adc.da.report.vo.DeleteParamRequestVO;
 import com.adc.da.report.vo.PowerApplyPageVO;
@@ -32,6 +33,9 @@ public class PowerApplyController {
     @Autowired
     private IPowerApplyService powerApplyService;
 
+    @Autowired
+    private IPowerApplyActService iPowerApplyActService;
+
     /**
      * @param powerApplyPageVO
      * @return com.adc.da.util.http.ResponseMessage
@@ -107,7 +111,7 @@ public class PowerApplyController {
      * @date 2023-04-23
      * @description 根据id或id数组进行删除
      */
-    @DeleteMapping("/delete")
+    @PostMapping("/delete")
     @ApiOperation(value = "单条/批量删除数据")
     public ResponseMessage delete(@RequestBody DeleteParamRequestVO deleteParamRequestVO){
 
@@ -115,4 +119,20 @@ public class PowerApplyController {
         powerApplyService.deleteById(deleteParamRequestVO);
         return Result.success();
     }
+
+    /**
+     * @param deleteParamRequestVO
+     * @return com.adc.da.util.http.ResponseMessage
+     * @author bu
+     * @date 2023-04-23
+     * @description 根据id或id数组进行删除
+     */
+    @PostMapping("/deleteAct")
+    @ApiOperation(value = "单条/批量删除数据")
+    public ResponseMessage deleteAct(@RequestBody DeleteParamRequestVO deleteParamRequestVO){
+
+        //单条/批量删除数据
+        iPowerApplyActService.deleteById(deleteParamRequestVO);
+        return Result.success();
+    }
 }
diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
index 17d0052..3d3a78e 100644
--- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
+++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
@@ -199,7 +199,7 @@
             rep.Name = #{Vo.name}
             and rep.del_flag = 0
             <if test="Vo.id != null and Vo.id != ''">
-              and  rep.id = #{Vo.id}
+              and  rep.id != #{Vo.id}
             </if>
         </where>
     </select>