|
|
@@ -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));
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/**
|