diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/credit/CreditInvoice.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/credit/CreditInvoice.java index a4ad2c285..32ea77c28 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/credit/CreditInvoice.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/credit/CreditInvoice.java @@ -15,6 +15,7 @@ import java.util.List; public class CreditInvoice extends AbstractInvoice { private final BigDecimal balance; + @Getter private final Credit credit; @Getter private final String currency; @@ -46,14 +47,16 @@ public class CreditInvoice extends AbstractInvoice> tableData() { List> rows = new ArrayList<>(); Row row = new Row<>( - credit.getDescription().isEmpty() ? "Credit" : credit.getDescription(), + credit.getDescription() == null || credit.getDescription().isEmpty() ? "Credit" : credit.getDescription(), null, null, null, diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/Credit.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/Credit.java index b534abe2b..7d714b661 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/Credit.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/Credit.java @@ -77,7 +77,10 @@ public class Credit implements Serializable { @Excel(name = "status", width = 15) @ApiModelProperty(value = "status") private java.lang.Integer status; - + /**show balance 0: false, 1 : true*/ + @Excel(name= "show_balance", width = 15) + @ApiModelProperty(value = "show balance") + private java.lang.Integer showBalance; /**proof*/ @Excel(name = "proof", width = 15) private transient java.lang.String paymentProofString; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/CreditMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/CreditMapper.xml index b3f5d497b..555bd5070 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/CreditMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/CreditMapper.xml @@ -26,7 +26,8 @@ SET c.update_time = NOW(), c.update_by = #{username}, c.description =#{credit.description}, - c.payment_proof = #{credit.paymentProofString} + c.payment_proof = #{credit.paymentProofString}, + c.show_balance = #{credit.showBalance} WHERE c.id = #{id};