From 42d47056b99ce4af5949042c2d977b18a76e547f Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 21 Jul 2023 10:09:55 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=8F=82=E4=BC=9A=E4=BA=BA-=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E9=A1=B9=E7=9B=AE=20=E6=B2=A1=E6=9C=89=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java  |  4 +-
 .../meeting/vo/PayMeetingSituationVO.java     | 37 +++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

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 e30fa00a..71f8d43a 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
@@ -1181,7 +1181,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             if (ProjectCommon.NEED_INVOICE1.equals(needInvoice)
                     ||ProjectCommon.NEED_INVOICE2.equals(needInvoice)) {
                 ValidUtil.validate(commonPeopleVO, NotPack.class);
-            //    校验发票信息
+                Integer invoiceProject = commonPeopleVO.getInvoiceProject();
+                payMeetingSituation1.setInvoiceProject(invoiceProject);
+                //    校验发票信息
                 UpdateInvoicePram updateInvoicePram = new UpdateInvoicePram();
                 BeanUtils.copyProperties(payMeetingSituation, updateInvoicePram);
                 if (Objects.equals(needInvoice, ProjectCommon.NEED_INVOICE1)) {
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingSituationVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingSituationVO.java
index 9f434e19..87bc7fa3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingSituationVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingSituationVO.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.common.aspect.annotation.Dict;
+import com.jero.company.vo.UpdateInvoicePram;
 import com.jero.meeting.valid.group.CommonPeople;
 import com.jero.meeting.valid.group.Guest;
 import io.swagger.annotations.ApiModelProperty;
@@ -308,4 +309,40 @@ public class PayMeetingSituationVO {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal noTaxAmount;
 
+    /**信用代码*/
+    @ApiModelProperty(value = "信用代码")
+    @NotEmpty(message = "信用代码不能为空",groups = {UpdateInvoicePram.needInvoice_1.class, UpdateInvoicePram.needInvoice_2.class})
+    @Size(max = 18, message = "信用代码长度不能大于18个字符",groups = {UpdateInvoicePram.needInvoice_1.class,UpdateInvoicePram.needInvoice_2.class})
+    @Pattern(regexp = "^([0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\\d{14})$",message = "信用代码格式错误",groups = {UpdateInvoicePram.needInvoice_1.class,UpdateInvoicePram.needInvoice_2.class})
+    private String dutyCode;
+    /**公司地址*/
+    @ApiModelProperty(value = "公司地址")
+    @NotEmpty(message = "公司地址不能为空",groups = UpdateInvoicePram.needInvoice_2.class)
+    @Size(max = 50, message = "公司地址长度不能大于50个字符",groups = UpdateInvoicePram.needInvoice_2.class)
+    private String companyAddress;
+    /**公司电话*/
+    @ApiModelProperty(value = "公司电话")
+    @Size(max = 15, message = "公司电话长度不能大于15个字符",groups = UpdateInvoicePram.needInvoice_2.class)
+    @Pattern(regexp = "^([0-9-]+)$",message = "公司电话格式错误",groups = UpdateInvoicePram.needInvoice_2.class)
+    private String companyPhone;
+    /**开户行*/
+    @ApiModelProperty(value = "开户行")
+    @NotEmpty(message = "开户行不能为空",groups = UpdateInvoicePram.needInvoice_2.class)
+    @Size(max = 50, message = "开户行长度不能大于50个字符",groups = UpdateInvoicePram.needInvoice_2.class)
+    private String openingBank;
+    /**银行账号*/
+    @ApiModelProperty(value = "银行账号")
+    @NotEmpty(message = "银行账号不能为空",groups = UpdateInvoicePram.needInvoice_2.class)
+    @Size(max = 50, message = "银行账号长度不能大于50个字符",groups = UpdateInvoicePram.needInvoice_2.class)
+    private String bankAccount;
+    /**联行号*/
+    @ApiModelProperty(value = "联行号")
+    @NotEmpty(message = "联行号不能为空",groups = UpdateInvoicePram.needInvoice_2.class)
+    private String linkBankNumber;
+
+    /**发票项目*/
+    @Dict(dicCode = "invoice_project")
+    @ApiModelProperty(value = "发票项目")
+    private Integer invoiceProject;
+
 }