LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug#40700

Browse Source
This commit is contained in:
梁琦涛
2021-10-14 18:09:27 +08:00
parent 120b964202
commit 6ac9dd5b68
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
+2 -1
View File
@@ -147,6 +147,7 @@ public class PayWorkingGroupSubItem implements Serializable {
@Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
@ApiModelProperty(value = "需要发票（1：增值税普通发票，2：增值税专用发票，0：否）")
@Dict(dicCode = "invoice_type")
@NotNull(message = "需要发票不能为空")
private java.lang.Integer needInvoice;
/**到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））*/
@ApiModelProperty(value = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））")
@@ -183,7 +184,7 @@ public class PayWorkingGroupSubItem implements Serializable {
@ApiModelProperty(value = "更新时间")
private java.util.Date updateTime;
/**开票金额*/
@Excel(name = "开票金额", width = 15)
// @Excel(name = "开票金额", width = 15)
@ApiModelProperty(value = "开票金额")
@DecimalMax(value = "9999999999.99",message = "开票金额格式错误")
@JsonFormat(shape = JsonFormat.Shape.STRING)
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+2
View File
@@ -479,8 +479,10 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
} else {
if (Objects.equals(payWorkingGroup.getChargeNoticeNoA(), p.getChargeNoticeNo())) {
p.setChargeNoticeId(payWorkingGroup.getChargeNoticeAId());
p.setCharge(payWorkingGroup.getChargeA());
} else if (Objects.equals(payWorkingGroup.getChargeNoticeNoB(), p.getChargeNoticeNo())) {
p.setChargeNoticeId(payWorkingGroup.getChargeNoticeBId());
p.setCharge(payWorkingGroup.getChargeB());
} else {
msg.append("第").append(count + 3).append("行：收费通知号不存在，请修改。<br/>");
}