feat: 债务回收管理代码生产

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.debtCollectionManagement.DebtCollectionManagementAddDto;
-import cn.bunny.dao.dto.financial.budgetCategory.BudgetCategoryDto;
+import cn.bunny.dao.dto.financial.debtCollectionManagement.DebtCollectionManagementDto;
-import cn.bunny.dao.dto.financial.budgetCategory.BudgetCategoryUpdateDto;
+import cn.bunny.dao.dto.financial.debtCollectionManagement.DebtCollectionManagementUpdateDto;
-import cn.bunny.dao.entity.financial.BudgetCategory;
+import cn.bunny.dao.entity.financial.DebtCollectionManagement;
-import cn.bunny.dao.vo.financial.BudgetCategoryVo;
+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<?> originalClass = DebtCollectionManagement.class;
-        Class<?> dtoClass = BudgetCategoryDto.class;
+        Class<?> dtoClass = DebtCollectionManagementDto.class;
-        Class<?> addDtoClass = BudgetCategoryAddDto.class;
+        Class<?> addDtoClass = DebtCollectionManagementAddDto.class;
-        Class<?> updateDtoClass = BudgetCategoryUpdateDto.class;
+        Class<?> updateDtoClass = DebtCollectionManagementUpdateDto.class;
-        Class<?> voClass = BudgetCategoryVo.class;
+        Class<?> voClass = DebtCollectionManagementVo.class;
 
         // 设置velocity资源加载器
         Properties prop = new Properties();

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;
+
+}

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;
+
+}
+
+

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;
+
+}

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;
 
 }

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;

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 io.swagger.v3.oas.annotations.media.Schema;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 债务回收管理表
@@ -25,22 +22,22 @@ import lombok.experimental.Accessors;
 @Setter
 @Accessors(chain = true)
 @TableName("t_debt_collection_management")
-@ApiModel(value = "DebtCollectionManagement对象", description = "债务回收管理表")
+@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;
 
 }

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;
+
+}

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;

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;

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 cn.bunny.dao.dto.financial.debtCollectionManagement.DebtCollectionManagementAddDto;
-import org.springframework.web.bind.annotation.RestController;
+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;
 
 /**
  * <p>
- * 债务回收管理表 前端控制器
+ * 债务回收管理表表 前端控制器
  * </p>
  *
  * @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<Result<PageResult<DebtCollectionManagementVo>>> getDebtCollectionManagementList(
+            @Parameter(name = "page", description = "当前页", required = true)
+            @PathVariable("page") Integer page,
+            @Parameter(name = "limit", description = "每页记录数", required = true)
+            @PathVariable("limit") Integer limit,
+            DebtCollectionManagementDto dto) {
+        Page<DebtCollectionManagement> pageParams = new Page<>(page, limit);
+        PageResult<DebtCollectionManagementVo> pageResult = debtCollectionManagementService.getDebtCollectionManagementList(pageParams, dto);
+        return Mono.just(Result.success(pageResult));
+    }
+
+    @Operation(summary = "添加债务回收管理表", description = "添加债务回收管理表")
+    @PostMapping("addDebtCollectionManagement")
+    public Mono<Result<String>> addDebtCollectionManagement(@Valid @RequestBody DebtCollectionManagementAddDto dto) {
+        debtCollectionManagementService.addDebtCollectionManagement(dto);
+        return Mono.just(Result.success(ResultCodeEnum.ADD_SUCCESS));
+    }
+
+    @Operation(summary = "更新债务回收管理表", description = "更新债务回收管理表")
+    @PutMapping("updateDebtCollectionManagement")
+    public Mono<Result<String>> updateDebtCollectionManagement(@Valid @RequestBody DebtCollectionManagementUpdateDto dto) {
+        debtCollectionManagementService.updateDebtCollectionManagement(dto);
+        return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS));
+    }
+
+    @Operation(summary = "删除债务回收管理表", description = "删除债务回收管理表")
+    @DeleteMapping("deleteDebtCollectionManagement")
+    public Mono<Result<String>> deleteDebtCollectionManagement(@RequestBody List<Long> ids) {
+        debtCollectionManagementService.deleteDebtCollectionManagement(ids);
+        return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS));
+    }
 }

service/src/main/java/cn/bunny/services/mapper/financial/BudgetCategoryMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.financial;
 
 import cn.bunny.dao.dto.financial.budgetCategory.BudgetCategoryDto;
 import cn.bunny.dao.entity.financial.BudgetCategory;

service/src/main/java/cn/bunny/services/mapper/financial/DebtCollectionManagementMapper.java

@@ -1,8 +1,15 @@
 package cn.bunny.services.mapper.financial;
 
+import cn.bunny.dao.dto.financial.debtCollectionManagement.DebtCollectionManagementDto;
 import cn.bunny.dao.entity.financial.DebtCollectionManagement;
+import cn.bunny.dao.vo.financial.DebtCollectionManagementVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -10,9 +17,24 @@ import org.apache.ibatis.annotations.Mapper;
  * </p>
  *
  * @author Bunny
- * @since 2024-11-11
+ * @since 2024-11-11 16:13:55
  */
 @Mapper
 public interface DebtCollectionManagementMapper extends BaseMapper<DebtCollectionManagement> {
 
+    /**
+     * * 分页查询债务回收管理表内容
+     *
+     * @param pageParams 债务回收管理表分页参数
+     * @param dto        债务回收管理表查询表单
+     * @return 债务回收管理表分页结果
+     */
+    IPage<DebtCollectionManagementVo> selectListByPage(@Param("page") Page<DebtCollectionManagement> pageParams, @Param("dto") DebtCollectionManagementDto dto);
+
+    /**
+     * 物理删除债务回收管理表
+     *
+     * @param ids 删除 id 列表
+     */
+    void deleteBatchIdsWithPhysics(List<Long> ids);
 }

service/src/main/java/cn/bunny/services/service/financial/BudgetCategoryService.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.service;
+package cn.bunny.services.service.financial;
 
 import cn.bunny.dao.dto.financial.budgetCategory.BudgetCategoryAddDto;
 import cn.bunny.dao.dto.financial.budgetCategory.BudgetCategoryDto;

service/src/main/java/cn/bunny/services/service/financial/DebtCollectionManagementService.java

@@ -1,7 +1,16 @@
 package cn.bunny.services.service.financial;
 
+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.vo.financial.DebtCollectionManagementVo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import jakarta.validation.Valid;
+
+import java.util.List;
 
 /**
  * <p>
@@ -9,8 +18,35 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author Bunny
- * @since 2024-11-11
+ * @since 2024-11-11 16:13:55
  */
 public interface DebtCollectionManagementService extends IService<DebtCollectionManagement> {
 
+    /**
+     * * 获取债务回收管理表列表
+     *
+     * @return 债务回收管理表返回列表
+     */
+    PageResult<DebtCollectionManagementVo> getDebtCollectionManagementList(Page<DebtCollectionManagement> pageParams, DebtCollectionManagementDto dto);
+
+    /**
+     * * 添加债务回收管理表
+     *
+     * @param dto 添加表单
+     */
+    void addDebtCollectionManagement(@Valid DebtCollectionManagementAddDto dto);
+
+    /**
+     * * 更新债务回收管理表
+     *
+     * @param dto 更新表单
+     */
+    void updateDebtCollectionManagement(@Valid DebtCollectionManagementUpdateDto dto);
+
+    /**
+     * * 删除|批量删除债务回收管理表类型
+     *
+     * @param ids 删除id列表
+     */
+    void deleteDebtCollectionManagement(List<Long> ids);
 }

service/src/main/java/cn/bunny/services/service/financial/DebtRepaymentPlanService.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.service;
+package cn.bunny.services.service.financial;
 
 import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanAddDto;
 import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanDto;

service/src/main/java/cn/bunny/services/service/financial/impl/BudgetCategoryServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.service.impl;
+package cn.bunny.services.service.financial.impl;
 
 import cn.bunny.dao.dto.financial.budgetCategory.BudgetCategoryAddDto;
 import cn.bunny.dao.dto.financial.budgetCategory.BudgetCategoryDto;
@@ -6,8 +6,8 @@ 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.services.mapper.BudgetCategoryMapper;
+import cn.bunny.services.mapper.financial.BudgetCategoryMapper;
-import cn.bunny.services.service.BudgetCategoryService;
+import cn.bunny.services.service.financial.BudgetCategoryService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

service/src/main/java/cn/bunny/services/service/financial/impl/DebtCollectionManagementServiceImpl.java

@@ -1,20 +1,85 @@
 package cn.bunny.services.service.financial.impl;
 
+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.vo.financial.DebtCollectionManagementVo;
 import cn.bunny.services.mapper.financial.DebtCollectionManagementMapper;
 import cn.bunny.services.service.financial.DebtCollectionManagementService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jakarta.validation.Valid;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 债务回收管理表 服务实现类
  * </p>
  *
  * @author Bunny
- * @since 2024-11-11
+ * @since 2024-11-11 16:13:55
  */
 @Service
 public class DebtCollectionManagementServiceImpl extends ServiceImpl<DebtCollectionManagementMapper, DebtCollectionManagement> implements DebtCollectionManagementService {
 
+    /**
+     * * 债务回收管理表 服务实现类
+     *
+     * @param pageParams 债务回收管理表分页查询page对象
+     * @param dto        债务回收管理表分页查询对象
+     * @return 查询分页债务回收管理表返回对象
+     */
+    @Override
+    public PageResult<DebtCollectionManagementVo> getDebtCollectionManagementList(Page<DebtCollectionManagement> pageParams, DebtCollectionManagementDto dto) {
+        IPage<DebtCollectionManagementVo> page = baseMapper.selectListByPage(pageParams, dto);
+
+        return PageResult.<DebtCollectionManagementVo>builder()
+                .list(page.getRecords())
+                .pageNo(page.getCurrent())
+                .pageSize(page.getSize())
+                .total(page.getTotal())
+                .build();
+    }
+
+    /**
+     * 添加债务回收管理表
+     *
+     * @param dto 债务回收管理表添加
+     */
+    @Override
+    public void addDebtCollectionManagement(@Valid DebtCollectionManagementAddDto dto) {
+        // 保存数据
+        DebtCollectionManagement debtCollectionManagement = new DebtCollectionManagement();
+        BeanUtils.copyProperties(dto, debtCollectionManagement);
+        save(debtCollectionManagement);
+    }
+
+    /**
+     * 更新债务回收管理表
+     *
+     * @param dto 债务回收管理表更新
+     */
+    @Override
+    public void updateDebtCollectionManagement(@Valid DebtCollectionManagementUpdateDto dto) {
+        // 更新内容
+        DebtCollectionManagement debtCollectionManagement = new DebtCollectionManagement();
+        BeanUtils.copyProperties(dto, debtCollectionManagement);
+        updateById(debtCollectionManagement);
+    }
+
+    /**
+     * 删除|批量删除债务回收管理表
+     *
+     * @param ids 删除id列表
+     */
+    @Override
+    public void deleteDebtCollectionManagement(List<Long> ids) {
+        baseMapper.deleteBatchIdsWithPhysics(ids);
+    }
 }

service/src/main/java/cn/bunny/services/service/financial/impl/DebtRepaymentPlanServiceImpl.java

@@ -7,7 +7,7 @@ import cn.bunny.dao.entity.financial.DebtRepaymentPlan;
 import cn.bunny.dao.pojo.result.PageResult;
 import cn.bunny.dao.vo.financial.DebtRepaymentPlanVo;
 import cn.bunny.services.mapper.financial.DebtRepaymentPlanMapper;
-import cn.bunny.services.service.DebtRepaymentPlanService;
+import cn.bunny.services.service.financial.DebtRepaymentPlanService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

service/src/main/resources/mapper/financial/BudgetCategoryMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.BudgetCategoryMapper">
+<mapper namespace="cn.bunny.services.mapper.financial.BudgetCategoryMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.financial.BudgetCategory">

service/src/main/resources/mapper/financial/DebtCollectionManagementMapper.xml

@@ -5,21 +5,60 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.financial.DebtCollectionManagement">
         <id column="id" property="id"/>
-        <result column="debt_id" property="debtId" />
+        <id column="create_time" property="createTime"/>
-        <result column="recovery_date" property="recoveryDate" />
+        <id column="update_time" property="updateTime"/>
-        <result column="recovery_amount" property="recoveryAmount" />
+        <id column="create_user" property="createUser"/>
-        <result column="recovery_method" property="recoveryMethod" />
+        <id column="update_user" property="updateUser"/>
-        <result column="notes" property="notes" />
+        <id column="is_deleted" property="isDeleted"/>
-        <result column="create_user" property="createUser" />
+        <id column="debt_id" property="debtId"/>
-        <result column="create_time" property="createTime" />
+        <id column="recovery_date" property="recoveryDate"/>
-        <result column="update_user" property="updateUser" />
+        <id column="recovery_amount" property="recoveryAmount"/>
-        <result column="update_time" property="updateTime" />
+        <id column="recovery_method" property="recoveryMethod"/>
-        <result column="is_deleted" property="isDeleted" />
+        <id column="notes" property="notes"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, debt_id, recovery_date, recovery_amount, recovery_method, notes, create_user, create_time, update_user, update_time, is_deleted
+        id, create_time, update_time, create_user, update_user, is_deleted, debt_id, recovery_date, recovery_amount, recovery_method, notes
     </sql>
 
+    <!-- 分页查询债务回收管理表内容 -->
+    <select id="selectListByPage" resultType="cn.bunny.dao.vo.financial.DebtCollectionManagementVo">
+        select
+        base.*,
+        create_user.username as create_username,
+        update_user.username as update_username
+        from t_debt_collection_management base
+        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
+        <where>
+            base.is_deleted = 0
+            <if test="dto.debtId != null and dto.debtId != ''">
+                and base.debt_id like CONCAT('%',#{dto.debtId},'%')
+            </if>
+            <if test="dto.recoveryDate != null and dto.recoveryDate != ''">
+                and base.recovery_date like CONCAT('%',#{dto.recoveryDate},'%')
+            </if>
+            <if test="dto.recoveryAmount != null and dto.recoveryAmount != ''">
+                and base.recovery_amount like CONCAT('%',#{dto.recoveryAmount},'%')
+            </if>
+            <if test="dto.recoveryMethod != null and dto.recoveryMethod != ''">
+                and base.recovery_method like CONCAT('%',#{dto.recoveryMethod},'%')
+            </if>
+            <if test="dto.notes != null and dto.notes != ''">
+                and base.notes like CONCAT('%',#{dto.notes},'%')
+            </if>
+        </where>
+    </select>
+
+    <!-- 物理删除债务回收管理表 -->
+    <delete id="deleteBatchIdsWithPhysics">
+        delete
+        from t_debt_collection_management
+        where id in
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+
 </mapper>