From 473f6b0acd923fc807c0680b4a0bd0a46e1933b7 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 28 Dec 2023 17:37:07 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B5=84=E6=96=99=E7=BD=91=E5=91=98?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=90=8E=E6=9B=B4=E6=96=B0=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xml/PayMemberProjectSubitemMapper.xml     | 32 ++++++++++++++++++-
 ...PayPayMemberProjectSubitemServiceImpl.java | 23 +++++++------
 .../impl/PayCommonProjectServiceImpl.java     |  8 ++---
 3 files changed, 46 insertions(+), 17 deletions(-)

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 00d425ac..5a80d474 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
@@ -33,7 +33,24 @@
         <result column="particular_year" property="particularYear"/>
         <result column="director_name" property="directorName" />
         <result column="payment_status" property="paymentStatus" />
+        <result column="affirm_income" property="affirmIncome"/>
+        <result column="confirm_amount" property="confirmAmount"/>
+        <result column="confirm_no_tax_amount" property="confirmNoTaxAmount"/>
+        <result column="confirm_tax" property="confirmTax"/>
+        <result column="estimated_arrival_date" property="estimatedArrivalDate"/>
+        <result column="invoice_amount" property="invoiceAmount"/>
+        <result column="invoice_no_tax_amount" property="invoiceNoTaxAmount"/>
+        <result column="invoice_tax" property="invoiceTax"/>
+        <result column="no_tax_amount" property="noTaxAmount"/>
+        <result column="paid_no_tax_amount" property="paidNoTaxAmount"/>
+        <result column="paid_tax" property="paidTax"/>
+        <result column="post_company_id" property="postCompanyId"/>
+        <result column="tax" property="tax"/>
+        <result column="tax_rate" property="taxRate"/>
     </resultMap>
+    <sql id="a">
+
+    </sql>
 
     <select id="queryPageListCompany" resultMap="MemberProjectSubitemResultMap">
         select pmps.*,pmp.project_name,pmp.particular_year,pmp.director_id as director_name from pay_member_project_subitem pmps
@@ -42,8 +59,21 @@
     </select>
 
     <select id="getPage" resultMap="MemberProjectSubitemResultMap">
-        select pmps.* from pay_member_project_subitem pmps left join pay_member_project pmp on pmps.project_id = pmp.id
+        select pmps.id,pmps.create_by,pmps.create_time,pmps.update_by,pmps.update_time,pmps.project_id,pmps.company_id,pmps.company_temporary_id,
+        if(pmps.company_name = pcm.company_name, pmps.company_name, concat(pmps.company_name,'（更名为',pcm.company_name,'）')) as company_name,
+        pmps.company_contact_id,pmps.company_contact_temporary_id,pmps.company_contact_name,pmps.post_contact_id,
+        pmps.post_contact_temporary_id,
+        pmps.post_contact_name,pmps.amount_receivable,pmps.paid_amount,pmps.confirm_amount,pmps.payment_method,pmps.charge_notice_no,
+        pmps.charge_notice_file_id,pmps.contract_no,pmps.remark,pmps.pack,pmps.need_invoice,pmps.in_account,pmps.make_invoice,
+        pmps.mail,pmps.invoice_amount,pmps.payment_status,pmps.affirm_income,pmps.confirm_tax,pmps.confirm_no_tax_amount,pmps.paid_tax,pmps.paid_no_tax_amount,
+        pmps.invoice_tax,pmps.invoice_no_tax_amount,pmps.tax_rate,pmps.tax,pmps.no_tax_amount,pmps.post_company_id,
+        pmps.estimated_arrival_date
+        from pay_member_project_subitem pmps
+            left join pay_member_project pmp on pmps.project_id = pmp.id
+            left join pay_company_management_temporary pcmt on pmps.company_temporary_id = pcmt.id
+            left join pay_company_management pcm on pcmt.company_id = pcm.id
         ${ew.customSqlSegment}
+
         <where>
 
         </where>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java
index 53ba3f73..a9aae00b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java
@@ -328,25 +328,24 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
 		}
 
 		// 联系人id != 联系人模板id 变更
-		if(!Objects.equals(payMemberProjectSubitem.getCompanyContactId(),payMemberProjectSubitemOld.getCompanyContactId())){
 			// 联系人
-			PayContactsManagementTemporary contactsName = contactsManagementTemporaryService.insertContactsManagementTemporary(payMemberProjectSubitem.getCompanyContactId());
-			if(Objects.isNull(contactsName)){
-				throw new JeroBootException("联系人名称为空！");
-			}
-			payMemberProjectSubitem.setCompanyContactTemporaryId(contactsName.getId());
-			payMemberProjectSubitem.setCompanyContactName(contactsName.getName());
-			contactsManagementTemporaryService.removeById(payMemberProjectSubitemOld.getCompanyContactTemporaryId());
+		PayContactsManagementTemporary companyContact = contactsManagementTemporaryService.insertContactsManagementTemporary(payMemberProjectSubitem.getCompanyContactId());
+		if(Objects.isNull(companyContact)){
+			throw new JeroBootException("联系人名称为空！");
 		}
+		payMemberProjectSubitem.setCompanyContactTemporaryId(companyContact.getId());
+		payMemberProjectSubitem.setCompanyContactName(companyContact.getName());
+		contactsManagementTemporaryService.removeById(payMemberProjectSubitemOld.getCompanyContactTemporaryId());
+
 		// 邮寄联系人id != 邮寄联系人模板id 变更
 		if(!Objects.equals(payMemberProjectSubitem.getPostContactId(),payMemberProjectSubitemOld.getPostContactId())){
 			// 联系人
-			PayContactsManagementTemporary contactsName = contactsManagementTemporaryService.insertContactsManagementTemporary(payMemberProjectSubitem.getPostContactId());
-			if(Objects.isNull(contactsName)){
+			PayContactsManagementTemporary postContact = contactsManagementTemporaryService.insertContactsManagementTemporary(payMemberProjectSubitem.getPostContactId());
+			if(Objects.isNull(postContact)){
 				throw new JeroBootException("邮寄联系人为空！");
 			}
-			payMemberProjectSubitem.setPostContactTemporaryId(contactsName.getId());
-			payMemberProjectSubitem.setPostContactName(contactsName.getName());
+			payMemberProjectSubitem.setPostContactTemporaryId(postContact.getId());
+			payMemberProjectSubitem.setPostContactName(postContact.getName());
 			contactsManagementTemporaryService.removeById(payMemberProjectSubitemOld.getPostContactTemporaryId());
 		}
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
index cca6d028..029ceac7 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
@@ -93,7 +93,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
     }
 
     @Override
-    @Transactional()
+    @Transactional(rollbackFor = Exception.class)
     public void addPayCommonProject(PayCommonProject payCommonProject) {
         try {
             // 编辑保存前再次校验来款项目是否存在
@@ -163,7 +163,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void editPayCommonProject(PayCommonProject payCommonProject) {
         PayCommonProject payCommonProjectOld = payCommonProjectService.getById(payCommonProject);
         if(Objects.isNull(payCommonProjectOld)){
@@ -266,7 +266,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
 
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void delete(String id) {
         if(StringUtils.isBlank(id)){
             throw new JeroBootException("id不能为空!");
@@ -279,7 +279,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void deleteBatch(String ids) {
         if(StringUtils.isBlank(ids)){
             throw new JeroBootException("id不能为空!");