From cbbb96e2046a5a32f86098eeaa3d9d646e5e2bd1 Mon Sep 17 00:00:00 2001
From: zhangqinlin <983410zql>
Date: Fri, 17 Dec 2021 15:59:56 +0800
Subject: [PATCH] =?UTF-8?q?add:=E8=B5=84=E6=96=99=E7=BD=91=E5=85=83?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMemberProjectSubitemController.java  | 10 ++++++++++
 .../jero/member/entity/PayMemberProjectSubitem.java    | 10 ++++++++++
 .../mapper/xml/PayMemberProjectSubitemMapper.xml       |  3 ++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
index f80ad117..c111d4de 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
@@ -17,6 +17,7 @@ import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
+import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.ValidUtil;
 import com.jero.common.util.oConvertUtils;
 import com.jero.company.entity.PayContactsManagement;
@@ -118,6 +119,15 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
             LoginUser user = sysBaseAPI.getUserById(memberProjectSubitem.getDirectorName());
 
             memberProjectSubitem.setDirectorName(user.getRealname());
+            memberProjectSubitem.setEmail(PasswordUtil.decrypt(user.getEmail()));
+            memberProjectSubitem.setPhone(PasswordUtil.decrypt(user.getPhone()));
+            switch (memberProjectSubitem.getPaymentStatus()){
+                case "toBeUploaded":memberProjectSubitem.setPaymentStatus("待上传");
+                case "toBeReviewed":memberProjectSubitem.setPaymentStatus("待审核");
+                case "rejected":memberProjectSubitem.setPaymentStatus("已拒绝");
+                case "completed":memberProjectSubitem.setPaymentStatus("已完结");
+
+            }
         }
         return Result.OK(pageList);
     }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
index 9cea77c5..6e25f7d7 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
@@ -280,5 +280,15 @@ public class PayMemberProjectSubitem implements Serializable {
      */
     @TableField(exist = false)
     private String directorName;
+    /**
+     * 负责人名称
+     */
+    @TableField(exist = false)
+    private String phone;
+    /**
+     * 负责人名称
+     */
+    @TableField(exist = false)
+    private String email;
 
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml
index a175efac..926cbf70 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml
@@ -32,6 +32,7 @@
         <result column="project_name" property="projectName" />
         <result column="particular_year" property="particularYear"/>
         <result column="director_name" property="directorName" />
+        <result column="payment_status" property="paymentStatus" />
     </resultMap>
 
     <select id="queryPageListCompany" resultMap="MemberProjectSubitemResultMap">
@@ -44,4 +45,4 @@
         select pmps.* from pay_member_project_subitem pmps left join pay_member_project pmp on pmps.project_id = pmp.id
         ${ew.customSqlSegment}
     </select>
-</mapper>
\ No newline at end of file
+</mapper>