diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/PayMailBillVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/PayMailBillVO.java new file mode 100644 index 00000000..a6ac3c9a --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/PayMailBillVO.java @@ -0,0 +1,27 @@ +package com.jero.mail; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.jero.mail.entity.PayMailBill; +import com.jero.mail.entity.PayMailBillProject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.DecimalMax; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.math.BigDecimal; +import java.util.List; + + +@Data +public class PayMailBillVO extends PayMailBill { + /** + * 邮寄票据关联项目表 + */ + @TableField(exist = false) + List bmpList; + + + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java index 18904687..e94a1a1d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java @@ -6,6 +6,7 @@ import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonProperty; import com.jero.common.aspect.annotation.Dict; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; @@ -57,6 +58,7 @@ public class PayMailBill implements Serializable { @Excel(name = "票号", width = 15) @ApiModelProperty(value = "票号") @NotNull(message = "票号不能为空") + @JsonProperty(value = "billNo") private java.lang.String billNo; /**开票金额*/ @Excel(name = "开票金额", width = 15) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java index 2f6dc57d..04e424b5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.api.vo.Result; +import com.jero.mail.PayMailBillVO; import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillProject; import com.jero.mail.entity.PayMailBillSearch; @@ -34,7 +35,7 @@ public interface IPayMailBillService extends IService { * @param payMailBill * @return */ - Result addPayBill(PayMailBill payMailBill, List bmpList); + Result addPayBill(PayMailBillVO payMailBill); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index 3a89f40d..5874fbbd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -11,6 +11,7 @@ import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.oConvertUtils; import com.jero.contract.common.PayIncomeContractCommon; +import com.jero.mail.PayMailBillVO; import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillProject; import com.jero.mail.entity.PayMailBillSearch; @@ -99,8 +100,10 @@ public class PayMailBillServiceImpl extends ServiceImpl addPayBill(PayMailBill payMailBill, List bmpList) { - + public Result addPayBill(PayMailBillVO payMailBill) { + //票据关联项目表 + List bmpList = payMailBill.getBmpList(); + //校验不同项目是否属于同一个公司 String res = checkCompanyProject(bmpList); if (!"success".equals(res)) { @@ -166,7 +169,7 @@ public class PayMailBillServiceImpl extends ServiceImpl addPayBill(@RequestBody PayMailBill payMailBill,@RequestBody List bmpList) { - return payMailBillService.addPayBill(payMailBill, bmpList); + public Result addPayBill(@RequestBody(required = false) PayMailBillVO payMailBill) { + + return payMailBillService.addPayBill(payMailBill); } /**