fix 参会人-发票项目 没有回显

This commit is contained in:
lijiarao
2023-07-21 10:10:53 +08:00
parent ac298f4b4f
commit 42d47056b9
2 changed files with 40 additions and 1 deletions
@@ -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)) {
@@ -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;
}