diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryDto.java index 266a65d..adab40f 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryDto.java @@ -32,6 +32,9 @@ public class BudgetCategoryDto { @Schema(name = "amount", title = "预算金额") private BigDecimal amount; + @Schema(name = "useAmount", title = "已使用预算金额") + private BigDecimal useAmount; + @Schema(name = "startPeriod", title = "开始预算周期") @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd") private LocalDate startPeriod; diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/admin/BudgetCategoryAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/admin/BudgetCategoryAddDto.java index 2eb2fd8..44ccfae 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/admin/BudgetCategoryAddDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/admin/BudgetCategoryAddDto.java @@ -48,6 +48,11 @@ public class BudgetCategoryAddDto { @Min(value = 0, message = "不能低于0") private BigDecimal amount; + @Schema(name = "useAmount", title = "已使用预算金额") + @NotNull(message = "金额不能为空") + @Min(value = 0, message = "不能低于0") + private BigDecimal useAmount; + @Schema(name = "period", title = "预算周期") @NotNull(message = "预算周期不能为空") @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/admin/BudgetCategoryUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/admin/BudgetCategoryUpdateDto.java index 2e1273f..799f515 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/admin/BudgetCategoryUpdateDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/admin/BudgetCategoryUpdateDto.java @@ -52,6 +52,11 @@ public class BudgetCategoryUpdateDto { @Min(value = 0, message = "不能低于0") private BigDecimal amount; + @Schema(name = "useAmount", title = "已使用预算金额") + @NotNull(message = "金额不能为空") + @Min(value = 0, message = "不能低于0") + private BigDecimal useAmount; + @Schema(name = "period", title = "预算周期") @NotNull(message = "预算周期不能为空") @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/user/BudgetCategoryAddUserDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/user/BudgetCategoryAddUserDto.java index 5702cd9..ad935f2 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/user/BudgetCategoryAddUserDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/user/BudgetCategoryAddUserDto.java @@ -44,6 +44,11 @@ public class BudgetCategoryAddUserDto { @Min(value = 0, message = "不能低于0") private BigDecimal amount; + @Schema(name = "useAmount", title = "已使用预算金额") + @NotNull(message = "金额不能为空") + @Min(value = 0, message = "不能低于0") + private BigDecimal useAmount; + @Schema(name = "period", title = "预算周期") @NotNull(message = "预算周期不能为空") @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/user/BudgetCategoryUpdateUserDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/user/BudgetCategoryUpdateUserDto.java index d0a8aa8..6f9640b 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/user/BudgetCategoryUpdateUserDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/user/BudgetCategoryUpdateUserDto.java @@ -48,6 +48,11 @@ public class BudgetCategoryUpdateUserDto { @Min(value = 0, message = "不能低于0") private BigDecimal amount; + @Schema(name = "useAmount", title = "已使用预算金额") + @NotNull(message = "金额不能为空") + @Min(value = 0, message = "不能低于0") + private BigDecimal useAmount; + @Schema(name = "period", title = "预算周期") @NotNull(message = "预算周期不能为空") @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/dao/src/main/java/cn/bunny/dao/entity/financial/BudgetCategory.java b/dao/src/main/java/cn/bunny/dao/entity/financial/BudgetCategory.java index 7868ed3..6fcef93 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/financial/BudgetCategory.java +++ b/dao/src/main/java/cn/bunny/dao/entity/financial/BudgetCategory.java @@ -43,6 +43,9 @@ public class BudgetCategory extends BaseEntity { @Schema(name = "amount", title = "预算金额") private BigDecimal amount; + @Schema(name = "useAmount", title = "已使用预算金额") + private BigDecimal useAmount; + @Schema(name = "period", title = "预算周期") private LocalDateTime startPeriod; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/BudgetCategoryVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/BudgetCategoryVo.java index 35af24a..df540b0 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/BudgetCategoryVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/BudgetCategoryVo.java @@ -47,6 +47,9 @@ public class BudgetCategoryVo extends BaseUserVo { @Schema(name = "amount", title = "预算金额") private BigDecimal amount; + @Schema(name = "useAmount", title = "已使用预算金额") + private BigDecimal useAmount; + @Schema(name = "startPeriod", title = "预算周期") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonSerialize(using = LocalDateTimeSerializer.class) diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/user/BudgetCategoryUserVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/user/BudgetCategoryUserVo.java index c0762db..75635e6 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/user/BudgetCategoryUserVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/user/BudgetCategoryUserVo.java @@ -39,6 +39,9 @@ public class BudgetCategoryUserVo extends BaseVo { @Schema(name = "amount", title = "预算金额") private BigDecimal amount; + @Schema(name = "useAmount", title = "已使用预算金额") + private BigDecimal useAmount; + @Schema(name = "startPeriod", title = "预算周期") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonSerialize(using = LocalDateTimeSerializer.class) diff --git a/service/src/main/resources/mapper/financial/BudgetCategoryMapper.xml b/service/src/main/resources/mapper/financial/BudgetCategoryMapper.xml index fe20164..31d410c 100644 --- a/service/src/main/resources/mapper/financial/BudgetCategoryMapper.xml +++ b/service/src/main/resources/mapper/financial/BudgetCategoryMapper.xml @@ -53,6 +53,9 @@ and base.amount like CONCAT('%',#{dto.amount},'%') + + and base.use_amount like CONCAT('%',#{dto.useAmount},'%') + and ( (base.start_period between #{dto.startPeriod} and #{dto.endPeriod}) diff --git a/service/src/main/resources/static/bill-add-template.xlsx b/service/src/main/resources/static/bill-add-template.xlsx index 6f70f34..9a838e5 100644 Binary files a/service/src/main/resources/static/bill-add-template.xlsx and b/service/src/main/resources/static/bill-add-template.xlsx differ