From ea07de1c3f09d1a78f083cb3b40989cb60450c40 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 1 Sep 2021 17:23:15 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=9A=E5=91=98=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E8=BF=94=E5=9B=9E=E5=80=BC=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=B4=E6=97=B6id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/PayMemberProjectSubitem.java       | 22 ++++++--
 .../xml/PayMemberProjectSubitemMapper.xml     |  3 ++
 ...PayPayMemberProjectSubitemServiceImpl.java | 53 +++++++++----------
 3 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
index c87361b2..d3bde872 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
@@ -84,11 +84,17 @@ public class PayMemberProjectSubitem implements Serializable {
     /**
      * 企业id
      */
+    private String companyId;
+
+    /**
+     * 企业临时id
+     */
     @Excel(name = "会员单位", width = 15, dictTable = "pay_company_management_temporary", dicText = "company_name", dicCode = "id",orderNum = "1")
     @ApiModelProperty(value = "企业id")
     @NotBlank(message = "会员单位不能为空")
     @Size(max = 50, message = "会员单位最大为50字符")
-    private String companyId;
+    private String companyTemporaryId;
+
 
     /**
      * 企业名称
@@ -99,11 +105,16 @@ public class PayMemberProjectSubitem implements Serializable {
     /**
      * 企业联系人id
      */
+    private String companyContactId;
+
+    /**
+     * 企业联系人临时id
+     */
     @Excel(name = "企业联系人名称", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "2")
     @ApiModelProperty(value = "企业联系人id")
     @NotBlank(message = "企业联系人不能为空")
     @Size(max = 50, message = "企业联系人最大为50字符")
-    private String companyContactId;
+    private String companyContactTemporaryId;
 
     /**
      * 企业联系人名称
@@ -114,10 +125,15 @@ public class PayMemberProjectSubitem implements Serializable {
     /**
      * 邮寄联系人id
      */
+    private String postContactId;
+
+    /**
+     * 邮寄联系人临时id
+     */
     @Excel(name = "邮寄联系人姓名", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "3")
     @ApiModelProperty(value = "邮寄联系人id")
     @NotBlank(message = "邮寄联系人不能为空")
-    private String postContactId;
+    private String postContactTemporaryId;
 
     /**
      * 邮寄联系人姓名
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 88238ba4..5463e5d3 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
@@ -9,10 +9,13 @@
         <result column="update_time" property="updateTime" />
         <result column="project_id" property="projectId" />
         <result column="company_id" property="companyId" />
+        <result column="company_temporary_id" property="companyTemporaryId" />
         <result column="company_name" property="companyName" />
         <result column="company_contact_id" property="companyContactId" />
+        <result column="company_contact_temporary_id" property="companyContactTemporaryId" />
         <result column="company_contact_name" property="companyContactName" />
         <result column="post_contact_id" property="postContactId" />
+        <result column="post_contact_temporary_id" property="postContactTemporaryId" />
         <result column="post_contact_name" property="postContactName" />
         <result column="amount_receivable" property="amountReceivable" />
         <result column="paid_amount" property="paidAmount" />
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 9cbf7c98..3c7a83d9 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
@@ -86,18 +86,18 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
 		payMemberProjectSubitem.setMail(payMemberProjectSubitem1.getMail());
 
 		//如果原始企业id和现在企业id不同，就删除临时表数据
-		String companyId = payMemberProjectSubitem.getCompanyId();
-		if (!payMemberProjectSubitem1.getCompanyId().equals(companyId)) {
+		String companyId = payMemberProjectSubitem.getCompanyTemporaryId();
+		if (!payMemberProjectSubitem1.getCompanyTemporaryId().equals(companyId)) {
 			companyManagementTemporaryService.removeById(companyId);
 		}
 		//如果原始企业联系人id和现在企业联系人id不同，就删除临时表数据
-		String companyContactId = payMemberProjectSubitem.getCompanyContactId();
-		if (!payMemberProjectSubitem1.getCompanyContactId().equals(companyContactId)) {
+		String companyContactId = payMemberProjectSubitem.getCompanyContactTemporaryId();
+		if (!payMemberProjectSubitem1.getCompanyContactTemporaryId().equals(companyContactId)) {
 			contactsManagementTemporaryService.removeById(companyContactId);
 		}
 		//如果原始邮寄联系人id和现在邮寄联系人id不同，就删除临时表数据
-		String postContactId = payMemberProjectSubitem.getPostContactId();
-		if (!payMemberProjectSubitem1.getPostContactId().equals(postContactId)) {
+		String postContactId = payMemberProjectSubitem.getPostContactTemporaryId();
+		if (!payMemberProjectSubitem1.getPostContactTemporaryId().equals(postContactId)) {
 			contactsManagementTemporaryService.removeById(postContactId);
 		}
 		validMemberProjectSubitem(payMemberProjectSubitem);
@@ -113,7 +113,7 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
 		//校验企业
 		String companyId = payMemberProjectSubitem.getCompanyId();
 		PayCompanyManagementTemporary companyManagementTemporary = companyManagementTemporaryService.insertCompanyManagementTemporary(companyId);
-		payMemberProjectSubitem.setCompanyId(companyManagementTemporary.getId());
+		payMemberProjectSubitem.setCompanyTemporaryId(companyManagementTemporary.getId());
 		payMemberProjectSubitem.setCompanyName(companyManagementTemporary.getCompanyName());
 
 		//校验企业联系人
@@ -123,7 +123,7 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
 		String companyId1 = contactsManagement.getCompanyId();
 		if (companyId1.equals(companyId)){
 			PayContactsManagementTemporary contactsManagementTemporary = contactsManagementTemporaryService.insertContactsManagementTemporary(companyContactId);
-			payMemberProjectSubitem.setCompanyContactId(contactsManagementTemporary.getId());
+			payMemberProjectSubitem.setCompanyContactTemporaryId(contactsManagementTemporary.getId());
 			payMemberProjectSubitem.setCompanyContactName(contactsManagementTemporary.getName());
 		}else {
 			throw new JeroBootException("企业联系人不是所选企业的企业联系人");
@@ -135,7 +135,7 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
 		String companyId2 = postContact.getCompanyId();
 		if (companyId2.equals(companyId)){
 			PayContactsManagementTemporary contactsManagementTemporary1 = contactsManagementTemporaryService.insertContactsManagementTemporary(postContactId);
-			payMemberProjectSubitem.setPostContactId(contactsManagementTemporary1.getId());
+			payMemberProjectSubitem.setPostContactTemporaryId(contactsManagementTemporary1.getId());
 			payMemberProjectSubitem.setPostContactName(contactsManagementTemporary1.getName());
 		}else {
 			throw new JeroBootException("邮寄联系人不是所选企业的企业联系人");
@@ -157,35 +157,30 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
 	 */
 	@Override
     public void deleteById(String id) {
-		PayMemberProjectSubitem payMemberProjectSubitem = getById(id);
-		//删除临时表数据
-		String companyId = payMemberProjectSubitem.getCompanyId();
-		companyManagementTemporaryService.removeById(companyId);
-
-		String companyContactId = payMemberProjectSubitem.getCompanyContactId();
-		contactsManagementTemporaryService.removeById(companyContactId);
-
-		String postContactId = payMemberProjectSubitem.getPostContactId();
-		contactsManagementTemporaryService.removeById(postContactId);
+		delectTemporaryById(id);
 		removeById(id);
     }
 
+	private void delectTemporaryById(String id) {
+		PayMemberProjectSubitem payMemberProjectSubitem = getById(id);
+		//删除临时表数据
+		String companyId = payMemberProjectSubitem.getCompanyTemporaryId();
+		companyManagementTemporaryService.removeById(companyId);
+
+		String companyContactId = payMemberProjectSubitem.getCompanyContactTemporaryId();
+		contactsManagementTemporaryService.removeById(companyContactId);
+
+		String postContactId = payMemberProjectSubitem.getPostContactTemporaryId();
+		contactsManagementTemporaryService.removeById(postContactId);
+	}
+
 	/**
 	 * 批量删除
 	 */
 	@Override
     public void deleteByIds(List<String> ids) {
 		for (String id : ids) {
-			PayMemberProjectSubitem payMemberProjectSubitem = getById(id);
-			//删除临时表数据
-			String companyId = payMemberProjectSubitem.getCompanyId();
-			companyManagementTemporaryService.removeById(companyId);
-
-			String companyContactId = payMemberProjectSubitem.getCompanyContactId();
-			contactsManagementTemporaryService.removeById(companyContactId);
-
-			String postContactId = payMemberProjectSubitem.getPostContactId();
-			contactsManagementTemporaryService.removeById(postContactId);
+			delectTemporaryById(id);
 		}
         removeByIds(ids);
     }