From 4a5fc5c9d82529114d4096d79da3093fb7c006ec Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 8 Sep 2021 20:10:11 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=9A=E8=AE=AE=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8F=82=E4=BC=9A=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/common/MeetingSubitemCommon.java  |  4 ++--
 .../impl/PayMeetingSituationServiceImpl.java  |  9 +++++----
 .../com/jero/meeting/vo/CommonPeopleVO.java   |  1 +
 .../com/jero/meeting/vo/MeetingEntity.java    | 19 +++++++++++++++++--
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java
index 58f0c374..d906c79b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java
@@ -12,9 +12,9 @@ public class MeetingSubitemCommon {
     /**
      * 参会人
      */
-    public final static String CAN_HUI_REN = "1";
+    public final static String CAN_HUI_REN = "2";
     /**
      * 内部企业
      */
-    public final static String NEI_BU_QI_YE = "1";
+    public final static String NEI_BU_QI_YE = "3";
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index db51cbba..0a158ac8 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -51,8 +51,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 		//校验企业
 		String companyId = meetingEntity.getCompanyId();
 		PayCompanyManagementTemporary companyManagementTemporary = companyManagementTemporaryService.insertCompanyManagementTemporary(companyId);
-		meetingEntity.setCompanyTemporaryId(companyManagementTemporary.getId());
-		meetingEntity.setCompanyName(companyManagementTemporary.getCompanyName());
+		payMeetingSituation.setCompanyTemporaryId(companyManagementTemporary.getId());
+		payMeetingSituation.setCompanyName(companyManagementTemporary.getCompanyName());
 
 		//校验企业联系人
 		String companyContactId = meetingEntity.getCompanyContactId();
@@ -61,8 +61,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 		String companyId1 = contactsManagement.getCompanyId();
 		if (companyId1.equals(companyId)){
 			PayContactsManagementTemporary contactsManagementTemporary = contactsManagementTemporaryService.insertContactsManagementTemporary(companyContactId);
-			meetingEntity.setCompanyContactTemporaryId(contactsManagementTemporary.getId());
-			meetingEntity.setCompanyContactName(contactsManagementTemporary.getName());
+			payMeetingSituation.setCompanyContactTemporaryId(contactsManagementTemporary.getId());
+			payMeetingSituation.setCompanyContactName(contactsManagementTemporary.getName());
 		}else {
 			throw new JeroBootException("企业联系人不是所选企业的企业联系人");
 		}
@@ -84,6 +84,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 			}else {
 				throw new JeroBootException("邮寄联系人不是所选企业的企业联系人");
 			}
+
 			BeanUtils.copyProperties(commonPeopleVO,payMeetingSituation1);
 		}
 		//到账
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/CommonPeopleVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/CommonPeopleVO.java
index 4fd06376..b08aec74 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/CommonPeopleVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/CommonPeopleVO.java
@@ -8,6 +8,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.*;
+import java.math.BigDecimal;
 
 /**
  * @author liJiaRao
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingEntity.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingEntity.java
index 447c2836..c2a6b270 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingEntity.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingEntity.java
@@ -7,9 +7,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import javax.validation.constraints.*;
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @author liJiaRao
@@ -79,6 +79,21 @@ public class MeetingEntity implements Serializable {
     /**身份*/
     @ApiModelProperty(value = "身份")
     @Dict(dicCode = "meet_identify_type")
+    @NotNull(message = "身份不能为空")
+    @Min(1)
+    @Max(3)
     private Integer identity;
 
+    /**
+     * 应收金额
+     */
+    @ApiModelProperty(value = "应收金额")
+    private BigDecimal amountReceivable;
+
+    /**
+     * 实收金额
+     */
+    @ApiModelProperty(value = "实收金额")
+    private BigDecimal paidAmount;
+
 }