From 449cf813da3c29579113810c91d4ae099b7e1363 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 9 Sep 2021 16:55:40 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=9A=E8=AE=AE=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/meeting/entity/PayMeeting.java   |  2 ++
 .../jero/meeting/entity/PayMeetingSituation.java   | 12 ++++++++++++
 .../impl/PayMeetingSituationServiceImpl.java       |  5 +++++
 .../java/com/jero/meeting/vo/PayMeetingVO.java     | 14 ++++++--------
 .../jero/meeting/vo/WorkingGroupMeetingExel.java   | 14 ++------------
 .../member/entity/PayMemberProjectSubitem.java     |  2 +-
 .../com/jero/project/common/PayProjectCommon.java  |  9 ++++++++-
 7 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
index a3747c22..ced68267 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
@@ -176,11 +176,13 @@ public class PayMeeting implements Serializable {
 	/**会议费用*/
 	@Excel(name = "会议费用", width = 15)
     @ApiModelProperty(value = "会议费用")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal meetingCosts;
 
 	/**会议费用（标协会员）*/
 	@Excel(name = "会议费用（标协会员）", width = 15)
     @ApiModelProperty(value = "会议费用（标协会员）")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal meetingCostsVip;
 
 	/**会议负责人id*/
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
index c9ee0eb4..86e5767c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
@@ -3,6 +3,7 @@ package com.jero.meeting.entity;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jero.meeting.valid.group.CommonPeople;
@@ -302,12 +303,14 @@ public class PayMeetingSituation implements Serializable {
      * 应收金额
      */
     @ApiModelProperty(value = "应收金额")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal amountReceivable;
 
     /**
      * 实收金额
      */
     @ApiModelProperty(value = "实收金额")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal paidAmount;
 
 	/**打包*/
@@ -344,5 +347,14 @@ public class PayMeetingSituation implements Serializable {
     @ApiModelProperty(value = "对接人姓名")
     private String dockName;
 
+    /**审核状态*/
+    @Excel(name = "审核状态", width = 15)
+    @ApiModelProperty(value = "审核状态")
+    @Dict(dicCode = "signup_status")
+    private Integer checkResult;
 
+    /**审核状态*/
+    @ApiModelProperty(value = "审核备注")
+    @TableField(exist = false)
+    private String checkRemark;
 }
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 17a67f01..5b837b8c 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
@@ -60,6 +60,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 		Integer meetingType = payMeeting.getMeetingType();
 		//要保存的对象
 		PayMeetingSituation payMeetingSituation1 = new PayMeetingSituation();
+		payMeetingSituation1.setAmountReceivable(new BigDecimal("0"));
 		//会议校验基础类
 		MeetingEntity meetingEntity = new MeetingEntity();
 		BeanUtils.copyProperties(payMeetingSituation, meetingEntity);
@@ -179,6 +180,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 			ValidUtil.validate(commonGuestVO);
 			BeanUtils.copyProperties(commonGuestVO, payMeetingSituation1);
 		}
+
+		payMeetingSituation1.setStatus(PayProjectCommon.NO);
+		payMeetingSituation1.setCheckIn(PayProjectCommon.NO);
+		payMeetingSituation1.setCheckResult(PayProjectCommon.NO);
 		//到账
 		payMeetingSituation1.setInAccount(PayProjectCommon.IN_ACCOUNT0);
 		//开票
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
index 5e78dd4b..d785bd0f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
@@ -14,11 +14,9 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.ExcelCollection;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import javax.validation.constraints.*;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -176,15 +174,15 @@ public class PayMeetingVO implements Serializable {
 	@Excel(name = "会议费用", width = 15)
     @ApiModelProperty(value = "会议费用")
     @NotNull(message = "会议费用不能为空")
-    @Max(value = 999999999,message = "会议费用格式错误")
-    private Integer meetingCosts;
+    @DecimalMax(value = "10000000000",message = "会议费用格式错误")
+    private BigDecimal meetingCosts;
 
 	/**会议费用（标协会员）*/
 	@Excel(name = "会议费用（标协会员）", width = 15)
     @ApiModelProperty(value = "会议费用（标协会员）")
     @NotNull(message = "会议费用（标协会员）不能为空",groups = StandardMeeting.class)
-    @Max(value = 999999999,message = "会议费用（标协会员）格式错误",groups = StandardMeeting.class)
-    private Integer meetingCostsVip;
+    @DecimalMax(value = "10000000000",message = "会议费用（标协会员）格式错误",groups = StandardMeeting.class)
+    private BigDecimal meetingCostsVip;
 
 	/**会议负责人id*/
     @ApiModelProperty(value = "会议负责人id")
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/WorkingGroupMeetingExel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/WorkingGroupMeetingExel.java
index 3b072a96..844270ba 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/WorkingGroupMeetingExel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/WorkingGroupMeetingExel.java
@@ -1,22 +1,12 @@
 package com.jero.meeting.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jero.meeting.entity.PayMeetingHotelContacts;
-import com.jero.meeting.valid.group.InternationalMeeting;
-import com.jero.meeting.valid.group.StandardMeeting;
-import com.jero.meeting.valid.group.WorkingGroupMeeting;
-import com.jero.modules.system.volid.group.UpdateGroup;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecgframework.poi.excel.annotation.ExcelCollection;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import java.util.List;
+import javax.validation.constraints.*;
 
 /**
  * @author liJiaRao
@@ -114,7 +104,7 @@ public class WorkingGroupMeetingExel {
     @Excel(name = "会议费用", width = 15)
     @ApiModelProperty(value = "会议费用")
     @NotNull(message = "会议费用不能为空")
-    @Max(value = 999999999,message = "会议费用格式错误")
+    @DecimalMax(value = "10000000000",message = "会议费用格式错误")
     private Integer meetingCosts;
 
     /**会议负责人id*/
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 46bba068..36936960 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
@@ -149,7 +149,7 @@ public class PayMemberProjectSubitem implements Serializable {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     @ApiModelProperty(value = "应收金额")
     @NotNull(message = "应收金额不能为空")
-    @DecimalMax(value = "10000000000",message = "应收金额格式错误1")
+    @DecimalMax(value = "10000000000",message = "应收金额格式错误")
     private BigDecimal amountReceivable;
 
     /**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java
index 8549cb30..e3b112ef 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java
@@ -83,5 +83,12 @@ public class PayProjectCommon {
      * 来款用途 ：1工作组是标准制定工作组经费
      */
     public final static Integer CHARGE_USE1 = 1;
-
+    /**
+     * 否
+     */
+    public static final Integer NO = 0;
+    /**
+     * 是
+     */
+    public static final Integer YES = 1;
 }