push

40c4fdad · zhangxingmin · 18326eba · 40c4fdad · 40c4fdad · 40c4fdad
Commit 40c4fdad authored Jan 13, 2026 by zhangxingmin
10 changed files
--- a/yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiPremiumRemittanceController.java
+++ b/yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiPremiumRemittanceController.java
 package com.yd.csf.api.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yd.common.result.Result;
 import com.yd.csf.api.service.ApiPremiumRemittanceService;
 import com.yd.csf.feign.client.premiumremittance.ApiPremiumRemittanceFeignClient;
 import com.yd.csf.feign.dto.premiumremittance.ApiPremiumRemittanceDto;
+import com.yd.csf.feign.request.premiumremittance.ApiPremiumRemittancePageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,6 +26,16 @@ public class ApiPremiumRemittanceController implements ApiPremiumRemittanceFeign
    private ApiPremiumRemittanceService apiPremiumRemittanceService;
    /**
+     * 分页列表查询-保费对账汇款记录信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiPremiumRemittanceDto>> page(ApiPremiumRemittancePageRequest request) {
+        return apiPremiumRemittanceService.page(request);
+    }
+    /**
     * 添加-单个保费对账汇款记录信息
     * @param request
     * @return

--- a/yd-csf-api/src/main/java/com/yd/csf/api/service/ApiPremiumRemittanceService.java
+++ b/yd-csf-api/src/main/java/com/yd/csf/api/service/ApiPremiumRemittanceService.java
 package com.yd.csf.api.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yd.common.result.Result;
 import com.yd.csf.feign.dto.premiumremittance.ApiPremiumRemittanceDto;
+import com.yd.csf.feign.request.premiumremittance.ApiPremiumRemittancePageRequest;
 import com.yd.csf.service.model.PremiumRemittance;
 import java.util.List;
 public interface ApiPremiumRemittanceService {
+    Result<IPage<ApiPremiumRemittanceDto>> page(ApiPremiumRemittancePageRequest request);
    Result add(ApiPremiumRemittanceDto request);
    Result edit(ApiPremiumRemittanceDto request);

--- a/yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiPremiumRemittanceServiceImpl.java
+++ b/yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiPremiumRemittanceServiceImpl.java
 package com.yd.csf.api.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yd.common.enums.CommonEnum;
 import com.yd.common.exception.BusinessException;
 import com.yd.common.result.Result;
@@ -8,6 +10,8 @@ import com.yd.csf.api.service.ApiPremiumRemittanceFileService;
 import com.yd.csf.api.service.ApiPremiumRemittanceService;
 import com.yd.csf.feign.dto.premiumremittance.ApiPremiumRemittanceDto;
 import com.yd.csf.feign.dto.premiumremittancefile.ApiPremiumRemittanceFileDto;
+import com.yd.csf.feign.request.premiumremittance.ApiPremiumRemittancePageRequest;
+import com.yd.csf.feign.response.premiumreconciliation.ApiPremiumReconciliationPageResponse;
 import com.yd.csf.service.dto.PremiumRemittanceDto;
 import com.yd.csf.service.model.PremiumRemittance;
 import com.yd.csf.service.service.IPremiumRemittanceService;
@@ -34,6 +38,18 @@ public class ApiPremiumRemittanceServiceImpl implements ApiPremiumRemittanceServ
    private ApiPremiumRemittanceFileService apiPremiumRemittanceFileService;
    /**
+     * 分页列表查询-保费对账汇款记录信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiPremiumRemittanceDto>> page(ApiPremiumRemittancePageRequest request) {
+        Page<ApiPremiumRemittanceDto> page = new Page<>(request.getPageNo(), request.getPageSize());
+        IPage<ApiPremiumRemittanceDto> iPage = iPremiumRemittanceService.page(page, request);
+        return Result.success(iPage);
+    }
+    /**
     * 添加-单个保费对账汇款记录信息
     * @param request
     * @return

--- a/yd-csf-feign/src/main/java/com/yd/csf/feign/client/premiumremittance/ApiPremiumRemittanceFeignClient.java
+++ b/yd-csf-feign/src/main/java/com/yd/csf/feign/client/premiumremittance/ApiPremiumRemittanceFeignClient.java
@@ -3,6 +3,8 @@ package com.yd.csf.feign.client.premiumremittance;
 import com.yd.common.result.Result;
 import com.yd.csf.feign.dto.premiumremittance.ApiPremiumRemittanceDto;
 import com.yd.csf.feign.fallback.premiumremittance.ApiPremiumRemittanceFeignFallbackFactory;
+import com.yd.csf.feign.request.premiumremittance.ApiPremiumRemittancePageRequest;
+import com.yd.csf.feign.request.premiumremittancefile.ApiPremiumRemittanceFilePageRequest;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -15,6 +17,14 @@ import javax.validation.constraints.NotBlank;
 public interface ApiPremiumRemittanceFeignClient {
    /**
+     * 分页列表查询-保费对账汇款记录信息
+     * @param request
+     * @return
+     */
+    @PostMapping("/page")
+    Result page(@RequestBody ApiPremiumRemittancePageRequest request);
+    /**
     * 添加-单个保费对账汇款记录信息
     * @param request
     * @return

--- a/yd-csf-feign/src/main/java/com/yd/csf/feign/fallback/premiumremittance/ApiPremiumRemittanceFeignFallbackFactory.java
+++ b/yd-csf-feign/src/main/java/com/yd/csf/feign/fallback/premiumremittance/ApiPremiumRemittanceFeignFallbackFactory.java
@@ -3,6 +3,7 @@ package com.yd.csf.feign.fallback.premiumremittance;
 import com.yd.common.result.Result;
 import com.yd.csf.feign.client.premiumremittance.ApiPremiumRemittanceFeignClient;
 import com.yd.csf.feign.dto.premiumremittance.ApiPremiumRemittanceDto;
+import com.yd.csf.feign.request.premiumremittance.ApiPremiumRemittancePageRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
@@ -19,6 +20,11 @@ public class ApiPremiumRemittanceFeignFallbackFactory implements FallbackFactory
    public ApiPremiumRemittanceFeignClient create(Throwable cause) {
        return new ApiPremiumRemittanceFeignClient() {
            @Override
+            public Result page(ApiPremiumRemittancePageRequest request) {
+                return null;
+            }
+            @Override
            public Result add(ApiPremiumRemittanceDto request) {
                return null;
            }

--- a/yd-csf-feign/src/main/java/com/yd/csf/feign/request/premiumremittance/ApiPremiumRemittancePageRequest.java
+++ b/yd-csf-feign/src/main/java/com/yd/csf/feign/request/premiumremittance/ApiPremiumRemittancePageRequest.java
+package com.yd.csf.feign.request.premiumremittance;
+import com.yd.common.dto.PageDto;
+import lombok.Data;
+@Data
+public class ApiPremiumRemittancePageRequest extends PageDto {
+    /**
+     * 保费对账记录表唯一业务ID
+     */
+    private String premiumReconciliationBizId;
+}
--- a/yd-csf-service/src/main/java/com/yd/csf/service/dao/PremiumRemittanceMapper.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/dao/PremiumRemittanceMapper.java
 package com.yd.csf.service.dao;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.csf.feign.dto.premiumremittance.ApiPremiumRemittanceDto;
+import com.yd.csf.feign.request.premiumremittance.ApiPremiumRemittancePageRequest;
 import com.yd.csf.service.model.PremiumRemittance;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 /**
 * <p>
@@ -13,4 +18,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface PremiumRemittanceMapper extends BaseMapper<PremiumRemittance> {
+    IPage<ApiPremiumRemittanceDto> page(@Param("page") Page<ApiPremiumRemittanceDto> page,
+                                        @Param("request") ApiPremiumRemittancePageRequest request);
 }
--- a/yd-csf-service/src/main/java/com/yd/csf/service/service/IPremiumRemittanceService.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/service/IPremiumRemittanceService.java
 package com.yd.csf.service.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.csf.feign.dto.premiumremittance.ApiPremiumRemittanceDto;
+import com.yd.csf.feign.request.premiumremittance.ApiPremiumRemittancePageRequest;
 import com.yd.csf.service.dto.PremiumRemittanceDto;
 import com.yd.csf.service.model.PremiumRemittance;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -16,6 +20,9 @@ import java.util.List;
 */
 public interface IPremiumRemittanceService extends IService<PremiumRemittance> {
+    IPage<ApiPremiumRemittanceDto> page(Page<ApiPremiumRemittanceDto> page,
+                                        ApiPremiumRemittancePageRequest request);
    List<PremiumRemittance> queryList(PremiumRemittanceDto dto);
    PremiumRemittance queryOne(String premiumRemittanceBizId);

--- a/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/PremiumRemittanceServiceImpl.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/PremiumRemittanceServiceImpl.java
 package com.yd.csf.service.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.csf.feign.dto.premiumremittance.ApiPremiumRemittanceDto;
+import com.yd.csf.feign.request.premiumremittance.ApiPremiumRemittancePageRequest;
 import com.yd.csf.service.dto.PremiumRemittanceDto;
 import com.yd.csf.service.model.PremiumRemittance;
 import com.yd.csf.service.dao.PremiumRemittanceMapper;
@@ -23,6 +27,12 @@ import java.util.List;
 @Service
 public class PremiumRemittanceServiceImpl extends ServiceImpl<PremiumRemittanceMapper, PremiumRemittance> implements IPremiumRemittanceService {
+    @Override
+    public IPage<ApiPremiumRemittanceDto> page(Page<ApiPremiumRemittanceDto> page,
+                                               ApiPremiumRemittancePageRequest request) {
+        return baseMapper.page(page,request);
+    }
    /**
     * 查询列表
     * @param dto

--- a/yd-csf-service/src/main/resources/mappers/PremiumRemittanceMapper.xml
+++ b/yd-csf-service/src/main/resources/mappers/PremiumRemittanceMapper.xml
@@ -2,4 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yd.csf.service.dao.PremiumRemittanceMapper">
+    <select id="page" resultType="com.yd.csf.feign.dto.premiumremittance.ApiPremiumRemittanceDto">
+        select pr.* from premium_remittance pr
+        <where>
+            <if test="request.premiumReconciliationBizId != null and request.premiumReconciliationBizId != ''">
+                and pr.premium_reconciliation_biz_id = #{request.premiumReconciliationBizId}
+            </if>
+            and pr.is_deleted = 0
+        </where>
+    </select>
 </mapper>