From 88e8f9f61dac546fa84081a552c91ce945a2ae0c Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Thu, 23 Dec 2021 11:48:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=AC=BE=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/payment/entity/PayPaymentRecordSub.java  |  3 +++
 .../service/impl/PayPaymentCheckServiceImpl.java  |  9 +++++++--
 .../service/impl/PayPaymentRecordServiceImpl.java | 15 +++++++++++++++
 .../com/jero/project/entity/PayCommonProject.java |  5 +++++
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java
index 77bc0ff1..a7bb3406 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java
@@ -110,4 +110,7 @@ public class PayPaymentRecordSub implements Serializable {
 
     @ApiModelProperty(value = "审核说明")
     private String reviewInstructions;
+
+    @ApiModelProperty(value = "删除标记（1删除，0没删除）")
+    private Integer delFlag;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
index 9676b1a0..7e5e5773 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
@@ -106,10 +106,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
      */
     @Override
     public Map<String,Object> amountReceivedList(String id, String projectType){
-        //列表
         LambdaQueryWrapper<PayPaymentRecordSub> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(PayPaymentRecordSub::getProjectId, id);
         wrapper.eq(PayPaymentRecordSub::getLastSign, LastSignEnum.LAST.getCode());//只查每个阶段最新的那条
+        wrapper.eq(PayPaymentRecordSub::getDelFlag, PayProjectCommon.NO);
         wrapper.orderByAsc(PayPaymentRecordSub::getPaymentDate);
         List<PayPaymentRecordSub> list = payPaymentCheckService.list(wrapper);
         list.forEach(p-> {
@@ -253,6 +253,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
         BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
         payPaymentRecordSub.setId(null);
         payPaymentRecordSub.setLastSign(LastSignEnum.LAST.getCode());
+        payPaymentRecordSub.setDelFlag(PayProjectCommon.NO);
         payPaymentCheckMapper.insert(payPaymentRecordSub);
 
         //发消息
@@ -267,7 +268,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
         if(!PaymentStatusEnum.REJECTED.getCode().equals(payPaymentRecord.getPaymentStatus())){
             throw new JeroBootException("只有拒绝的才可删除");
         }
-        payPaymentRecordMapper.deleteById(payPaymentRecord.getId());
+        PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
+        payPaymentRecordSub.setId(payPaymentRecord.getId());
+        payPaymentRecordSub.setDelFlag(PayProjectCommon.YES);
+        payPaymentCheckMapper.updateById(payPaymentRecordSub);
     }
 
     /**
@@ -344,6 +348,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
 
         payPaymentRecordSub.setId(null);
         payPaymentRecordSub.setLastSign(LastSignEnum.LAST.getCode());
+        payPaymentRecordSub.setDelFlag(PayProjectCommon.NO);
         payPaymentCheckMapper.insert(payPaymentRecordSub);
 
         //将之前的那条置为OLD
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
index 5f78a084..24df2b78 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
@@ -9,6 +9,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.common.ProjectCommon;
 import com.jero.common.dto.SendMessageDTO;
 import com.jero.common.enums.CompanyMessageEnums;
+import com.jero.common.enums.LastSignEnum;
 import com.jero.common.enums.ManagementMessageEnums;
 import com.jero.common.enums.PaymentStatusEnum;
 import com.jero.common.exception.JeroBootException;
@@ -34,6 +35,7 @@ import com.jero.member.service.ITbMemberProjectService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.payment.entity.PayPaymentRecord;
+import com.jero.payment.entity.PayPaymentRecordSub;
 import com.jero.payment.mapper.PayPaymentRecordMapper;
 import com.jero.payment.service.IPayPaymentCheckService;
 import com.jero.payment.service.IPayPaymentRecordService;
@@ -134,6 +136,13 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
             payCommonProject.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payCommonProject.getChargeCompanyTemporaryName()));
         }
         List<PayCommonProject> list = payPaymentRecordMapper.mainList(page, payCommonProject,projectType, paymentDate,paidInvoicStatus);
+
+        //查审核记录表，每阶段最新的一条
+        LambdaQueryWrapper<PayPaymentRecordSub> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(PayPaymentRecordSub::getLastSign, LastSignEnum.LAST.getCode());
+        wrapper.eq(PayPaymentRecordSub::getDelFlag, PayProjectCommon.NO);
+        List<PayPaymentRecordSub> RecordSubList = payPaymentCheckService.list(wrapper);
+
         for (PayCommonProject commonProject : list) {
             //如果是会议类型，就查询会议的具体类型
             if (commonProject.getProjectType().equals(Integer.parseInt(ProjectCommon.PROJECT_TYPE3))) {
@@ -142,6 +151,12 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 commonProject.setMeetingType(payMeeting.getMeetingType());
                 commonProject.setSituationId(id);
             }
+            //插入审核状态，供前端判断是否显示审核按钮
+            for(PayPaymentRecordSub recordSub : RecordSubList){
+                if(commonProject.getId().equals(recordSub.getProjectId())){
+                    commonProject.setCheckPaymentStatus(recordSub.getPaymentStatus());
+                }
+            }
         }
         return list;
     }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
index 6783096e..0278de85 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
@@ -241,4 +241,9 @@ public class PayCommonProject implements Serializable {
      */
     @TableField(exist = false)
     private String situationId;
+    /**
+     * 审核状态
+     */
+    @TableField(exist = false)
+    private String checkPaymentStatus;
 }