Эх сурвалжийг харах

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

lipf 4 сар өмнө
parent
commit
7b913ae4b8

+ 12 - 14
tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -61,7 +61,7 @@ public class ReceivableController {
     @PostMapping("getUnauditedOrder")
     @Operation(summary = "获取未审核的订单")
     public HttpResult getUnauditedOrder(@RequestBody ReceivableQueryVo receivableQueryVo){
-        if (Objects.isNull(receivableQueryVo.getAgreementType()) || receivableQueryVo.getAgreementType().equals("")) {
+        if (Objects.isNull(receivableQueryVo.getAgreementType()) || receivableQueryVo.getAgreementType().isEmpty()) {
             receivableQueryVo.setAgreementType("1");
         }
         InsPlyIncome auditedOrder  = receivableService.getUnauditedOrder(receivableQueryVo);
@@ -93,8 +93,6 @@ public class ReceivableController {
         Page<InsPlyIncome> data = ok.getData();
         List<InsPlyIncomeOrder> receivablePageIds = receivableService.getReceivablePageIds(receivableQueryVo);
         return HttpResult.ok(new InsPlyIncomeVO(data, receivablePageIds));
-
-
     }
 
     /**
@@ -111,18 +109,25 @@ public class ReceivableController {
 
     @PostMapping("getOtherReceivableList")
     @Operation(summary = "获取私有协议跟单费列表")
-    public HttpResult getOtherReceivableList(@RequestBody ReceivableQueryVo receivableQueryVo){
+    public HttpResult<InsPlyIncomeVO> getOtherReceivableList(@RequestBody ReceivableQueryVo receivableQueryVo){
         receivableQueryVo.setQueryType("2");
         receivableQueryVo.setAgreementType("2");
-        return HttpResult.ok(receivableService.getReceivablePage(receivableQueryVo));
+        //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));
     }
 
     @PostMapping("getJyCommissionReceivableList")
     @Operation(summary = "获取私有协议驾意险手续费列表")
-    public HttpResult getJyCommissionReceivableList(@RequestBody ReceivableQueryVo receivableQueryVo){
+    public HttpResult<InsPlyIncomeVO> getJyCommissionReceivableList(@RequestBody ReceivableQueryVo receivableQueryVo){
         receivableQueryVo.setQueryType("3");
         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));
     }
 
     @PostMapping("getJyOtherReceivableList")
@@ -139,13 +144,6 @@ public class ReceivableController {
         return HttpResult.ok(receivableService.getReceivableList(receivableQueryVo));
     }
 
-
-//    @PostMapping("getPlatformReceivableList")
-//    @Operation(summary = "获取平台协议驾意险列表")
-//    public void getPlatformReceivableList(@RequestBody ReceivableQueryVo receivableQueryVo){
-//
-//    }
-
     @PostMapping("commissionInvoicing")
     @Operation(summary = "手续费开票")
     public HttpResult commissionInvoicing(@RequestBody InvoicingVo invoicingVo){