From a4562f714dc0169430c17d67a22a9c2e9d517477 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 21 Mar 2024 14:07:50 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=A0=87?=
 =?UTF-8?q?=E5=8D=8F=E4=BC=9A=E5=91=98=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/entity/TbMemberProjectSubitem.java    |  4 ++++
 .../mapper/xml/TbMemberProjectSubitemMapper.xml  |  2 +-
 .../service/ITbMemberProjectSubitemService.java  | 16 +++++++++++++---
 .../controller/PayCommonProjectController.java   | 14 ++++++++++++++
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
index 9abb3f6c..7ef18988 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
@@ -380,4 +380,8 @@ public class TbMemberProjectSubitem implements Serializable {
     @ApiModelProperty(value = "年份")
     @TableField(exist = false)
     private String year;
+
+    @ApiModelProperty(value = "权益状态")
+    @TableField(exist = false)
+    private String equityStatus;
 }
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 a475d7ee..456d7082 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
@@ -134,7 +134,7 @@
     </select>
 
     <select id="queryPageListCompany" resultMap="TbMemberProjectSubitemResultMap">
-        select tmps.*
+        select tmps.*,tmp.project_name as project_name
         from tb_member_project_subitem tmps
         LEFT JOIN tb_member_project tmp on tmp.id = tmps.project_id
         ${ew.customSqlSegment}
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 a64b0dba..ba8ccb25 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
@@ -468,9 +468,19 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 
 	}
 
-
+	public final static String TAKE_EFFECT = "生效";
+	public final static String INVALID = "失效";
 	public IPage<TbMemberProjectSubitem> queryPageListCompany(Page<TbMemberProjectSubitem> page, QueryWrapper<TbMemberProjectSubitem> queryWrapper) {
-
-		return baseMapper.queryPageListCompany(page, queryWrapper);
+		IPage<TbMemberProjectSubitem> iPage = baseMapper.queryPageListCompany(page, queryWrapper);
+		for (TbMemberProjectSubitem record : iPage.getRecords()) {
+			Date invalidationDate = record.getInvalidationDate();
+			//如果当前日期大于失效日期，返回失效
+			if (DateUtil.compare(DateUtil.date(),invalidationDate) > 0){
+				record.setEquityStatus(TAKE_EFFECT);
+			}else {
+				record.setEquityStatus(INVALID);
+			}
+		}
+		return iPage;
 	}
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
index 0647de4f..3f531058 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
@@ -31,6 +31,8 @@ import com.jero.mail.entity.PayMailBill;
 import com.jero.mail.entity.PayMailBillProject;
 import com.jero.mail.service.IPayMailBillProjectService;
 import com.jero.mail.service.IPayMailBillService;
+import com.jero.member.entity.TbMemberProjectFile;
+import com.jero.member.service.TbMemberProjectFileService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.pack.entity.PayPackCompany;
@@ -106,6 +108,8 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	private IPayWorkingGroupSubItemContactsService payWorkingGroupSubItemContactsService;
 	@Resource
 	private IPayDraftingGroupSubItemContactsService payDraftingGroupSubItemContactsService;
+	@Resource
+	private TbMemberProjectFileService tbMemberProjectFileService;
 	 /**
 	 * 分页列表查询
 	 *
@@ -528,6 +532,16 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 
 		 }
 
+		 // 标协会员项目
+		 if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE5)){
+			 LambdaQueryWrapper<TbMemberProjectFile> queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>();
+			 queryPayWorkingGroupDistributionRecord.eq(TbMemberProjectFile::getProjectId,id);
+			 List<TbMemberProjectFile> fileList = tbMemberProjectFileService.list(queryPayWorkingGroupDistributionRecord);
+			 String fileIds = fileList.stream().map(TbMemberProjectFile::getFileId).collect(Collectors.joining(","));
+			 payCommonProject.setFiles(fileIds);
+
+		 }
+
 		 String strProject = JSON.toJSONString(payCommonProject);
 		 payCompanyCommonProject = JSONObject.parseObject(strProject,PayCompanyCommonProject.class);
 		 if(Objects.isNull(payCompanyCommonProject.getPaidAmount())){