From 53de5fbae679c89c02e52e89f984ffccba1fbdaf Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 18 Mar 2024 14:09:38 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=A0=87=E5=8D=8F=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=A1=A8-=E8=8E=B7=E5=8F=96=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E5=B9=B4=E4=BB=BD=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TbMemberProjectController.java | 22 +++++++++++++++++++
 .../jero/member/entity/TbMemberProject.java   |  9 ++++++++
 2 files changed, 31 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectController.java
index 7d04caac..cf9ee63b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectController.java
@@ -5,8 +5,14 @@ import java.util.List;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.DictPoint;
+import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.system.vo.LoginUser;
+import com.jero.common.util.PasswordUtil;
 import com.jero.member.entity.TbMemberProject;
 import com.jero.member.entity.TbMemberProject;
 import com.jero.member.entity.TbMemberProjectFile;
@@ -38,6 +44,8 @@ import com.jero.common.aspect.annotation.AutoLog;
 public class TbMemberProjectController extends JeroController<TbMemberProject, ITbMemberProjectService> {
 	@Resource
 	private ITbMemberProjectService tbMemberProjectService;
+	@Resource
+	private ISysBaseAPI sysBaseAPI;
 	
 	/**
 	 * 分页列表查询
@@ -111,6 +119,20 @@ public class TbMemberProjectController extends JeroController<TbMemberProject, I
 		 return Result.OK(memberProject);
 	 }
 
+	 @DictPoint
+	 @ApiOperation(value = "标协会员项目表-获取最新年份数据")
+	 @GetMapping(value = "/getLastOne")
+	 public Result<TbMemberProject> getLastOne() {
+		 LambdaQueryWrapper<TbMemberProject> wrapper = new LambdaQueryWrapper<>();
+		 wrapper.orderByDesc(TbMemberProject::getYear);
+		 wrapper.last("limit 1");
+		 TbMemberProject memberProject = this.tbMemberProjectService.getOne(wrapper);
+		 LoginUser user = sysBaseAPI.getUserById(memberProject.getDirectorId());
+		 memberProject.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
+		 memberProject.setDirectorEmail(PasswordUtil.decrypt(user.getEmail()));
+		 return Result.OK(memberProject);
+	 }
+
 	 /**
 	  * 导出excel
 	  */
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProject.java
index 240075dd..be72eeda 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProject.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProject.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -78,6 +79,14 @@ public class TbMemberProject implements Serializable {
     @ApiModelProperty(value = "负责人")
     private String directorName;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "负责人电话")
+    private String directorPhone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "负责人邮箱")
+    private String directorEmail;
+
     /**
      * 收费标准
      */