diff --git a/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java b/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java index 9e56458e6..0f553dc75 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java +++ b/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java @@ -585,6 +585,8 @@ public class BillingStatementApplicationService { 此方法只进行实体返回,并不进行数据保存 */ LoginUser loginUser = SecurityUtils.getLoginUser(); + + billingStatementDO.setAccountExpenseType(billingStatementDO.getAccountExpenseType()); if (ObjectUtil.isNull(loginUser)) { throw new DigitalLogisticsException(UserError.TIMEOUT); } diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/po/BillingStatementPO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/po/BillingStatementPO.java index 447b38446..6a5d308c7 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/po/BillingStatementPO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/po/BillingStatementPO.java @@ -100,6 +100,10 @@ public class BillingStatementPO extends BaseVOEntity{ @Excel(name = "收支类型", readConverterExp = "1=-应收,2-应付") private Integer accountExpenseType; + @ApiModelProperty("收支类型(1-应收,2-应付)") + @Excel(name = "收支类型", readConverterExp = "1=-应收,2-应付") + private Integer billType; + @ApiModelProperty("流水备注") @Excel(name = "流水备注") private String billingRemark; diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/todo/BillingStatementDO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/todo/BillingStatementDO.java index af1576753..23fc1d687 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/todo/BillingStatementDO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/todo/BillingStatementDO.java @@ -101,6 +101,10 @@ public class BillingStatementDO extends BaseVOEntity{ @Excel(name = "收支类型", readConverterExp = "1=-应收,2-应付") private Integer accountExpenseType; + @ApiModelProperty("收支类型(1-应收,2-应付)") + @Excel(name = "收支类型", readConverterExp = "1=-应收,2-应付") + private Integer billType; + @ApiModelProperty("流水备注") @Excel(name = "流水备注") private String billingRemark; diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billingStatement/BillingStatementDTO.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billingStatement/BillingStatementDTO.java index 48e195c69..855e5040b 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billingStatement/BillingStatementDTO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billingStatement/BillingStatementDTO.java @@ -102,6 +102,10 @@ public class BillingStatementDTO extends BaseVOEntity{ @Excel(name = "收支类型", readConverterExp = "1=-应收,2-应付") private Integer accountExpenseType; + @ApiModelProperty("收支类型(1-应收,2-应付)") + @Excel(name = "收支类型", readConverterExp = "1=-应收,2-应付") + private Integer billType; + @ApiModelProperty("流水备注") @Excel(name = "流水备注") private String billingRemark;