From 928423c91d5932c39553585e55ed68f6d1976f3b Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 8 Oct 2021 17:57:41 +0800
Subject: [PATCH] =?UTF-8?q?delete=20=E5=8E=BB=E9=99=A4=E5=8F=82=E4=BC=9A?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CommitteeMeetingSituationController.java       | 14 ++++----------
 .../InternalMeetingSituationController.java        | 12 ++----------
 .../OtherMeetingSituationController.java           | 14 ++++----------
 .../controller/PayMeetingSituationController.java  | 14 ++++----------
 .../StandardsMeetingSituationController.java       | 14 ++++----------
 .../WorkGroupMeetingSituationController.java       | 14 ++++----------
 6 files changed, 22 insertions(+), 60 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java
index 3a570760..80a7dfe4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java
@@ -3,6 +3,7 @@ package com.jero.meeting.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.aspect.annotation.CompanyNameTranslate;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.DictPoint;
@@ -63,6 +64,7 @@ public class CommitteeMeetingSituationController extends JeroController<PayMeeti
     /**
      * 分页列表查询
      */
+    @CompanyNameTranslate
     @RequiresPermissions("committeeMeetingSituation:search")
     @ApiOperation(value = "参会人员信息-分页列表查询", notes = "参会人员信息-分页列表查询")
     @GetMapping(value = "/page")
@@ -86,16 +88,6 @@ public class CommitteeMeetingSituationController extends JeroController<PayMeeti
         return Result.OK(pageList);
     }
 
-    /**
-     * 列表查询
-     */
-    @ApiOperation(value = "参会人员信息-列表查询", notes = "参会人员信息-列表查询")
-    @GetMapping(value = "/list")
-    public Result<List<PayMeetingSituation>> queryList() {
-        List<PayMeetingSituation> list = payMeetingSituationService.queryList();
-        return Result.OK(list);
-    }
-
     /**
      * 添加参会人
      */
@@ -159,6 +151,7 @@ public class CommitteeMeetingSituationController extends JeroController<PayMeeti
     /**
      * 通过id查询
      */
+    @CompanyNameTranslate
     @DictPoint
     @ApiOperation(value = "参会人员信息-通过id查询", notes = "参会人员信息-通过id查询")
     @GetMapping(value = "/queryById")
@@ -173,6 +166,7 @@ public class CommitteeMeetingSituationController extends JeroController<PayMeeti
     /**
      * 通过会议id查询自己的参会人信息
      */
+    @CompanyNameTranslate
     @DictPoint
     @ApiOperation(value = "参会人员信息-通过会议id查询自己的参会人信息")
     @GetMapping(value = "/queryByMeetingId")
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java
index 22e6376a..f722ff4a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java
@@ -3,6 +3,7 @@ package com.jero.meeting.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.aspect.annotation.CompanyNameTranslate;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.DictPoint;
@@ -63,6 +64,7 @@ public class InternalMeetingSituationController extends JeroController<PayMeetin
     /**
      * 分页列表查询
      */
+    @CompanyNameTranslate
     @RequiresPermissions("internalMeetingSituation:search")
     @ApiOperation(value = "参会人员信息-分页列表查询", notes = "参会人员信息-分页列表查询")
     @GetMapping(value = "/page")
@@ -86,16 +88,6 @@ public class InternalMeetingSituationController extends JeroController<PayMeetin
         return Result.OK(pageList);
     }
 
-    /**
-     * 列表查询
-     */
-    @ApiOperation(value = "参会人员信息-列表查询", notes = "参会人员信息-列表查询")
-    @GetMapping(value = "/list")
-    public Result<List<PayMeetingSituation>> queryList() {
-        List<PayMeetingSituation> list = payMeetingSituationService.queryList();
-        return Result.OK(list);
-    }
-
     /**
      * 添加参会人
      */
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java
index 3779edff..69a86cea 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java
@@ -3,6 +3,7 @@ package com.jero.meeting.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.aspect.annotation.CompanyNameTranslate;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.DictPoint;
@@ -63,6 +64,7 @@ public class OtherMeetingSituationController extends JeroController<PayMeetingSi
     /**
      * 分页列表查询
      */
+    @CompanyNameTranslate
     @RequiresPermissions("otherMeetingSituation:search")
     @ApiOperation(value = "参会人员信息-分页列表查询", notes = "参会人员信息-分页列表查询")
     @GetMapping(value = "/page")
@@ -86,16 +88,6 @@ public class OtherMeetingSituationController extends JeroController<PayMeetingSi
         return Result.OK(pageList);
     }
 
-    /**
-     * 列表查询
-     */
-    @ApiOperation(value = "参会人员信息-列表查询", notes = "参会人员信息-列表查询")
-    @GetMapping(value = "/list")
-    public Result<List<PayMeetingSituation>> queryList() {
-        List<PayMeetingSituation> list = payMeetingSituationService.queryList();
-        return Result.OK(list);
-    }
-
     /**
      * 添加参会人
      */
@@ -159,6 +151,7 @@ public class OtherMeetingSituationController extends JeroController<PayMeetingSi
     /**
      * 通过id查询
      */
+    @CompanyNameTranslate
     @DictPoint
     @ApiOperation(value = "参会人员信息-通过id查询", notes = "参会人员信息-通过id查询")
     @GetMapping(value = "/queryById")
@@ -173,6 +166,7 @@ public class OtherMeetingSituationController extends JeroController<PayMeetingSi
     /**
      * 通过会议id查询自己的参会人信息
      */
+    @CompanyNameTranslate
     @DictPoint
     @ApiOperation(value = "参会人员信息-通过会议id查询自己的参会人信息")
     @GetMapping(value = "/queryByMeetingId")
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
index 1ff4007e..d1ce87c9 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
@@ -9,6 +9,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.jero.aspect.annotation.CompanyNameTranslate;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.DictPoint;
 import com.jero.common.exception.JeroBootException;
@@ -66,6 +67,7 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
     /**
      * 分页列表查询
      */
+    @CompanyNameTranslate
     @RequiresPermissions("otherMeeting:search")
     @ApiOperation(value = "参会人员信息-分页列表查询", notes = "参会人员信息-分页列表查询")
     @GetMapping(value = "/page")
@@ -121,16 +123,6 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
         return Result.OK(pageList);
     }
 
-    /**
-     * 列表查询
-     */
-    @ApiOperation(value = "参会人员信息-列表查询", notes = "参会人员信息-列表查询")
-    @GetMapping(value = "/list")
-    public Result<List<PayMeetingSituation>> queryList() {
-        List<PayMeetingSituation> list = payMeetingSituationService.queryList();
-        return Result.OK(list);
-    }
-
     /**
      * 添加参会人
      */
@@ -194,6 +186,7 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
     /**
      * 通过id查询
      */
+    @CompanyNameTranslate
     @DictPoint
     @ApiOperation(value = "参会人员信息-通过id查询", notes = "参会人员信息-通过id查询")
     @GetMapping(value = "/queryById")
@@ -208,6 +201,7 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
     /**
      * 通过会议id查询自己的参会人信息
      */
+    @CompanyNameTranslate
     @DictPoint
     @ApiOperation(value = "参会人员信息-通过会议id查询自己的参会人信息")
     @GetMapping(value = "/queryByMeetingId")
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java
index 64eaecf3..7d6fed87 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java
@@ -3,6 +3,7 @@ package com.jero.meeting.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.aspect.annotation.CompanyNameTranslate;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.DictPoint;
@@ -63,6 +64,7 @@ public class StandardsMeetingSituationController extends JeroController<PayMeeti
     /**
      * 分页列表查询
      */
+    @CompanyNameTranslate
     @RequiresPermissions("standardsMeetingSituation:search")
     @ApiOperation(value = "参会人员信息-分页列表查询", notes = "参会人员信息-分页列表查询")
     @GetMapping(value = "/page")
@@ -86,16 +88,6 @@ public class StandardsMeetingSituationController extends JeroController<PayMeeti
         return Result.OK(pageList);
     }
 
-    /**
-     * 列表查询
-     */
-    @ApiOperation(value = "参会人员信息-列表查询", notes = "参会人员信息-列表查询")
-    @GetMapping(value = "/list")
-    public Result<List<PayMeetingSituation>> queryList() {
-        List<PayMeetingSituation> list = payMeetingSituationService.queryList();
-        return Result.OK(list);
-    }
-
     /**
      * 添加参会人
      */
@@ -159,6 +151,7 @@ public class StandardsMeetingSituationController extends JeroController<PayMeeti
     /**
      * 通过id查询
      */
+    @CompanyNameTranslate
     @DictPoint
     @ApiOperation(value = "参会人员信息-通过id查询", notes = "参会人员信息-通过id查询")
     @GetMapping(value = "/queryById")
@@ -173,6 +166,7 @@ public class StandardsMeetingSituationController extends JeroController<PayMeeti
     /**
      * 通过会议id查询自己的参会人信息
      */
+    @CompanyNameTranslate
     @DictPoint
     @ApiOperation(value = "参会人员信息-通过会议id查询自己的参会人信息")
     @GetMapping(value = "/queryByMeetingId")
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java
index a306b6c6..19669178 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java
@@ -3,6 +3,7 @@ package com.jero.meeting.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.aspect.annotation.CompanyNameTranslate;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.DictPoint;
@@ -63,6 +64,7 @@ public class WorkGroupMeetingSituationController extends JeroController<PayMeeti
     /**
      * 分页列表查询
      */
+    @CompanyNameTranslate
     @RequiresPermissions("workGroupMeetingSituation:search")
     @ApiOperation(value = "参会人员信息-分页列表查询", notes = "参会人员信息-分页列表查询")
     @GetMapping(value = "/page")
@@ -86,16 +88,6 @@ public class WorkGroupMeetingSituationController extends JeroController<PayMeeti
         return Result.OK(pageList);
     }
 
-    /**
-     * 列表查询
-     */
-    @ApiOperation(value = "参会人员信息-列表查询", notes = "参会人员信息-列表查询")
-    @GetMapping(value = "/list")
-    public Result<List<PayMeetingSituation>> queryList() {
-        List<PayMeetingSituation> list = payMeetingSituationService.queryList();
-        return Result.OK(list);
-    }
-
     /**
      * 添加参会人
      */
@@ -159,6 +151,7 @@ public class WorkGroupMeetingSituationController extends JeroController<PayMeeti
     /**
      * 通过id查询
      */
+    @CompanyNameTranslate
     @DictPoint
     @ApiOperation(value = "参会人员信息-通过id查询", notes = "参会人员信息-通过id查询")
     @GetMapping(value = "/queryById")
@@ -173,6 +166,7 @@ public class WorkGroupMeetingSituationController extends JeroController<PayMeeti
     /**
      * 通过会议id查询自己的参会人信息
      */
+    @CompanyNameTranslate
     @DictPoint
     @ApiOperation(value = "参会人员信息-通过会议id查询自己的参会人信息")
     @GetMapping(value = "/queryByMeetingId")