From 60ebf34944b9c1b024058cb7f39fda4e40613b28 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 28 Mar 2024 16:05:33 +0800
Subject: [PATCH] =?UTF-8?q?fix=2081955=20=E7=AE=A1=E7=90=86=E7=AB=AF?=
 =?UTF-8?q?=E5=88=B0=E8=B4=A6=E5=BC=80=E7=A5=A8=E4=B8=AD=20=E6=92=A4?=
 =?UTF-8?q?=E9=94=80=E6=9D=A5=E6=AC=BE=E4=BF=A1=E6=81=AF=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF-=E5=88=B0=E8=B4=A6=E5=BC=80?=
 =?UTF-8?q?=E7=A5=A8=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=95=B0=E6=8D=AE=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/mapper/PayPaymentCheckMapper.java |  3 ++
 .../mapper/xml/PayPaymentCheckMapper.xml      | 49 +++++++++++++++++++
 .../impl/PayPaymentCheckServiceImpl.java      |  1 +
 .../impl/PayPaymentRecordServiceImpl.java     |  2 +
 4 files changed, 55 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentCheckMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentCheckMapper.java
index 2f2cb1de..7defc6d5 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentCheckMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentCheckMapper.java
@@ -1,4 +1,5 @@
 package com.jero.payment.mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jero.payment.entity.PayPaymentRecordSub;
@@ -7,5 +8,7 @@ import com.jero.payment.entity.PayPaymentRecordSub;
  * 到账审核
  */
 public interface PayPaymentCheckMapper extends BaseMapper<PayPaymentRecordSub> {
+    int deleteByRecordId(@Param("recordId")String recordId);
+
 
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentCheckMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentCheckMapper.xml
index a152efa2..13e4b443 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentCheckMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentCheckMapper.xml
@@ -1,5 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jero.payment.mapper.PayPaymentCheckMapper">
+    <sql id="Base_Column_List">
+        id,
+        project_id,
+        last_sign,
+        project_type,
+        amount_received,
+        payment_date,
+        proof,
+        remark,
+        create_by,
+        create_time,
+        update_by,
+        update_time,
+        applicant_name,
+        payment_status,
+        reviewer_id,
+        reviewer_name,
+        review_time,
+        review_instructions,
+        del_flag,
+        record_id
+    </sql>
+    <resultMap id="BaseResultMap" type="com.jero.payment.entity.PayPaymentRecordSub">
+        <result column="id" property="id"/>
+        <result column="project_id" property="projectId"/>
+        <result column="last_sign" property="lastSign"/>
+        <result column="project_type" property="projectType"/>
+        <result column="amount_received" property="amountReceived"/>
+        <result column="payment_date" property="paymentDate"/>
+        <result column="proof" property="proof"/>
+        <result column="remark" property="remark"/>
+        <result column="create_by" property="createBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="applicant_name" property="applicantName"/>
+        <result column="payment_status" property="paymentStatus"/>
+        <result column="reviewer_id" property="reviewerId"/>
+        <result column="reviewer_name" property="reviewerName"/>
+        <result column="review_time" property="reviewTime"/>
+        <result column="review_instructions" property="reviewInstructions"/>
+        <result column="del_flag" property="delFlag"/>
+        <result column="record_id" property="recordId"/>
+    </resultMap>
 
+<!--auto generated by MybatisCodeHelper on 2024-03-28-->
+    <delete id="deleteByRecordId">
+        delete from pay_payment_record_sub
+        where record_id=#{recordId}
+    </delete>
 </mapper>
\ No newline at end of file
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 a89ff8b9..3050c0e3 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
@@ -746,6 +746,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
             sub.setReviewerName(payPaymentRecord.getReviewerName());
             sub.setReviewTime(payPaymentRecord.getReviewTime());
             sub.setReviewInstructions(payPaymentRecord.getReviewInstructions());
+            sub.setRecordId(payPaymentRecord.getId());
             payPaymentCheckMapper.updateById(sub);
         }
 
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 a5fc4038..9cc0107b 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
@@ -1446,6 +1446,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
             default:break;
         }
         this.removeById(id);
+    //    删除审核表
+        payPaymentCheckMapper.deleteByRecordId(id);
     }
 
     @Override