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/admin/DebtRepaymentPlanAddDto.java similarity index 90% rename from dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanAddDto.java rename to dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/admin/DebtRepaymentPlanAddDto.java index e2e4071..52197eb 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/admin/DebtRepaymentPlanAddDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.financial.debtRepaymentPlan; +package cn.bunny.dao.dto.financial.debtRepaymentPlan.admin; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; @@ -18,6 +18,9 @@ import java.time.LocalDateTime; @Schema(name = "CategoryUserAddDto对象", title = "债务还款计划表添加", description = "债务还款计划表添加") public class DebtRepaymentPlanAddDto { + @Schema(name = "userId", title = "绑定的用户id") + private Long userId; + @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/admin/DebtRepaymentPlanDto.java similarity index 86% rename from dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanDto.java rename to dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/admin/DebtRepaymentPlanDto.java index 7afb55b..b102f3f 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/admin/DebtRepaymentPlanDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.financial.debtRepaymentPlan; +package cn.bunny.dao.dto.financial.debtRepaymentPlan.admin; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -16,6 +16,9 @@ import java.time.LocalDateTime; @Schema(name = "DebtRepaymentPlanDto对象", title = "债务还款计划查询", description = "债务还款计划查询") public class DebtRepaymentPlanDto { + @Schema(name = "userId", title = "绑定的用户id") + private Long userId; + @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/admin/DebtRepaymentPlanUpdateDto.java similarity index 91% rename from dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/DebtRepaymentPlanUpdateDto.java rename to dao/src/main/java/cn/bunny/dao/dto/financial/debtRepaymentPlan/admin/DebtRepaymentPlanUpdateDto.java index 004172c..5a328f9 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/admin/DebtRepaymentPlanUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.financial.debtRepaymentPlan; +package cn.bunny.dao.dto.financial.debtRepaymentPlan.admin; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; @@ -22,6 +22,9 @@ public class DebtRepaymentPlanUpdateDto { @NotNull(message = "id不能为空") private Long id; + @Schema(name = "userId", title = "绑定的用户id") + private Long userId; + @Schema(name = "installmentNumber", title = "债务金额") @NotNull(message = "债务金额不能为空") private BigDecimal installmentNumber; diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalAddDto.java similarity index 66% rename from dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalAddDto.java rename to dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalAddDto.java index 21641ae..0ab3082 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalAddDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalAddDto.java @@ -1,6 +1,7 @@ -package cn.bunny.dao.dto.financial.savingGoal; +package cn.bunny.dao.dto.financial.savingGoal.admin; 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; @@ -33,11 +34,17 @@ public class SavingGoalAddDto { @Schema(name = "amount", title = "目标金额") @NotNull(message = "目标金额不能为空") + @Min(value = 0L, message = "储蓄值不能小于0") private BigDecimal amount; - @Schema(name = "duration", title = "目标时长") - @NotNull(message = "目标时长不能为空") - @NotBlank(message = "目标时长不能为空") - private String duration; + @Schema(name = "startDuration", title = "开始目标时长") + @NotNull(message = "开始目标时长不能为空") + @NotBlank(message = "开始目标时长不能为空") + private String startDuration; + + @Schema(name = "endDuration", title = "结束目标时长") + @NotNull(message = "结束目标时长不能为空") + @NotBlank(message = "结束目标时长不能为空") + private String endDuration; } \ No newline at end of file diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalDto.java similarity index 74% rename from dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalDto.java rename to dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalDto.java index ba9e155..e7423bb 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.financial.savingGoal; +package cn.bunny.dao.dto.financial.savingGoal.admin; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -15,9 +15,6 @@ import java.math.BigDecimal; @Schema(name = "SavingGoalDto对象", title = "用户储值查询", description = "用户储值查询") public class SavingGoalDto { - @Schema(name = "id", title = "主键") - private Long id; - @Schema(name = "userId", title = "绑定的用户id") private Long userId; @@ -30,7 +27,10 @@ public class SavingGoalDto { @Schema(name = "amount", title = "目标金额") private BigDecimal amount; - @Schema(name = "duration", title = "目标时长") - private String duration; + @Schema(name = "startDuration", title = "开始目标时长") + private String startDuration; + + @Schema(name = "endDuration", title = "结束目标时长") + private String endDuration; } diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalUpdateDto.java similarity index 72% rename from dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalUpdateDto.java rename to dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalUpdateDto.java index e27d722..5ee2bc0 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalUpdateDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.financial.savingGoal; +package cn.bunny.dao.dto.financial.savingGoal.admin; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; @@ -39,9 +39,14 @@ public class SavingGoalUpdateDto { @NotNull(message = "目标金额不能为空") private BigDecimal amount; - @Schema(name = "duration", title = "目标时长") - @NotNull(message = "目标时长不能为空") - @NotBlank(message = "目标时长不能为空") - private String duration; + @Schema(name = "startDuration", title = "开始目标时长") + @NotNull(message = "开始目标时长不能为空") + @NotBlank(message = "开始目标时长不能为空") + private String startDuration; + + @Schema(name = "endDuration", title = "结束目标时长") + @NotNull(message = "结束目标时长不能为空") + @NotBlank(message = "结束目标时长不能为空") + private String endDuration; } 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 2c04a80..fe28fbe 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 @@ -25,6 +25,9 @@ import java.time.LocalDateTime; @Schema(name = "DebtRepaymentPlan对象", title = "债务还款计划表", description = "债务还款计划表") public class DebtRepaymentPlan extends BaseEntity { + @Schema(name = "userId", title = "绑定的用户id") + private Long userId; + @Schema(name = "installmentNumber", title = "债务金额") private BigDecimal installmentNumber; diff --git a/dao/src/main/java/cn/bunny/dao/entity/financial/SavingGoal.java b/dao/src/main/java/cn/bunny/dao/entity/financial/SavingGoal.java index 8a61844..f61a6ad 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/financial/SavingGoal.java +++ b/dao/src/main/java/cn/bunny/dao/entity/financial/SavingGoal.java @@ -36,8 +36,11 @@ public class SavingGoal extends BaseEntity { @Schema(name = "amount", title = "目标金额") private BigDecimal amount; - @Schema(name = "duration", title = "目标时长") - private String duration; + @Schema(name = "startDuration", title = "开始目标时长") + private String startDuration; + + @Schema(name = "endDuration", title = "结束目标时长") + private String endDuration; } diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtRepaymentPlanVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtRepaymentPlanVo.java index 08a99a9..4264ae1 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtRepaymentPlanVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtRepaymentPlanVo.java @@ -1,6 +1,9 @@ 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.*; @@ -13,7 +16,15 @@ import java.time.LocalDateTime; @NoArgsConstructor @Builder @Schema(name = "DebtRepaymentPlanVo对象", title = "债务还款计划返回对象", description = "债务还款计划返回对象") -public class DebtRepaymentPlanVo extends BaseVo { +public class DebtRepaymentPlanVo extends BaseUserVo { + + @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 = "installmentNumber", title = "债务金额") private BigDecimal installmentNumber; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtTrackingVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtTrackingVo.java index 1357ce1..79fda1c 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtTrackingVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtTrackingVo.java @@ -1,6 +1,9 @@ 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.*; @@ -13,11 +16,16 @@ import java.time.LocalDateTime; @NoArgsConstructor @Builder @Schema(name = "DebtTrackingVo对象", title = "债务追踪返回内容", description = "债务追踪返回内容") -public class DebtTrackingVo extends BaseVo { +public class DebtTrackingVo extends BaseUserVo { @Schema(name = "userId", title = "绑定的用户") + @JsonFormat(shape = JsonFormat.Shape.STRING) + @JSONField(serializeUsing = ToStringSerializer.class) private Long userId; + @Schema(name = "username", title = "用户名") + private String username; + @Schema(name = "debtorName", title = "债务人姓名") private String debtorName; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/SavingGoalVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/SavingGoalVo.java index 08fc113..8fc5700 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/SavingGoalVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/SavingGoalVo.java @@ -1,6 +1,9 @@ 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,16 @@ import java.math.BigDecimal; @NoArgsConstructor @Builder @Schema(name = "SavingGoalVo对象", title = "用户储值返回内容", description = "用户储值返回内容") -public class SavingGoalVo extends BaseVo { - - @Schema(name = "id", title = "主键") - private Long id; +public class SavingGoalVo extends BaseUserVo { @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 = "statusType", title = "完成状态") private String statusType; @@ -29,7 +34,10 @@ public class SavingGoalVo extends BaseVo { @Schema(name = "amount", title = "目标金额") private BigDecimal amount; - @Schema(name = "duration", title = "目标时长") - private String duration; + @Schema(name = "startDuration", title = "开始目标时长") + private String startDuration; + + @Schema(name = "endDuration", title = "结束目标时长") + private String endDuration; } \ No newline at end of file diff --git a/service/src/main/java/cn/bunny/services/controller/financial/DebtRepaymentPlanController.java b/service/src/main/java/cn/bunny/services/controller/financial/DebtRepaymentPlanController.java index 8725ad0..d062334 100644 --- a/service/src/main/java/cn/bunny/services/controller/financial/DebtRepaymentPlanController.java +++ b/service/src/main/java/cn/bunny/services/controller/financial/DebtRepaymentPlanController.java @@ -1,8 +1,8 @@ package cn.bunny.services.controller.financial; -import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanAddDto; -import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanDto; -import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanUpdateDto; +import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanAddDto; +import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanDto; +import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanUpdateDto; import cn.bunny.dao.entity.financial.DebtRepaymentPlan; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.Result; 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 395b893..c5b17ee 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 @@ -1,8 +1,8 @@ package cn.bunny.services.controller.financial; -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.dto.financial.savingGoal.admin.SavingGoalAddDto; +import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalDto; +import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalUpdateDto; import cn.bunny.dao.entity.financial.SavingGoal; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.Result; 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 251c5df..93d1ceb 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 @@ -1,6 +1,6 @@ package cn.bunny.services.mapper.financial; -import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanDto; +import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanDto; import cn.bunny.dao.entity.financial.DebtRepaymentPlan; import cn.bunny.dao.vo.financial.admin.DebtRepaymentPlanVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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 e8ee7da..34a0db6 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 @@ -1,6 +1,6 @@ package cn.bunny.services.mapper.financial; -import cn.bunny.dao.dto.financial.savingGoal.SavingGoalDto; +import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalDto; import cn.bunny.dao.entity.financial.SavingGoal; import cn.bunny.dao.vo.financial.admin.SavingGoalVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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 55c13c0..41ba13a 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 @@ -1,8 +1,8 @@ package cn.bunny.services.service.financial; -import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanAddDto; -import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanDto; -import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanUpdateDto; +import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanAddDto; +import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanDto; +import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanUpdateDto; import cn.bunny.dao.entity.financial.DebtRepaymentPlan; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.vo.financial.admin.DebtRepaymentPlanVo; 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 7101682..251f522 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 @@ -1,8 +1,8 @@ package cn.bunny.services.service.financial; -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.dto.financial.savingGoal.admin.SavingGoalAddDto; +import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalDto; +import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalUpdateDto; import cn.bunny.dao.entity.financial.SavingGoal; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.vo.financial.admin.SavingGoalVo; 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 4c6092f..fdf3436 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 @@ -1,8 +1,8 @@ package cn.bunny.services.service.financial.impl; -import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanAddDto; -import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanDto; -import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanUpdateDto; +import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanAddDto; +import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanDto; +import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanUpdateDto; import cn.bunny.dao.entity.financial.DebtRepaymentPlan; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.vo.financial.admin.DebtRepaymentPlanVo; 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 efa7c29..eea92d1 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 @@ -1,8 +1,8 @@ package cn.bunny.services.service.financial.impl; -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.dto.financial.savingGoal.admin.SavingGoalAddDto; +import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalDto; +import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalUpdateDto; import cn.bunny.dao.entity.financial.SavingGoal; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.vo.financial.admin.SavingGoalVo; diff --git a/service/src/main/resources/mapper/financial/DebtRepaymentPlanMapper.xml b/service/src/main/resources/mapper/financial/DebtRepaymentPlanMapper.xml index 87466a1..d62b8a8 100644 --- a/service/src/main/resources/mapper/financial/DebtRepaymentPlanMapper.xml +++ b/service/src/main/resources/mapper/financial/DebtRepaymentPlanMapper.xml @@ -5,6 +5,7 @@ + @@ -29,6 +30,7 @@ create_user.username as create_username, update_user.username as update_username from t_debt_repayment_plan 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 diff --git a/service/src/main/resources/mapper/financial/SavingGoalMapper.xml b/service/src/main/resources/mapper/financial/SavingGoalMapper.xml index 3ad982d..a6fbb21 100644 --- a/service/src/main/resources/mapper/financial/SavingGoalMapper.xml +++ b/service/src/main/resources/mapper/financial/SavingGoalMapper.xml @@ -14,7 +14,8 @@ - + + @@ -26,21 +27,20 @@