From 6931abad0b8f745c9fba4cfd96284db833844e25 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 29 Mar 2024 16:54:45 +0800
Subject: [PATCH] =?UTF-8?q?fix=2082894=20=E4=BC=9A=E5=91=98=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1--=E5=8D=95=E4=BD=8D=E5=88=86=E7=B1=BB=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1--=E5=90=8C=E4=B8=80=E4=B8=AA=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E5=9C=A8=E4=B8=8D=E5=90=8C=E5=B9=B4=E4=BB=BD=E7=9A=84=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E4=B8=8D=E5=90=8C=E6=97=B6=EF=BC=8C=E6=8C=89=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E4=B8=80=E5=B9=B4=E7=9A=84=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/TbMemberProjectSubitemMapper.java  |  2 +
 .../xml/TbMemberProjectSubitemMapper.xml      | 38 ++++++++++++-------
 .../ITbMemberProjectSubitemService.java       | 24 ++++++++++--
 3 files changed, 47 insertions(+), 17 deletions(-)

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 b706f326..bf897d6b 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
@@ -59,4 +59,6 @@ public interface TbMemberProjectSubitemMapper extends BaseMapper<TbMemberProject
     TbMemberProjectSubitem getLastByCompanyId(@Param("companyId") String companyId);
 
     IPage<TbMemberProjectSubitem> pageAllMemberName(Page<TbMemberProjectSubitem> page);
+
+    List<TbMemberProjectSubitem> getAllYearInfoByCompanyId(@Param("companyId") String companyId);
 }
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 46fe2afb..86f74404 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
@@ -113,25 +113,26 @@
     </select>
 
     <select id="getAllTakeEffect" resultMap="TbMemberProjectSubitemResultMap">
-        SELECT t1.*
-        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
+        SELECT *
+        from (SELECT tmps.*
+              FROM tb_member_project_subitem tmps
+                       left join tb_member_project tmp on tmps.project_id = tmp.id
+              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
+              order by tmp.year desc) t1
+        group by t1.company_id
     </select>
 
     <select id="pieChartPage" resultMap="TbMemberProjectSubitemResultMap">
-        SELECT t1.*
-        FROM tb_member_project_subitem t1
-                 INNER JOIN (
-            SELECT max(invalidation_date), id
-            FROM tb_member_project_subitem
-            where invalidation_date >= current_date
-            GROUP BY company_id) AS t2 ON t2.id = t1.id
+        select * from (SELECT * from (SELECT tmps.*
+        FROM tb_member_project_subitem tmps
+        left join tb_member_project tmp on tmps.project_id = tmp.id
+        where current_date BETWEEN effective_date and invalidation_date
+        and member_nature is not null
+        order by tmp.year desc) t1
+        group by t1.company_id) t2
         ${ew.customSqlSegment}
+
     </select>
 
     <select id="queryPageListCompany" resultMap="TbMemberProjectSubitemResultMap">
@@ -159,4 +160,13 @@
               and member_nature is not null
             GROUP BY company_id) AS t2 ON t2.id = t1.id
     </select>
+
+    <select id="getAllYearInfoByCompanyId" resultMap="TbMemberProjectSubitemResultMap">
+        select tmps.*,tmp.year
+        from tb_member_project_subitem tmps
+        LEFT JOIN tb_member_project tmp on tmp.id = tmps.project_id
+        <where>
+            tmps.company_id = #{companyId}
+        </where>
+    </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 4a33515e..005317f0 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
@@ -566,6 +566,24 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 		return projectSubitem;
 	}
 
+	/**
+	 * 获得最新的年份的数据，没有的话会返回null
+	 * @param companyId
+	 * @return
+	 */
+	public TbMemberProjectSubitem getLatestYearInfo(String companyId){
+		//获得所有生效数据
+		List<TbMemberProjectSubitem> allByCompanyId = tbMemberProjectSubitemMapper.getAllYearInfoByCompanyId(companyId);
+		//获取list中年份最大的数据
+		Optional<TbMemberProjectSubitem> max = allByCompanyId.stream().max(Comparator.comparing(TbMemberProjectSubitem::getYear));
+		//没有的话会返回null
+		TbMemberProjectSubitem projectSubitem = max.orElse(null);
+		if(projectSubitem!=null){
+			processData(projectSubitem);
+		}
+		return projectSubitem;
+	}
+
 	public void editMemberBenefits(EditMemberBenefitsVO editMemberBenefitsVO) {
 		String id = editMemberBenefitsVO.getId();
 		Date effectiveDate = editMemberBenefitsVO.getEffectiveDate();
@@ -574,9 +592,9 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 		TbMemberProjectSubitem memberProjectSubitem = getById(id);
 		String companyId = memberProjectSubitem.getCompanyId();
 		//获得有效数据
-		TbMemberProjectSubitem takeEffectInfo = getTakeEffectInfo(companyId);
-		if (takeEffectInfo == null || !Objects.equals(takeEffectInfo.getId(),id)){
-			throw new JeroBootException("只能修改最新生效会员数据");
+		TbMemberProjectSubitem latestYearInfo = getLatestYearInfo(companyId);
+		if (latestYearInfo == null || !Objects.equals(latestYearInfo.getId(),id)){
+			throw new JeroBootException("只能修改最新年份会员数据");
 		}
 		LambdaUpdateWrapper<TbMemberProjectSubitem> updateWrapper = new LambdaUpdateWrapper<>();
 		updateWrapper.eq(TbMemberProjectSubitem::getId,id)