From 799d80e837250dc0c17dbe3eeb7978f657cb8cfc Mon Sep 17 00:00:00 2001
From: liangqitao <12345678>
Date: Thu, 30 Dec 2021 18:05:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/project/common/PayProjectCommon.java     | 7 +++++++
 .../project/service/impl/PayWorkingGroupServiceImpl.java   | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java
index 4fe4efcd..82010c5b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java
@@ -121,4 +121,11 @@ public class PayProjectCommon {
      * 文件下载次数上线
      */
     public final static Integer DOWNLOAD_COUNT = 5;
+    /**
+     *  toBeUploaded 待上传
+     * 	toBeReviewed 待审核
+     * 	rejected 已拒绝
+     * 	completed 已完结
+     */
+    public final static String PAYMENT_STATUS = "toBeUploaded";
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
index 3d3f577d..7904d01a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
@@ -315,6 +315,12 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
                 p.setCreateTime(null);
                 p.setUpdateBy(null);
                 p.setUpdateTime(null);
+                if(p.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
+                    p.setPaymentStatus(PayProjectCommon.PAYMENT_STATUS);
+                }else{
+                    p.setPaymentStatus(null);
+                }
+
                 p.setWorkingGroupId(payWorkingGroupOld.getId());
             });
             payWorkingGroupSubItemService.saveBatch(listPayWorkingGroupSubItem);