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 556abd7..41abd14 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 @@ -3,11 +3,11 @@ package cn.bunny.common.generator.generator; import cn.bunny.common.generator.entity.BaseField; import cn.bunny.common.generator.entity.BaseResultMap; import cn.bunny.common.generator.utils.GeneratorCodeUtils; -import cn.bunny.dao.dto.financial.budgetCategory.BudgetCategoryAddDto; -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.vo.financial.BudgetCategoryVo; +import cn.bunny.dao.dto.financial.debtCollectionManagement.DebtCollectionManagementAddDto; +import cn.bunny.dao.dto.financial.debtCollectionManagement.DebtCollectionManagementDto; +import cn.bunny.dao.dto.financial.debtCollectionManagement.DebtCollectionManagementUpdateDto; +import cn.bunny.dao.entity.financial.DebtCollectionManagement; +import cn.bunny.dao.vo.financial.DebtCollectionManagementVo; import com.baomidou.mybatisplus.annotation.TableName; import com.google.common.base.CaseFormat; import io.swagger.v3.oas.annotations.media.Schema; @@ -52,11 +52,11 @@ public class WebGeneratorCode { public static String resourceMapperPath = "D:\\MyFolder\\auth\\financial-web-server\\service\\src\\main\\resources\\mapper\\financial\\"; public static void main(String[] args) throws Exception { - Class> originalClass = BudgetCategory.class; - Class> dtoClass = BudgetCategoryDto.class; - Class> addDtoClass = BudgetCategoryAddDto.class; - Class> updateDtoClass = BudgetCategoryUpdateDto.class; - Class> voClass = BudgetCategoryVo.class; + Class> originalClass = DebtCollectionManagement.class; + Class> dtoClass = DebtCollectionManagementDto.class; + Class> addDtoClass = DebtCollectionManagementAddDto.class; + Class> updateDtoClass = DebtCollectionManagementUpdateDto.class; + Class> voClass = DebtCollectionManagementVo.class; // 设置velocity资源加载器 Properties prop = new Properties(); diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/debtCollectionManagement/DebtCollectionManagementAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/debtCollectionManagement/DebtCollectionManagementAddDto.java new file mode 100644 index 0000000..238e541 --- /dev/null +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/debtCollectionManagement/DebtCollectionManagementAddDto.java @@ -0,0 +1,43 @@ +package cn.bunny.dao.dto.financial.debtCollectionManagement; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Schema(name = "DebtCollectionManagementAddDto对象", title = "债务回收管理添加", description = "债务回收管理添加") +public class DebtCollectionManagementAddDto { + + @Schema(name = "debtId", title = "债务ID") + @NotNull(message = "债务不能为空") + private Long debtId; + + @Schema(name = "recoveryDate", title = "回收日期") + @NotNull(message = "回收日期不能为空") + private LocalDateTime recoveryDate; + + @Schema(name = "recoveryAmount", title = "回收金额") + @NotNull(message = "回收金额不能为空") + private BigDecimal recoveryAmount; + + @Schema(name = "recoveryMethod", title = "回收方式") + @NotNull(message = "回收方式不能为空") + @NotBlank(message = "还款状态不能为空") + private String recoveryMethod; + + @Schema(name = "notes", title = "备注") + @NotNull(message = "备注不能为空") + @NotBlank(message = "备注不能为空") + private String notes; + +} diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/debtCollectionManagement/DebtCollectionManagementDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/debtCollectionManagement/DebtCollectionManagementDto.java new file mode 100644 index 0000000..a39f479 --- /dev/null +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/debtCollectionManagement/DebtCollectionManagementDto.java @@ -0,0 +1,36 @@ +package cn.bunny.dao.dto.financial.debtCollectionManagement; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Schema(name = "DebtCollectionManagementDto对象", title = "债务回收管理查询", description = "债务回收管理查询") +public class DebtCollectionManagementDto { + + @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; + +} + + diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/debtCollectionManagement/DebtCollectionManagementUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/debtCollectionManagement/DebtCollectionManagementUpdateDto.java new file mode 100644 index 0000000..96f8499 --- /dev/null +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/debtCollectionManagement/DebtCollectionManagementUpdateDto.java @@ -0,0 +1,47 @@ +package cn.bunny.dao.dto.financial.debtCollectionManagement; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Schema(name = "DebtCollectionManagementUpdateDto对象", title = "债务回收管理更新", description = "债务回收管理更新") +public class DebtCollectionManagementUpdateDto { + + @Schema(name = "id", title = "主键") + @NotNull(message = "id不能为空") + private Long id; + + @Schema(name = "debtId", title = "债务ID") + @NotNull(message = "债务不能为空") + private Long debtId; + + @Schema(name = "recoveryDate", title = "回收日期") + @NotNull(message = "回收日期不能为空") + private LocalDateTime recoveryDate; + + @Schema(name = "recoveryAmount", title = "回收金额") + @NotNull(message = "回收金额不能为空") + private BigDecimal recoveryAmount; + + @Schema(name = "recoveryMethod", title = "回收方式") + @NotNull(message = "回收方式不能为空") + @NotBlank(message = "还款状态不能为空") + private String recoveryMethod; + + @Schema(name = "notes", title = "备注") + @NotNull(message = "备注不能为空") + @NotBlank(message = "备注不能为空") + private String notes; + +} \ No newline at end of file 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 7a55dcb..07ca213 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 @@ -1,6 +1,7 @@ package cn.bunny.dao.dto.financial.debtRepaymentPlan; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; @@ -39,6 +40,7 @@ public class DebtRepaymentPlanAddDto { @Schema(name = "paymentStatus", title = "还款状态") @NotNull(message = "还款状态不能为空") + @NotBlank(message = "还款状态不能为空") private String paymentStatus; -} \ No newline at end of file +} 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 a8a8fac..6c9d60e 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 @@ -1,8 +1,10 @@ package cn.bunny.dao.dto.financial.debtRepaymentPlan; -import cn.bunny.dao.common.vo.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/dao/src/main/java/cn/bunny/dao/entity/financial/DebtCollectionManagement.java b/dao/src/main/java/cn/bunny/dao/entity/financial/DebtCollectionManagement.java index f108eea..dbe273e 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/financial/DebtCollectionManagement.java +++ b/dao/src/main/java/cn/bunny/dao/entity/financial/DebtCollectionManagement.java @@ -1,18 +1,15 @@ 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 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 lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.time.LocalDateTime; + /** *
* 债务回收管理表 @@ -25,22 +22,22 @@ import lombok.experimental.Accessors; @Setter @Accessors(chain = true) @TableName("t_debt_collection_management") -@ApiModel(value = "DebtCollectionManagement对象", description = "债务回收管理表") -public class DebtCollectionManagement extends BaseEntity { +@Schema(name = "DebtCollectionManagement对象", title = "债务回收管理", description = "债务回收管理") +public class DebtCollectionManagement extends BaseEntity { - @ApiModelProperty("关联债务追踪表的债务ID") + @Schema(name = "debtId", title = "债务ID") private Long debtId; - @ApiModelProperty("回收日期") + @Schema(name = "recoveryDate", title = "回收日期") private LocalDateTime recoveryDate; - @ApiModelProperty("回收金额") + @Schema(name = "recoveryAmount", title = "回收金额") private BigDecimal recoveryAmount; - @ApiModelProperty("回收方式,如电话催收、法律诉讼等") + @Schema(name = "recoveryMethod", title = "回收方式") private String recoveryMethod; - @ApiModelProperty("备注") + @Schema(name = "notes", title = "备注") private String notes; } 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 new file mode 100644 index 0000000..c270634 --- /dev/null +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/DebtCollectionManagementVo.java @@ -0,0 +1,33 @@ +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/service/src/main/java/cn/bunny/services/controller/financial/DebtRepaymentPlanController.java b/service/src/main/java/cn/bunny/services/controller/DebtRepaymentPlanController.java similarity index 97% rename from service/src/main/java/cn/bunny/services/controller/financial/DebtRepaymentPlanController.java rename to service/src/main/java/cn/bunny/services/controller/DebtRepaymentPlanController.java index dd52940..1102305 100644 --- a/service/src/main/java/cn/bunny/services/controller/financial/DebtRepaymentPlanController.java +++ b/service/src/main/java/cn/bunny/services/controller/DebtRepaymentPlanController.java @@ -8,7 +8,7 @@ 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.services.service.DebtRepaymentPlanService; +import cn.bunny.services.service.financial.DebtRepaymentPlanService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; 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 a2505d1..2af3ba0 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 @@ -1,4 +1,4 @@ -package cn.bunny.services.controller; +package cn.bunny.services.controller.financial; import cn.bunny.dao.dto.financial.budgetCategory.BudgetCategoryAddDto; import cn.bunny.dao.dto.financial.budgetCategory.BudgetCategoryDto; @@ -8,7 +8,7 @@ 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.services.service.BudgetCategoryService; +import cn.bunny.services.service.financial.BudgetCategoryService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/service/src/main/java/cn/bunny/services/controller/financial/DebtCollectionManagementController.java b/service/src/main/java/cn/bunny/services/controller/financial/DebtCollectionManagementController.java index 1deb2f4..dfe3983 100644 --- a/service/src/main/java/cn/bunny/services/controller/financial/DebtCollectionManagementController.java +++ b/service/src/main/java/cn/bunny/services/controller/financial/DebtCollectionManagementController.java @@ -1,18 +1,72 @@ package cn.bunny.services.controller.financial; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import cn.bunny.dao.dto.financial.debtCollectionManagement.DebtCollectionManagementAddDto; +import cn.bunny.dao.dto.financial.debtCollectionManagement.DebtCollectionManagementDto; +import cn.bunny.dao.dto.financial.debtCollectionManagement.DebtCollectionManagementUpdateDto; +import cn.bunny.dao.entity.financial.DebtCollectionManagement; +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.DebtCollectionManagementVo; +import cn.bunny.services.service.financial.DebtCollectionManagementService; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import reactor.core.publisher.Mono; + +import java.util.List; /** *
- * 债务回收管理表 前端控制器 + * 债务回收管理表表 前端控制器 *
* * @author Bunny - * @since 2024-11-11 + * @since 2024-11-11 16:13:55 */ +@Tag(name = "债务回收管理表", description = "债务回收管理表相关接口") @RestController -@RequestMapping("/debtCollectionManagement") +@RequestMapping("admin/debtCollectionManagement") public class DebtCollectionManagementController { + @Autowired + private DebtCollectionManagementService debtCollectionManagementService; + + @Operation(summary = "分页查询债务回收管理表", description = "分页查询债务回收管理表") + @GetMapping("getDebtCollectionManagementList/{page}/{limit}") + public Mono@@ -10,9 +17,24 @@ import org.apache.ibatis.annotations.Mapper; *
* * @author Bunny - * @since 2024-11-11 + * @since 2024-11-11 16:13:55 */ @Mapper public interface DebtCollectionManagementMapper extends BaseMapper@@ -9,8 +18,35 @@ import com.baomidou.mybatisplus.extension.service.IService; *
* * @author Bunny - * @since 2024-11-11 + * @since 2024-11-11 16:13:55 */ public interface DebtCollectionManagementService extends IService* 债务回收管理表 服务实现类 *
* * @author Bunny - * @since 2024-11-11 + * @since 2024-11-11 16:13:55 */ @Service public class DebtCollectionManagementServiceImpl extends ServiceImpl