From 25c1f5095d1b7524c8da97659b962bb9a85a87bd Mon Sep 17 00:00:00 2001 From: Bunny <1319900154@qq.com> Date: Wed, 13 Nov 2024 17:28:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=AE=A1=E7=90=86=E7=AB=AF=E9=A2=84?= =?UTF-8?q?=E7=AE=97=E5=88=86=E7=B1=BB=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generator/generator/WebGeneratorCode.java | 2 +- .../cn/bunny/dao/common/vo/BaseUserVo.java | 6 ++-- .../budgetCategory/BudgetCategoryAddDto.java | 10 ++++-- .../budgetCategory/BudgetCategoryDto.java | 8 ++--- .../BudgetCategoryUpdateDto.java | 7 ++-- .../DebtRepaymentPlanAddDto.java | 4 --- .../DebtRepaymentPlanDto.java | 3 -- .../DebtRepaymentPlanUpdateDto.java | 4 --- .../dao/entity/financial/BudgetCategory.java | 7 ++-- .../entity/financial/DebtRepaymentPlan.java | 20 ++++------- .../financial/DebtCollectionManagementVo.java | 33 ----------------- .../admin/BudgetCategoryParentVo.java | 35 +++++++++++++++++++ .../{ => admin}/BudgetCategoryVo.java | 21 ++++++++--- .../admin}/CategoryVo.java | 2 +- .../{ => admin}/DebtRepaymentPlanVo.java | 5 +-- .../financial/{ => admin}/DebtTrackingVo.java | 2 +- .../financial/{ => admin}/SavingGoalVo.java | 2 +- .../{BillVo.java => user/BillUserVo.java} | 4 +-- .../financial/{ => user}/CategoryUserVo.java | 2 +- .../DebtRepaymentPlanController.java | 2 +- ...serController.java => BillController.java} | 16 ++++----- .../financial/BudgetCategoryController.java | 10 +++++- .../financial/CategoryController.java | 4 +-- .../financial/DebtTrackingController.java | 2 +- .../financial/SavingGoalController.java | 2 +- .../services/mapper/financial/BillMapper.java | 4 +-- .../financial/BudgetCategoryMapper.java | 2 +- .../mapper/financial/CategoryMapper.java | 4 +-- .../financial/DebtRepaymentPlanMapper.java | 2 +- .../mapper/financial/DebtTrackingMapper.java | 2 +- .../mapper/financial/SavingGoalMapper.java | 2 +- .../service/financial/BillService.java | 4 +-- .../financial/BudgetCategoryService.java | 10 +++++- .../service/financial/CategoryService.java | 4 +-- .../financial/DebtRepaymentPlanService.java | 2 +- .../financial/DebtTrackingService.java | 2 +- .../service/financial/SavingGoalService.java | 2 +- .../financial/impl/BillServiceImpl.java | 8 ++--- .../impl/BudgetCategoryServiceImpl.java | 17 ++++++++- .../financial/impl/CategoryServiceImpl.java | 4 +-- .../impl/DebtRepaymentPlanServiceImpl.java | 2 +- .../impl/DebtTrackingServiceImpl.java | 2 +- .../financial/impl/SavingGoalServiceImpl.java | 2 +- .../src/main/resources/application-dev.yml | 19 ---------- .../resources/mapper/financial/BillMapper.xml | 2 +- .../mapper/financial/BudgetCategoryMapper.xml | 21 +++++------ .../mapper/financial/CategoryMapper.xml | 4 +-- .../financial/DebtRepaymentPlanMapper.xml | 8 ++--- .../mapper/financial/DebtTrackingMapper.xml | 2 +- .../mapper/financial/SavingGoalMapper.xml | 2 +- 50 files changed, 179 insertions(+), 167 deletions(-) delete mode 100644 dao/src/main/java/cn/bunny/dao/vo/financial/DebtCollectionManagementVo.java create mode 100644 dao/src/main/java/cn/bunny/dao/vo/financial/admin/BudgetCategoryParentVo.java rename dao/src/main/java/cn/bunny/dao/vo/financial/{ => admin}/BudgetCategoryVo.java (55%) rename dao/src/main/java/cn/bunny/dao/vo/{configuration => financial/admin}/CategoryVo.java (95%) rename dao/src/main/java/cn/bunny/dao/vo/financial/{ => admin}/DebtRepaymentPlanVo.java (89%) rename dao/src/main/java/cn/bunny/dao/vo/financial/{ => admin}/DebtTrackingVo.java (95%) rename dao/src/main/java/cn/bunny/dao/vo/financial/{ => admin}/SavingGoalVo.java (95%) rename dao/src/main/java/cn/bunny/dao/vo/financial/{BillVo.java => user/BillUserVo.java} (95%) rename dao/src/main/java/cn/bunny/dao/vo/financial/{ => user}/CategoryUserVo.java (92%) rename service/src/main/java/cn/bunny/services/controller/financial/{BillUserController.java => BillController.java} (85%) diff --git a/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java b/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java index 518a7e7..13f038c 100644 --- a/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java +++ b/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java @@ -7,7 +7,7 @@ import cn.bunny.dao.dto.financial.savingGoal.SavingGoalAddDto; import cn.bunny.dao.dto.financial.savingGoal.SavingGoalDto; import cn.bunny.dao.dto.financial.savingGoal.SavingGoalUpdateDto; import cn.bunny.dao.entity.financial.SavingGoal; -import cn.bunny.dao.vo.financial.SavingGoalVo; +import cn.bunny.dao.vo.financial.admin.SavingGoalVo; import com.baomidou.mybatisplus.annotation.TableName; import com.google.common.base.CaseFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/dao/src/main/java/cn/bunny/dao/common/vo/BaseUserVo.java b/dao/src/main/java/cn/bunny/dao/common/vo/BaseUserVo.java index 572aa7a..1a91a44 100644 --- a/dao/src/main/java/cn/bunny/dao/common/vo/BaseUserVo.java +++ b/dao/src/main/java/cn/bunny/dao/common/vo/BaseUserVo.java @@ -9,10 +9,10 @@ import lombok.EqualsAndHashCode; @Schema(name = "BaseVo", title = "基础返回对象内容包含用户信息", description = "基础返回对象内容包含用户信息") public class BaseUserVo extends BaseVo { - @Schema(name = "username", title = "用户名") + @Schema(name = "createUsername", title = "创建用户名") private String createUsername; - @Schema(name = "nickname", title = "昵称") + @Schema(name = "updateUsername", title = "更新用户名") private String updateUsername; - + } diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryAddDto.java index fa2f580..f516023 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryAddDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryAddDto.java @@ -1,6 +1,7 @@ package cn.bunny.dao.dto.financial.budgetCategory; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; @@ -42,12 +43,15 @@ public class BudgetCategoryAddDto { @Schema(name = "amount", title = "预算金额") @NotNull(message = "预算金额不能为空") + @Min(value = 0L, message = "不能低于0") private BigDecimal amount; + + @Schema(name = "period", title = "预算周期") + @NotNull(message = "预算周期不能为空") + private String startPeriod; @Schema(name = "period", title = "预算周期") @NotNull(message = "预算周期不能为空") - @NotBlank(message = "预算周期不能为空") - private String period; - + private String endPeriod; } 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 fa36766..42a2f12 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 @@ -15,9 +15,6 @@ import java.math.BigDecimal; @Schema(name = "BudgetCategoryDto对象", title = "预算分类查询", description = "预算分类查询") public class BudgetCategoryDto { - @Schema(name = "parentId", title = "父级id") - private Long parentId; - @Schema(name = "userId", title = "绑定的用户id") private Long userId; @@ -34,7 +31,10 @@ public class BudgetCategoryDto { private BigDecimal amount; @Schema(name = "period", title = "预算周期") - private String period; + private String startPeriod; + + @Schema(name = "period", title = "预算周期") + private String endPeriod; } diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryUpdateDto.java index b5e7884..860957f 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryUpdateDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/budgetCategory/BudgetCategoryUpdateDto.java @@ -50,8 +50,11 @@ public class BudgetCategoryUpdateDto { @Schema(name = "period", title = "预算周期") @NotNull(message = "预算周期不能为空") - @NotBlank(message = "预算周期不能为空") - private String period; + private String startPeriod; + + @Schema(name = "period", title = "预算周期") + @NotNull(message = "预算周期不能为空") + private String endPeriod; } diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanAddDto.java index 07ca213..e2e4071 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanAddDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanAddDto.java @@ -18,10 +18,6 @@ import java.time.LocalDateTime; @Schema(name = "CategoryUserAddDto对象", title = "债务还款计划表添加", description = "债务还款计划表添加") public class DebtRepaymentPlanAddDto { - @Schema(name = "debtId", title = "债务ID") - @NotNull(message = "债务不能为空") - private Long debtId; - @Schema(name = "installmentNumber", title = "债务金额") @NotNull(message = "债务金额不能为空") private BigDecimal installmentNumber; diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanDto.java index 6c9d60e..7afb55b 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanDto.java @@ -16,9 +16,6 @@ import java.time.LocalDateTime; @Schema(name = "DebtRepaymentPlanDto对象", title = "债务还款计划查询", description = "债务还款计划查询") public class DebtRepaymentPlanDto { - @Schema(name = "debtId", title = "债务ID") - private Long debtId; - @Schema(name = "installmentNumber", title = "债务金额") private BigDecimal installmentNumber; diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanUpdateDto.java index c6bc92e..004172c 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanUpdateDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanUpdateDto.java @@ -22,10 +22,6 @@ public class DebtRepaymentPlanUpdateDto { @NotNull(message = "id不能为空") private Long id; - @Schema(name = "debtId", title = "债务ID") - @NotNull(message = "债务不能为空") - private Long debtId; - @Schema(name = "installmentNumber", title = "债务金额") @NotNull(message = "债务金额不能为空") private BigDecimal installmentNumber; 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 1acdd10..2c56a98 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 @@ -42,7 +42,10 @@ public class BudgetCategory extends BaseEntity { @Schema(name = "amount", title = "预算金额") private BigDecimal amount; - @Schema(name = "period", title = "预算周期") - private String period; + @Schema(name = "startPeriod", title = "开始预算周期") + private String startPeriod; + + @Schema(name = "endPeriod", title = "结束预算周期") + private String endPeriod; } diff --git a/dao/src/main/java/cn/bunny/dao/entity/financial/DebtRepaymentPlan.java b/dao/src/main/java/cn/bunny/dao/entity/financial/DebtRepaymentPlan.java index 6b32487..2c04a80 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/financial/DebtRepaymentPlan.java +++ b/dao/src/main/java/cn/bunny/dao/entity/financial/DebtRepaymentPlan.java @@ -1,19 +1,14 @@ package cn.bunny.dao.entity.financial; import cn.bunny.dao.common.entity.BaseEntity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + import java.math.BigDecimal; import java.time.LocalDateTime; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.*; -import lombok.experimental.Accessors; /** *

@@ -28,10 +23,7 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @TableName("t_debt_repayment_plan") @Schema(name = "DebtRepaymentPlan对象", title = "债务还款计划表", description = "债务还款计划表") -public class DebtRepaymentPlan extends BaseEntity { - - @Schema(name = "debtId", title = "债务ID") - private Long debtId; +public class DebtRepaymentPlan extends BaseEntity { @Schema(name = "installmentNumber", title = "债务金额") private BigDecimal installmentNumber; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/DebtCollectionManagementVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/DebtCollectionManagementVo.java deleted file mode 100644 index c270634..0000000 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/DebtCollectionManagementVo.java +++ /dev/null @@ -1,33 +0,0 @@ -package cn.bunny.dao.vo.financial; - -import cn.bunny.dao.common.vo.BaseVo; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -@EqualsAndHashCode(callSuper = true) -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Schema(name = "DebtCollectionManagementVo对象", title = "债务回收管理返回内容", description = "债务回收管理返回内容") -public class DebtCollectionManagementVo extends BaseVo { - - @Schema(name = "debtId", title = "债务ID") - private Long debtId; - - @Schema(name = "recoveryDate", title = "回收日期") - private LocalDateTime recoveryDate; - - @Schema(name = "recoveryAmount", title = "回收金额") - private BigDecimal recoveryAmount; - - @Schema(name = "recoveryMethod", title = "回收方式") - private String recoveryMethod; - - @Schema(name = "notes", title = "备注") - private String notes; - -} \ No newline at end of file diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/BudgetCategoryParentVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/BudgetCategoryParentVo.java new file mode 100644 index 0000000..a94e3a2 --- /dev/null +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/BudgetCategoryParentVo.java @@ -0,0 +1,35 @@ +package cn.bunny.dao.vo.financial.admin; + +import com.alibaba.fastjson2.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Schema(name = "BudgetCategoryParentVo对象", title = "预算分类父级返回对象", description = "预算分类父级返回对象") +public class BudgetCategoryParentVo { + + @Schema(name = "id", title = "主键") + @JsonProperty("id") + @JsonFormat(shape = JsonFormat.Shape.STRING) + @JSONField(serializeUsing = ToStringSerializer.class) + private Long id; + + @Schema(name = "parentId", title = "父级id") + private Long parentId; + + @Schema(name = "categoryName", title = "分类名称") + private String categoryName; + + @Schema(name = "budgetName", title = "预算名称") + private String budgetName; + +} diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/BudgetCategoryVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/BudgetCategoryVo.java similarity index 55% rename from dao/src/main/java/cn/bunny/dao/vo/financial/BudgetCategoryVo.java rename to dao/src/main/java/cn/bunny/dao/vo/financial/admin/BudgetCategoryVo.java index 859f5ac..c23ba84 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/BudgetCategoryVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/BudgetCategoryVo.java @@ -1,6 +1,9 @@ -package cn.bunny.dao.vo.financial; +package cn.bunny.dao.vo.financial.admin; -import cn.bunny.dao.common.vo.BaseVo; +import cn.bunny.dao.common.vo.BaseUserVo; +import com.alibaba.fastjson2.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -12,14 +15,21 @@ import java.math.BigDecimal; @NoArgsConstructor @Builder @Schema(name = "BudgetCategoryVo对象", title = "预算分类查询返回对象", description = "预算分类查询返回对象") -public class BudgetCategoryVo extends BaseVo { +public class BudgetCategoryVo extends BaseUserVo { @Schema(name = "parentId", title = "父级id") + @JsonFormat(shape = JsonFormat.Shape.STRING) + @JSONField(serializeUsing = ToStringSerializer.class) private Long parentId; @Schema(name = "userId", title = "绑定的用户id") + @JsonFormat(shape = JsonFormat.Shape.STRING) + @JSONField(serializeUsing = ToStringSerializer.class) private Long userId; + @Schema(name = "username", title = "用户名") + private String username; + @Schema(name = "categoryName", title = "分类名称") private String categoryName; @@ -33,6 +43,9 @@ public class BudgetCategoryVo extends BaseVo { private BigDecimal amount; @Schema(name = "period", title = "预算周期") - private String period; + private String startPeriod; + + @Schema(name = "period", title = "预算周期") + private String endPeriod; } \ No newline at end of file diff --git a/dao/src/main/java/cn/bunny/dao/vo/configuration/CategoryVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/CategoryVo.java similarity index 95% rename from dao/src/main/java/cn/bunny/dao/vo/configuration/CategoryVo.java rename to dao/src/main/java/cn/bunny/dao/vo/financial/admin/CategoryVo.java index a33f4a1..c8611eb 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/configuration/CategoryVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/CategoryVo.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.vo.configuration; +package cn.bunny.dao.vo.financial.admin; import cn.bunny.dao.common.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/DebtRepaymentPlanVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtRepaymentPlanVo.java similarity index 89% rename from dao/src/main/java/cn/bunny/dao/vo/financial/DebtRepaymentPlanVo.java rename to dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtRepaymentPlanVo.java index 5089ccd..08a99a9 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/DebtRepaymentPlanVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtRepaymentPlanVo.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.vo.financial; +package cn.bunny.dao.vo.financial.admin; import cn.bunny.dao.common.vo.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; @@ -15,9 +15,6 @@ import java.time.LocalDateTime; @Schema(name = "DebtRepaymentPlanVo对象", title = "债务还款计划返回对象", description = "债务还款计划返回对象") public class DebtRepaymentPlanVo extends BaseVo { - @Schema(name = "debtId", title = "债务ID") - private Long debtId; - @Schema(name = "installmentNumber", title = "债务金额") private BigDecimal installmentNumber; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/DebtTrackingVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtTrackingVo.java similarity index 95% rename from dao/src/main/java/cn/bunny/dao/vo/financial/DebtTrackingVo.java rename to dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtTrackingVo.java index fb06f2e..1357ce1 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/DebtTrackingVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtTrackingVo.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.vo.financial; +package cn.bunny.dao.vo.financial.admin; import cn.bunny.dao.common.vo.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/SavingGoalVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/SavingGoalVo.java similarity index 95% rename from dao/src/main/java/cn/bunny/dao/vo/financial/SavingGoalVo.java rename to dao/src/main/java/cn/bunny/dao/vo/financial/admin/SavingGoalVo.java index c025bd7..08fc113 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/SavingGoalVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/SavingGoalVo.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.vo.financial; +package cn.bunny.dao.vo.financial.admin; import cn.bunny.dao.common.vo.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/BillVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/user/BillUserVo.java similarity index 95% rename from dao/src/main/java/cn/bunny/dao/vo/financial/BillVo.java rename to dao/src/main/java/cn/bunny/dao/vo/financial/user/BillUserVo.java index 1f149d6..451841f 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/BillVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/user/BillUserVo.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.vo.financial; +package cn.bunny.dao.vo.financial.user; import cn.bunny.dao.common.vo.BaseVo; import com.alibaba.fastjson2.annotation.JSONField; @@ -20,7 +20,7 @@ import java.time.LocalDateTime; @NoArgsConstructor @Builder @Schema(name = "BillVo对象", title = "账单信息返回内容", description = "账单信息返回内容") -public class BillVo extends BaseVo { +public class BillUserVo extends BaseVo { @Schema(name = "username", title = "类型：1 - 收入，-1 - 支出") private Byte type; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/CategoryUserVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/user/CategoryUserVo.java similarity index 92% rename from dao/src/main/java/cn/bunny/dao/vo/financial/CategoryUserVo.java rename to dao/src/main/java/cn/bunny/dao/vo/financial/user/CategoryUserVo.java index a41850f..ee5b01a 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/CategoryUserVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/user/CategoryUserVo.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.vo.financial; +package cn.bunny.dao.vo.financial.user; import cn.bunny.dao.common.vo.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/service/src/main/java/cn/bunny/services/controller/DebtRepaymentPlanController.java b/service/src/main/java/cn/bunny/services/controller/DebtRepaymentPlanController.java index 1102305..08003a1 100644 --- a/service/src/main/java/cn/bunny/services/controller/DebtRepaymentPlanController.java +++ b/service/src/main/java/cn/bunny/services/controller/DebtRepaymentPlanController.java @@ -7,7 +7,7 @@ import cn.bunny.dao.entity.financial.DebtRepaymentPlan; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.Result; import cn.bunny.dao.pojo.result.ResultCodeEnum; -import cn.bunny.dao.vo.financial.DebtRepaymentPlanVo; +import cn.bunny.dao.vo.financial.admin.DebtRepaymentPlanVo; import cn.bunny.services.service.financial.DebtRepaymentPlanService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/service/src/main/java/cn/bunny/services/controller/financial/BillUserController.java b/service/src/main/java/cn/bunny/services/controller/financial/BillController.java similarity index 85% rename from service/src/main/java/cn/bunny/services/controller/financial/BillUserController.java rename to service/src/main/java/cn/bunny/services/controller/financial/BillController.java index 6825be8..2438f77 100644 --- a/service/src/main/java/cn/bunny/services/controller/financial/BillUserController.java +++ b/service/src/main/java/cn/bunny/services/controller/financial/BillController.java @@ -7,7 +7,7 @@ import cn.bunny.dao.entity.financial.Bill; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.Result; import cn.bunny.dao.pojo.result.ResultCodeEnum; -import cn.bunny.dao.vo.financial.BillVo; +import cn.bunny.dao.vo.financial.user.BillUserVo; import cn.bunny.services.service.financial.BillService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; @@ -31,40 +31,40 @@ import java.util.List; @Tag(name = "账单信息", description = "账单信息相关接口") @RestController @RequestMapping("admin/bill") -public class BillUserController { +public class BillController { @Autowired private BillService billService; @Operation(summary = "分页查询账单信息", description = "分页查询账单信息") - @GetMapping("noManage/getBillList/{page}/{limit}") - public Mono>> getBillList( + @GetMapping("noManage/getUserBillList/{page}/{limit}") + public Mono>> getBillList( @Parameter(name = "page", description = "当前页", required = true) @PathVariable("page") Integer page, @Parameter(name = "limit", description = "每页记录数", required = true) @PathVariable("limit") Integer limit, BillUserDto dto) { Page pageParams = new Page<>(page, limit); - PageResult pageResult = billService.getBillList(pageParams, dto); + PageResult pageResult = billService.getBillList(pageParams, dto); return Mono.just(Result.success(pageResult)); } @Operation(summary = "添加账单信息", description = "添加账单信息") - @PostMapping("noManage/addBill") + @PostMapping("noManage/addUserBill") public Mono> addBill(@Valid @RequestBody BillUserAddDto dto) { billService.addBill(dto); return Mono.just(Result.success(ResultCodeEnum.ADD_SUCCESS)); } @Operation(summary = "更新账单信息", description = "更新账单信息") - @PutMapping("noManage/updateBill") + @PutMapping("noManage/updateUserBill") public Mono> updateBill(@Valid @RequestBody BillUserUpdateDto dto) { billService.updateBill(dto); return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS)); } @Operation(summary = "删除账单信息", description = "删除账单信息") - @DeleteMapping("noManage/deleteBill") + @DeleteMapping("noManage/deleteUserBill") public Mono> deleteBill(@RequestBody List ids) { billService.deleteBill(ids); return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS)); diff --git a/service/src/main/java/cn/bunny/services/controller/financial/BudgetCategoryController.java b/service/src/main/java/cn/bunny/services/controller/financial/BudgetCategoryController.java index 2af3ba0..78d00c8 100644 --- a/service/src/main/java/cn/bunny/services/controller/financial/BudgetCategoryController.java +++ b/service/src/main/java/cn/bunny/services/controller/financial/BudgetCategoryController.java @@ -7,7 +7,8 @@ import cn.bunny.dao.entity.financial.BudgetCategory; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.Result; import cn.bunny.dao.pojo.result.ResultCodeEnum; -import cn.bunny.dao.vo.financial.BudgetCategoryVo; +import cn.bunny.dao.vo.financial.admin.BudgetCategoryParentVo; +import cn.bunny.dao.vo.financial.admin.BudgetCategoryVo; import cn.bunny.services.service.financial.BudgetCategoryService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; @@ -49,6 +50,13 @@ public class BudgetCategoryController { return Mono.just(Result.success(pageResult)); } + @Operation(summary = "返回所有父级对象", description = "返回所有父级对象") + @GetMapping("noManage/getAllParentList") + public Mono>> getAllParentList() { + List voList = budgetCategoryService.getAllParentList(); + return Mono.just(Result.success(voList)); + } + @Operation(summary = "添加预算分类表", description = "添加预算分类表") @PostMapping("addBudgetCategory") public Mono> addBudgetCategory(@Valid @RequestBody BudgetCategoryAddDto dto) { diff --git a/service/src/main/java/cn/bunny/services/controller/financial/CategoryController.java b/service/src/main/java/cn/bunny/services/controller/financial/CategoryController.java index 7428cc2..bf75406 100644 --- a/service/src/main/java/cn/bunny/services/controller/financial/CategoryController.java +++ b/service/src/main/java/cn/bunny/services/controller/financial/CategoryController.java @@ -10,8 +10,8 @@ import cn.bunny.dao.entity.financial.Category; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.Result; import cn.bunny.dao.pojo.result.ResultCodeEnum; -import cn.bunny.dao.vo.configuration.CategoryVo; -import cn.bunny.dao.vo.financial.CategoryUserVo; +import cn.bunny.dao.vo.financial.admin.CategoryVo; +import cn.bunny.dao.vo.financial.user.CategoryUserVo; import cn.bunny.services.service.financial.CategoryService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/service/src/main/java/cn/bunny/services/controller/financial/DebtTrackingController.java b/service/src/main/java/cn/bunny/services/controller/financial/DebtTrackingController.java index c42c239..321168e 100644 --- a/service/src/main/java/cn/bunny/services/controller/financial/DebtTrackingController.java +++ b/service/src/main/java/cn/bunny/services/controller/financial/DebtTrackingController.java @@ -7,7 +7,7 @@ import cn.bunny.dao.entity.financial.DebtTracking; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.Result; import cn.bunny.dao.pojo.result.ResultCodeEnum; -import cn.bunny.dao.vo.financial.DebtTrackingVo; +import cn.bunny.dao.vo.financial.admin.DebtTrackingVo; import cn.bunny.services.service.financial.DebtTrackingService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/service/src/main/java/cn/bunny/services/controller/financial/SavingGoalController.java b/service/src/main/java/cn/bunny/services/controller/financial/SavingGoalController.java index c59888c..395b893 100644 --- a/service/src/main/java/cn/bunny/services/controller/financial/SavingGoalController.java +++ b/service/src/main/java/cn/bunny/services/controller/financial/SavingGoalController.java @@ -7,7 +7,7 @@ import cn.bunny.dao.entity.financial.SavingGoal; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.Result; import cn.bunny.dao.pojo.result.ResultCodeEnum; -import cn.bunny.dao.vo.financial.SavingGoalVo; +import cn.bunny.dao.vo.financial.admin.SavingGoalVo; import cn.bunny.services.service.financial.SavingGoalService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/service/src/main/java/cn/bunny/services/mapper/financial/BillMapper.java b/service/src/main/java/cn/bunny/services/mapper/financial/BillMapper.java index f1aac17..43aad55 100644 --- a/service/src/main/java/cn/bunny/services/mapper/financial/BillMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/financial/BillMapper.java @@ -2,7 +2,7 @@ package cn.bunny.services.mapper.financial; import cn.bunny.dao.dto.financial.bill.user.BillUserDto; import cn.bunny.dao.entity.financial.Bill; -import cn.bunny.dao.vo.financial.BillVo; +import cn.bunny.dao.vo.financial.user.BillUserVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -29,7 +29,7 @@ public interface BillMapper extends BaseMapper { * @param dto 账单信息查询表单 * @return 账单信息分页结果 */ - IPage selectListByPage(@Param("page") Page pageParams, @Param("dto") BillUserDto dto, @Param("userId") Long userId); + IPage selectListByPage(@Param("page") Page pageParams, @Param("dto") BillUserDto dto, @Param("userId") Long userId); /** * 物理删除账单信息 diff --git a/service/src/main/java/cn/bunny/services/mapper/financial/BudgetCategoryMapper.java b/service/src/main/java/cn/bunny/services/mapper/financial/BudgetCategoryMapper.java index ef07ede..5a89c8e 100644 --- a/service/src/main/java/cn/bunny/services/mapper/financial/BudgetCategoryMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/financial/BudgetCategoryMapper.java @@ -2,7 +2,7 @@ package cn.bunny.services.mapper.financial; import cn.bunny.dao.dto.financial.budgetCategory.BudgetCategoryDto; import cn.bunny.dao.entity.financial.BudgetCategory; -import cn.bunny.dao.vo.financial.BudgetCategoryVo; +import cn.bunny.dao.vo.financial.admin.BudgetCategoryVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/mapper/financial/CategoryMapper.java b/service/src/main/java/cn/bunny/services/mapper/financial/CategoryMapper.java index 0fda463..8cce449 100644 --- a/service/src/main/java/cn/bunny/services/mapper/financial/CategoryMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/financial/CategoryMapper.java @@ -3,8 +3,8 @@ package cn.bunny.services.mapper.financial; import cn.bunny.dao.dto.financial.category.admin.CategoryDto; import cn.bunny.dao.dto.financial.category.user.CategoryUserDto; import cn.bunny.dao.entity.financial.Category; -import cn.bunny.dao.vo.configuration.CategoryVo; -import cn.bunny.dao.vo.financial.CategoryUserVo; +import cn.bunny.dao.vo.financial.admin.CategoryVo; +import cn.bunny.dao.vo.financial.user.CategoryUserVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/mapper/financial/DebtRepaymentPlanMapper.java b/service/src/main/java/cn/bunny/services/mapper/financial/DebtRepaymentPlanMapper.java index fbadc68..251c5df 100644 --- a/service/src/main/java/cn/bunny/services/mapper/financial/DebtRepaymentPlanMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/financial/DebtRepaymentPlanMapper.java @@ -2,7 +2,7 @@ package cn.bunny.services.mapper.financial; import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanDto; import cn.bunny.dao.entity.financial.DebtRepaymentPlan; -import cn.bunny.dao.vo.financial.DebtRepaymentPlanVo; +import cn.bunny.dao.vo.financial.admin.DebtRepaymentPlanVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/mapper/financial/DebtTrackingMapper.java b/service/src/main/java/cn/bunny/services/mapper/financial/DebtTrackingMapper.java index 24e204f..d692bdb 100644 --- a/service/src/main/java/cn/bunny/services/mapper/financial/DebtTrackingMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/financial/DebtTrackingMapper.java @@ -2,7 +2,7 @@ package cn.bunny.services.mapper.financial; import cn.bunny.dao.dto.financial.debtTracking.DebtTrackingDto; import cn.bunny.dao.entity.financial.DebtTracking; -import cn.bunny.dao.vo.financial.DebtTrackingVo; +import cn.bunny.dao.vo.financial.admin.DebtTrackingVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/mapper/financial/SavingGoalMapper.java b/service/src/main/java/cn/bunny/services/mapper/financial/SavingGoalMapper.java index cada98b..e8ee7da 100644 --- a/service/src/main/java/cn/bunny/services/mapper/financial/SavingGoalMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/financial/SavingGoalMapper.java @@ -2,7 +2,7 @@ package cn.bunny.services.mapper.financial; import cn.bunny.dao.dto.financial.savingGoal.SavingGoalDto; import cn.bunny.dao.entity.financial.SavingGoal; -import cn.bunny.dao.vo.financial.SavingGoalVo; +import cn.bunny.dao.vo.financial.admin.SavingGoalVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/service/financial/BillService.java b/service/src/main/java/cn/bunny/services/service/financial/BillService.java index cb2eefd..a479703 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/BillService.java +++ b/service/src/main/java/cn/bunny/services/service/financial/BillService.java @@ -5,7 +5,7 @@ import cn.bunny.dao.dto.financial.bill.user.BillUserDto; import cn.bunny.dao.dto.financial.bill.user.BillUserUpdateDto; import cn.bunny.dao.entity.financial.Bill; import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.vo.financial.BillVo; +import cn.bunny.dao.vo.financial.user.BillUserVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; @@ -27,7 +27,7 @@ public interface BillService extends IService { * * @return 账单信息返回列表 */ - PageResult getBillList(Page pageParams, BillUserDto dto); + PageResult getBillList(Page pageParams, BillUserDto dto); /** * * 添加账单信息 diff --git a/service/src/main/java/cn/bunny/services/service/financial/BudgetCategoryService.java b/service/src/main/java/cn/bunny/services/service/financial/BudgetCategoryService.java index 4048efd..b372640 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/BudgetCategoryService.java +++ b/service/src/main/java/cn/bunny/services/service/financial/BudgetCategoryService.java @@ -5,7 +5,8 @@ import cn.bunny.dao.dto.financial.budgetCategory.BudgetCategoryDto; import cn.bunny.dao.dto.financial.budgetCategory.BudgetCategoryUpdateDto; import cn.bunny.dao.entity.financial.BudgetCategory; import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.vo.financial.BudgetCategoryVo; +import cn.bunny.dao.vo.financial.admin.BudgetCategoryParentVo; +import cn.bunny.dao.vo.financial.admin.BudgetCategoryVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; @@ -49,4 +50,11 @@ public interface BudgetCategoryService extends IService { * @param ids 删除id列表 */ void deleteBudgetCategory(List ids); + + /** + * 返回所有父级对象 + * + * @return 父级列表 + */ + List getAllParentList(); } diff --git a/service/src/main/java/cn/bunny/services/service/financial/CategoryService.java b/service/src/main/java/cn/bunny/services/service/financial/CategoryService.java index 070d4b9..e06f4f5 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/CategoryService.java +++ b/service/src/main/java/cn/bunny/services/service/financial/CategoryService.java @@ -8,8 +8,8 @@ import cn.bunny.dao.dto.financial.category.user.CategoryUserDto; import cn.bunny.dao.dto.financial.category.user.CategoryUserUpdateDto; import cn.bunny.dao.entity.financial.Category; import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.vo.configuration.CategoryVo; -import cn.bunny.dao.vo.financial.CategoryUserVo; +import cn.bunny.dao.vo.financial.admin.CategoryVo; +import cn.bunny.dao.vo.financial.user.CategoryUserVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/service/financial/DebtRepaymentPlanService.java b/service/src/main/java/cn/bunny/services/service/financial/DebtRepaymentPlanService.java index abad251..55c13c0 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/DebtRepaymentPlanService.java +++ b/service/src/main/java/cn/bunny/services/service/financial/DebtRepaymentPlanService.java @@ -5,7 +5,7 @@ import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanDto; import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanUpdateDto; import cn.bunny.dao.entity.financial.DebtRepaymentPlan; import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.vo.financial.DebtRepaymentPlanVo; +import cn.bunny.dao.vo.financial.admin.DebtRepaymentPlanVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/service/financial/DebtTrackingService.java b/service/src/main/java/cn/bunny/services/service/financial/DebtTrackingService.java index 5466d23..92d20ea 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/DebtTrackingService.java +++ b/service/src/main/java/cn/bunny/services/service/financial/DebtTrackingService.java @@ -5,7 +5,7 @@ import cn.bunny.dao.dto.financial.debtTracking.DebtTrackingDto; import cn.bunny.dao.dto.financial.debtTracking.DebtTrackingUpdateDto; import cn.bunny.dao.entity.financial.DebtTracking; import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.vo.financial.DebtTrackingVo; +import cn.bunny.dao.vo.financial.admin.DebtTrackingVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/service/financial/SavingGoalService.java b/service/src/main/java/cn/bunny/services/service/financial/SavingGoalService.java index d3ddf98..7101682 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/SavingGoalService.java +++ b/service/src/main/java/cn/bunny/services/service/financial/SavingGoalService.java @@ -5,7 +5,7 @@ import cn.bunny.dao.dto.financial.savingGoal.SavingGoalDto; import cn.bunny.dao.dto.financial.savingGoal.SavingGoalUpdateDto; import cn.bunny.dao.entity.financial.SavingGoal; import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.vo.financial.SavingGoalVo; +import cn.bunny.dao.vo.financial.admin.SavingGoalVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/service/financial/impl/BillServiceImpl.java b/service/src/main/java/cn/bunny/services/service/financial/impl/BillServiceImpl.java index 0c281b2..d86e27f 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/impl/BillServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/financial/impl/BillServiceImpl.java @@ -6,7 +6,7 @@ import cn.bunny.dao.dto.financial.bill.user.BillUserDto; import cn.bunny.dao.dto.financial.bill.user.BillUserUpdateDto; import cn.bunny.dao.entity.financial.Bill; import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.vo.financial.BillVo; +import cn.bunny.dao.vo.financial.user.BillUserVo; import cn.bunny.services.mapper.financial.BillMapper; import cn.bunny.services.service.financial.BillService; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -37,14 +37,14 @@ public class BillServiceImpl extends ServiceImpl implements Bi * @return 查询分页账单信息返回对象 */ @Override - public PageResult getBillList(Page pageParams, BillUserDto dto) { + public PageResult getBillList(Page pageParams, BillUserDto dto) { // 需要根据当前用户去查询 Long userId = BaseContext.getUserId(); // 判断创建用户的Id是否和当前请求的用户id是否相同 - IPage page = baseMapper.selectListByPage(pageParams, dto, userId); + IPage page = baseMapper.selectListByPage(pageParams, dto, userId); - return PageResult.builder() + return PageResult.builder() .list(page.getRecords()) .pageNo(page.getCurrent()) .pageSize(page.getSize()) diff --git a/service/src/main/java/cn/bunny/services/service/financial/impl/BudgetCategoryServiceImpl.java b/service/src/main/java/cn/bunny/services/service/financial/impl/BudgetCategoryServiceImpl.java index ccc97bf..e2b4909 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/impl/BudgetCategoryServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/financial/impl/BudgetCategoryServiceImpl.java @@ -5,7 +5,8 @@ import cn.bunny.dao.dto.financial.budgetCategory.BudgetCategoryDto; import cn.bunny.dao.dto.financial.budgetCategory.BudgetCategoryUpdateDto; import cn.bunny.dao.entity.financial.BudgetCategory; import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.vo.financial.BudgetCategoryVo; +import cn.bunny.dao.vo.financial.admin.BudgetCategoryParentVo; +import cn.bunny.dao.vo.financial.admin.BudgetCategoryVo; import cn.bunny.services.mapper.financial.BudgetCategoryMapper; import cn.bunny.services.service.financial.BudgetCategoryService; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -82,4 +83,18 @@ public class BudgetCategoryServiceImpl extends ServiceImpl ids) { baseMapper.deleteBatchIdsWithPhysics(ids); } + + /** + * 返回所有父级对象 + * + * @return 父级列表 + */ + @Override + public List getAllParentList() { + return list().stream().map(budgetCategory -> { + BudgetCategoryParentVo budgetCategoryParentVo = new BudgetCategoryParentVo(); + BeanUtils.copyProperties(budgetCategory, budgetCategoryParentVo); + return budgetCategoryParentVo; + }).toList(); + } } diff --git a/service/src/main/java/cn/bunny/services/service/financial/impl/CategoryServiceImpl.java b/service/src/main/java/cn/bunny/services/service/financial/impl/CategoryServiceImpl.java index 9d92eeb..9755745 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/impl/CategoryServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/financial/impl/CategoryServiceImpl.java @@ -12,8 +12,8 @@ import cn.bunny.dao.entity.financial.Category; import cn.bunny.dao.pojo.constant.UserConstant; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.ResultCodeEnum; -import cn.bunny.dao.vo.configuration.CategoryVo; -import cn.bunny.dao.vo.financial.CategoryUserVo; +import cn.bunny.dao.vo.financial.admin.CategoryVo; +import cn.bunny.dao.vo.financial.user.CategoryUserVo; import cn.bunny.services.mapper.financial.CategoryMapper; import cn.bunny.services.service.financial.CategoryService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/financial/impl/DebtRepaymentPlanServiceImpl.java b/service/src/main/java/cn/bunny/services/service/financial/impl/DebtRepaymentPlanServiceImpl.java index f694d6c..4c6092f 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/impl/DebtRepaymentPlanServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/financial/impl/DebtRepaymentPlanServiceImpl.java @@ -5,7 +5,7 @@ import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanDto; import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanUpdateDto; import cn.bunny.dao.entity.financial.DebtRepaymentPlan; import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.vo.financial.DebtRepaymentPlanVo; +import cn.bunny.dao.vo.financial.admin.DebtRepaymentPlanVo; import cn.bunny.services.mapper.financial.DebtRepaymentPlanMapper; import cn.bunny.services.service.financial.DebtRepaymentPlanService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/financial/impl/DebtTrackingServiceImpl.java b/service/src/main/java/cn/bunny/services/service/financial/impl/DebtTrackingServiceImpl.java index 7de37e2..ea1fba6 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/impl/DebtTrackingServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/financial/impl/DebtTrackingServiceImpl.java @@ -5,7 +5,7 @@ import cn.bunny.dao.dto.financial.debtTracking.DebtTrackingDto; import cn.bunny.dao.dto.financial.debtTracking.DebtTrackingUpdateDto; import cn.bunny.dao.entity.financial.DebtTracking; import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.vo.financial.DebtTrackingVo; +import cn.bunny.dao.vo.financial.admin.DebtTrackingVo; import cn.bunny.services.mapper.financial.DebtTrackingMapper; import cn.bunny.services.service.financial.DebtTrackingService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/financial/impl/SavingGoalServiceImpl.java b/service/src/main/java/cn/bunny/services/service/financial/impl/SavingGoalServiceImpl.java index 8e37e8d..efa7c29 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/impl/SavingGoalServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/financial/impl/SavingGoalServiceImpl.java @@ -5,7 +5,7 @@ import cn.bunny.dao.dto.financial.savingGoal.SavingGoalDto; import cn.bunny.dao.dto.financial.savingGoal.SavingGoalUpdateDto; import cn.bunny.dao.entity.financial.SavingGoal; import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.vo.financial.SavingGoalVo; +import cn.bunny.dao.vo.financial.admin.SavingGoalVo; import cn.bunny.services.mapper.financial.SavingGoalMapper; import cn.bunny.services.service.financial.SavingGoalService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/resources/application-dev.yml b/service/src/main/resources/application-dev.yml index 1c7049a..ce8036b 100644 --- a/service/src/main/resources/application-dev.yml +++ b/service/src/main/resources/application-dev.yml @@ -36,25 +36,6 @@ bunny: accessKey: bunny secretKey: "02120212" bucket-name: financial - #bunny: - # master: - # host: rm-bp12z6hlv46vi6g8mro.mysql.rds.aliyuncs.com - # port: 3306 - # database: family_financial - # username: family_financial_prod - # password: 0212family_financial - # - # redis: - # host: 47.120.65.66 - # port: 6379 - # database: 6 - # password: "02120212" - # - # minio: - # endpointUrl: "http://116.196.101.14:9000" - # accessKey: bunny - # secretKey: "02120212" - # bucket-name: financial backPath: "D:\\MyData\\backup" bashPath: "D:\\MyData" diff --git a/service/src/main/resources/mapper/financial/BillMapper.xml b/service/src/main/resources/mapper/financial/BillMapper.xml index 7342d66..cefafb0 100644 --- a/service/src/main/resources/mapper/financial/BillMapper.xml +++ b/service/src/main/resources/mapper/financial/BillMapper.xml @@ -23,7 +23,7 @@ - select base.*, category.category_name, diff --git a/service/src/main/resources/mapper/financial/BudgetCategoryMapper.xml b/service/src/main/resources/mapper/financial/BudgetCategoryMapper.xml index b767868..7604b46 100644 --- a/service/src/main/resources/mapper/financial/BudgetCategoryMapper.xml +++ b/service/src/main/resources/mapper/financial/BudgetCategoryMapper.xml @@ -16,30 +16,30 @@ - + + - id, create_time, update_time, create_user, update_user, is_deleted, parent_id, user_id, category_name, budget_name, status_type, amount, period + id, create_time, update_time, create_user, update_user, is_deleted, parent_id, user_id, category_name, budget_name, status_type, amount, start_period, end_period - select base.*, + base_user.username as username, create_user.username as create_username, update_user.username as update_username from t_budget_category base + left join sys_user base_user on base_user.id = base.user_id left join sys_user create_user on create_user.id = base.create_user left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.parent_id like CONCAT('%',#{dto.parentId},'%') - - and base.user_id like CONCAT('%',#{dto.userId},'%') + and base.user_id = #{dto.userId} and base.category_name like CONCAT('%',#{dto.categoryName},'%') @@ -48,13 +48,14 @@ and base.budget_name like CONCAT('%',#{dto.budgetName},'%') - and base.status_type like CONCAT('%',#{dto.statusType},'%') + and base.status_type = #{dto.statusType} and base.amount like CONCAT('%',#{dto.amount},'%') - - and base.period like CONCAT('%',#{dto.period},'%') + + and (base.start_period between #{dto.startPeriod} and #{dto.endPeriod}) + and (base.end_period between #{dto.startPeriod} and #{dto.endPeriod}) diff --git a/service/src/main/resources/mapper/financial/CategoryMapper.xml b/service/src/main/resources/mapper/financial/CategoryMapper.xml index 50e3b3f..aaf76f0 100644 --- a/service/src/main/resources/mapper/financial/CategoryMapper.xml +++ b/service/src/main/resources/mapper/financial/CategoryMapper.xml @@ -21,7 +21,7 @@ - select base.*, create_user.username as create_username, @@ -52,7 +52,7 @@ - select base.*, category_user.username as username, diff --git a/service/src/main/resources/mapper/financial/DebtRepaymentPlanMapper.xml b/service/src/main/resources/mapper/financial/DebtRepaymentPlanMapper.xml index c62d7d1..87466a1 100644 --- a/service/src/main/resources/mapper/financial/DebtRepaymentPlanMapper.xml +++ b/service/src/main/resources/mapper/financial/DebtRepaymentPlanMapper.xml @@ -10,7 +10,6 @@ - @@ -20,11 +19,11 @@ - id, create_time, update_time, create_user, update_user, is_deleted, debt_id, installment_number, installment_amount, due_date, paid_amount, payment_status + id, create_time, update_time, create_user, update_user, is_deleted, installment_number, installment_amount, due_date, paid_amount, payment_status - select base.*, create_user.username as create_username, @@ -34,9 +33,6 @@ left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.debt_id like CONCAT('%',#{dto.debtId},'%') - and base.installment_number like CONCAT('%',#{dto.installmentNumber},'%') diff --git a/service/src/main/resources/mapper/financial/DebtTrackingMapper.xml b/service/src/main/resources/mapper/financial/DebtTrackingMapper.xml index c410d38..69cb934 100644 --- a/service/src/main/resources/mapper/financial/DebtTrackingMapper.xml +++ b/service/src/main/resources/mapper/financial/DebtTrackingMapper.xml @@ -24,7 +24,7 @@ - select base.*, create_user.username as create_username, diff --git a/service/src/main/resources/mapper/financial/SavingGoalMapper.xml b/service/src/main/resources/mapper/financial/SavingGoalMapper.xml index 8dfadd8..3ad982d 100644 --- a/service/src/main/resources/mapper/financial/SavingGoalMapper.xml +++ b/service/src/main/resources/mapper/financial/SavingGoalMapper.xml @@ -23,7 +23,7 @@ - select base.*, create_user.username as create_username,