Просмотр исходного кода

通过选择页面的全选,实现数据选择。后续操作数据不生效

lipf 4 месяцев назад
Родитель
Сommit
6023e16d24

+ 27 - 0
commons/src/main/java/com/jzg/commons/entity/finance/po/InsPlyIncomeOrder.java

@@ -0,0 +1,27 @@
+package com.jzg.commons.entity.finance.po;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+@Data
+public class InsPlyIncomeOrder implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 5155333518962790214L;
+    /**
+     * 序号
+     */
+    private String id;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+    public InsPlyIncomeOrder(String id, String orderNo) {
+        this.id = id;
+        this.orderNo = orderNo;
+    }
+}

+ 29 - 0
commons/src/main/java/com/jzg/commons/entity/finance/po/InsPlyIncomeVO.java

@@ -0,0 +1,29 @@
+package com.jzg.commons.entity.finance.po;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class InsPlyIncomeVO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -3412493517813402683L;
+    private Page insPlyIncomePage;
+
+    /**
+     * 未分页的满足条件的所有数据集的id和订单编号
+     *
+     * @date 2026/5/23 9:50
+     */
+    private List<InsPlyIncomeOrder> insPlyIncomeOrders;
+
+    public InsPlyIncomeVO(Page insPlyIncomePage, List<InsPlyIncomeOrder> insPlyIncomeOrders){
+        this.insPlyIncomePage = insPlyIncomePage;
+        this.insPlyIncomeOrders = insPlyIncomeOrders;
+    }
+
+}

+ 9 - 2
tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -9,6 +9,8 @@ import com.jzg.commons.entity.finance.dto.ExportSuperviseSettlementExcelDto;
 import com.jzg.commons.entity.finance.dto.ReceiverSettlementReportDto;
 import com.jzg.commons.entity.finance.po.InsPlyIncome;
 import com.jzg.commons.entity.finance.po.InsPlyIncomeInvoiceSettlement;
+import com.jzg.commons.entity.finance.po.InsPlyIncomeOrder;
+import com.jzg.commons.entity.finance.po.InsPlyIncomeVO;
 import com.jzg.commons.entity.finance.vo.*;
 import com.jzg.commons.entity.orders.po.InsOrderAdjust;
 import com.jzg.commons.request.RequestSingleParam;
@@ -79,7 +81,7 @@ public class ReceivableController {
 
     @PostMapping("getCommissionReceivableList")
     @Operation(summary = "获取私有协议手续费列表")
-    public HttpResult<Page<InsPlyIncome>> getCommissionReceivableList(@RequestBody ReceivableQueryVo receivableQueryVo){
+    public HttpResult<InsPlyIncomeVO> getCommissionReceivableList(@RequestBody ReceivableQueryVo receivableQueryVo){
         if (StrUtil.isBlank(receivableQueryVo.getQueryType())){
             receivableQueryVo.setQueryType("2");
         }
@@ -87,7 +89,12 @@ public class ReceivableController {
         if (StrUtil.isBlank(receivableQueryVo.getAgreementType())){
             receivableQueryVo.setAgreementType("2");
         }
-        return HttpResult.ok(receivableService.getReceivablePage(receivableQueryVo));
+        HttpResult<Page<InsPlyIncome>> ok = HttpResult.ok(receivableService.getReceivablePage(receivableQueryVo));
+        Page<InsPlyIncome> data = ok.getData();
+        List<InsPlyIncomeOrder> receivablePageIds = receivableService.getReceivablePageIds(receivableQueryVo);
+        return HttpResult.ok(new InsPlyIncomeVO(data, receivablePageIds));
+
+
     }
 
     /**

+ 9 - 0
tenant/organization/src/main/java/com/jzg/organization/service/ReceivableService.java

@@ -6,6 +6,7 @@ import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.finance.dto.*;
 import com.jzg.commons.entity.finance.po.InsPlyIncome;
 import com.jzg.commons.entity.finance.po.InsPlyIncomeInvoiceSettlement;
+import com.jzg.commons.entity.finance.po.InsPlyIncomeOrder;
 import com.jzg.commons.entity.finance.vo.*;
 import com.jzg.commons.entity.orders.po.InsOrderAdjust;
 import com.jzg.commons.entity.po.EsmInsCompany;
@@ -48,6 +49,14 @@ public interface ReceivableService extends IService<InsPlyIncome> {
      */
     Page<InsPlyIncome> getReceivablePage(ReceivableQueryVo receivableQueryVo);
 
+    /**
+     * 获取私有协议手续费满足条件数据的id集合
+     *
+     * @param receivableQueryVo 前端传过来的查询条件
+     * @author lipf
+     * @date 2026/5/23 9:40
+     */
+    List<InsPlyIncomeOrder> getReceivablePageIds(ReceivableQueryVo receivableQueryVo);
 
     List<InsPlyIncome> getReceivableList(ReceivableQueryVo receivableQueryVo);
     /**

+ 21 - 0
tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -189,6 +189,27 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         return page;
     }
 
+    /**
+     * 获取私有协议手续费满足条件数据的id集合
+     *
+     * @param receivableQueryVo 前端传过来的查询条件
+     * @author lipf
+     * @date 2026/5/23 9:40
+     */
+    @Override
+    public List<InsPlyIncomeOrder> getReceivablePageIds(ReceivableQueryVo receivableQueryVo) {
+        log.info("获取私有协议手续费应收列表的id集合。receivableQueryVo=[{}]", JSONUtil.toJsonStr(receivableQueryVo));
+        Page page1 = receivableQueryVo.getPage();
+        // 为了使用下面的接口。但是不分页
+        page1.setPages(1);
+        page1.setSize(10000);
+        Page<InsPlyIncome> page = baseMapper.getReceivablePage(page1, receivableQueryVo);
+        List<InsPlyIncomeOrder> res = page.getRecords().stream()
+                .map(action -> new InsPlyIncomeOrder(action.getId(), action.getOrderNo())).toList();
+        log.info("获取私有协议手续费应收列表的id集合。receivableQueryVo=[{}]. ids.size=[{}]", JSONUtil.toJsonStr(receivableQueryVo), CollUtil.size(res));
+        return res;
+    }
+
     /**
      * 应收数据二次过滤
      *