From ccbaa71fd390f3109fd0ae55b779d3cc0c69e8a5 Mon Sep 17 00:00:00 2001
From: zhangqinlin <983410zql>
Date: Fri, 17 Dec 2021 17:35:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=88=86?=
 =?UTF-8?q?=E6=A0=87=E5=A7=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/mapper/xml/ProjectDetailMapper.xml |  2 +-
 .../PayMemberProjectSubitemController.java    | 24 +++++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml
index 62f470fb..eb3ca342 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml
@@ -58,7 +58,7 @@
         </where>
         <!-- 标协会员证书项目-->
         UNION ALL
-        select tmps.id,tmember.project_name,tmps.charge_use,tmember.director_id,su.realname,tmps.liaison_man_id,tmps.liaison_man,tmps.company_name,tmps.amount_receivable,tmps.paid_amount,tmps.invoice_requirements,tmps.pack,tmps.in_account,tmps.make_invoice,tmps.mail,tmps.create_time,5,'','','','',tmps.company_id,tmps.payment_method,'','','',tmember.year,''
+        select tmps.id,tmember.project_name,tmps.charge_use,tmember.director_id,su.realname,tmps.liaison_man_id,tmps.liaison_man,tmps.company_name,tmps.amount_receivable,tmps.paid_amount,tmps.invoice_requirements,tmps.pack,tmps.in_account,tmps.make_invoice,tmps.mail,tmps.create_time,5,tmps.mobile,tmps.email,'','',tmps.company_id,tmps.payment_method,'','','',tmember.year,''
         from tb_member_project tmember
         left join sys_user su on tmember.director_id = su.id
         inner join tb_certificate_payment tmps on tmember.id=tmps.project_id
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 c111d4de..9e19ef2c 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
@@ -117,16 +117,26 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
         for (PayMemberProjectSubitem memberProjectSubitem : pageList.getRecords()) {
             //DirectorName存的是id
             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("已完结");
-
+            if(StringUtils.isNotBlank(memberProjectSubitem.getPaymentStatus())) {
+                switch (memberProjectSubitem.getPaymentStatus()) {
+                    case "toBeUploaded":
+                        memberProjectSubitem.setPaymentStatus("待上传");
+                        break;
+                    case "toBeReviewed":
+                        memberProjectSubitem.setPaymentStatus("待审核");
+                        break;
+                    case "rejected":
+                        memberProjectSubitem.setPaymentStatus("已拒绝");
+                        break;
+                    case "completed":
+                        memberProjectSubitem.setPaymentStatus("已完结");
+                        break;
+                    default:
+                        memberProjectSubitem.setPaymentStatus("");
+                }
             }
         }
         return Result.OK(pageList);