From e80fac04e8287460b8d6444276db7efe2bd6e97b Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 29 Mar 2024 14:58:14 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E9=97=A8=E6=88=B7=E7=AB=AF-=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jero/config/shiro/ShiroConfig.java |  2 ++
 .../controller/TbMemberProjectSubitemController.java | 12 ++++++++++++
 .../member/mapper/TbMemberProjectSubitemMapper.java  |  2 ++
 .../mapper/xml/TbMemberProjectSubitemMapper.xml      | 11 +++++++++++
 .../service/ITbMemberProjectSubitemService.java      |  5 +++++
 5 files changed, 32 insertions(+)

diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
index c8d6c938..7af7b777 100644
--- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
+++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
@@ -142,6 +142,8 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/company/payCompanyManagement/judgeCompanyIsPackaged","anon");//判断当前企业是否是打包企业
         //通过单位名称查询该单位是否可用
         filterChainDefinitionMap.put("/member/tbMemberProjectSubitem/enableMemberByCompanyName", "anon");
+        //门户端-分页查询所有会员名称
+        filterChainDefinitionMap.put("/member/tbMemberProjectSubitem/pageAllMemberName", "anon");
 
 
         filterChainDefinitionMap.put("/", "anon");
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java
index a03d29d2..8fc67402 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java
@@ -105,6 +105,18 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 		 return Result.OK(pageList);
 	 }
 
+	 /**
+	  * 门户端-分页查询所有会员名称
+	  */
+	 @ApiOperation(value = "门户端-分页查询所有会员名称")
+	 @GetMapping(value = "/pageAllMemberName")
+	 public Result<IPage<TbMemberProjectSubitem>> pageAllMemberName(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+													@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+		 Page<TbMemberProjectSubitem> page = new Page<>(pageNo, pageSize);
+		 IPage<TbMemberProjectSubitem> pageList = tbMemberProjectSubitemService.pageAllMemberName(page);
+		 return Result.OK(pageList);
+	 }
+
 	 /**
 	  * 添加
 	  */
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java
index 4167b1c0..b706f326 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java
@@ -57,4 +57,6 @@ public interface TbMemberProjectSubitemMapper extends BaseMapper<TbMemberProject
     IPage<TbMemberProjectSubitem> queryPageListCompany(Page<TbMemberProjectSubitem> page, @Param(Constants.WRAPPER) QueryWrapper<TbMemberProjectSubitem> queryWrapper);
 
     TbMemberProjectSubitem getLastByCompanyId(@Param("companyId") String companyId);
+
+    IPage<TbMemberProjectSubitem> pageAllMemberName(Page<TbMemberProjectSubitem> page);
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml
index aa6490b2..46fe2afb 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml
@@ -148,4 +148,15 @@
         order by tmp.year
         limit 1
     </select>
+
+    <select id="pageAllMemberName" resultMap="TbMemberProjectSubitemResultMap">
+        SELECT t1.company_name
+        FROM tb_member_project_subitem t1
+                 INNER JOIN (
+            SELECT max(invalidation_date), id
+            FROM tb_member_project_subitem
+            where current_date BETWEEN effective_date and invalidation_date
+              and member_nature is not null
+            GROUP BY company_id) AS t2 ON t2.id = t1.id
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
index 1721915c..4a33515e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
@@ -856,4 +856,9 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 	public TbMemberProjectSubitem getLastByCompanyId(String companyId) {
 		return baseMapper.getLastByCompanyId(companyId);
 	}
+
+	public IPage<TbMemberProjectSubitem> pageAllMemberName(Page<TbMemberProjectSubitem> page) {
+		IPage<TbMemberProjectSubitem> iPage = baseMapper.pageAllMemberName(page);
+		return iPage;
+	}
 }