区域业绩查询增加主订单子订单

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -713,18 +713,19 @@ public class SysUserController extends BaseController {
         return HttpResult.ok(list);
     }
 
-    @ApiOperation(value = "区域数据管理")
+    @ApiOperation(value = "区域业绩管理")
     @PostMapping(value = "/quUserNum")
     public HttpResult quUserNum(@RequestBody QuUserNumDto quUserNumDto) {
         return HttpResult.ok("", sysUserService.quUserNum(quUserNumDto));
     }
 
-    @ApiOperation(value = "区域数据管理详情")
+    @ApiOperation(value = "区域业绩地区管理详情")
     @PostMapping(value = "/quUserNumDetail")
     public HttpResult quUserNumDetail(@RequestBody QuUserNumDto quUserNumDto) {
         return HttpResult.ok("", sysUserService.getQuUserByCompany(quUserNumDto));
     }
 
+
     /**
      *  @version
      *  @author: hxl

src/main/java/com/ydtech/modules/admin/model/QuUserNum.java

@@ -16,13 +16,31 @@ public class QuUserNum {
     @ApiModelProperty(value = "订单状态")
     private String orderStatus;
 
+    @ApiModelProperty(value = "主订单待核保总数")
+    private String mainWaitAuditSum;
+
+    @ApiModelProperty(value = "主订单已核保总数")
+    private String mainWaitPaySum;
+
+    @ApiModelProperty(value = "主订单已承包总数")
+    private String mainAcceptInsuranceSum;
+
+    @ApiModelProperty(value = "子订单待核保总数")
+    private String subWaitAuditSum;
+
+    @ApiModelProperty(value = "子订单已核保总数")
+    private String subWaitPaySum;
+
+    @ApiModelProperty(value = "子订单已承包总数")
+    private String subAcceptInsuranceSum;
+
     @ApiModelProperty(value = "保险公司编号")
     private String companyId;
 
     @ApiModelProperty(value = "保险公司名称")
     private String insCompany;
 
-    @ApiModelProperty(value = "该订单状态下次数")
+    @ApiModelProperty(value = "订单总数")
     private String count;
 
     @ApiModelProperty(value = "报价次数")
@@ -52,4 +70,21 @@ public class QuUserNum {
     @ApiModelProperty(value = "省市区名称")
     private String areaName;
 
+
+    public QuUserNum() {
+        this.mainWaitAuditSum = "0";
+        this.mainWaitPaySum = "0";
+        this.mainAcceptInsuranceSum = "0";
+        this.subWaitAuditSum = "0";
+        this.subWaitPaySum = "0";
+        this.subAcceptInsuranceSum = "0";
+        this.count = "0";
+        this.quoteNum = "0";
+        this.submitNum = "0";
+        this.hasInsuredNum = "0";
+        this.totalSumpremium = "0";
+        this.jqPremiumSum = "0";
+        this.syPremiumSum = "0";
+        this.taxaMountSum = "0";
+    }
 }

src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementServiceImpl.java

@@ -345,7 +345,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     }
 
     @Override
-    public HttpResult<PageResult<PtlAgreement>> pageAgreement(PtlAgreementPageVo ptlAgreementPageVo) {
+    public Page<PtlAgreement> pageAgreement(Page page,PtlAgreementPageVo ptlAgreementPageVo) {
 
         LambdaQueryWrapper<PtlAgreement> wrapper = new LambdaQueryWrapper<>();
         // 获取供应商本级id 及其 下级id
@@ -410,9 +410,8 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
             wrapper.apply("SUBSTRING(partner_companies_id, 6, " + sign + ") =" + prefix);
         }
         Page<PtlAgreement> agreementPage = page(page, wrapper);
-        List<PtlAgreement> records = agreementPage.getRecords();
-        PageResult<PtlAgreement> ptlAgreementPageResult = new PageResult<>(pageNum, pageSize, page.getTotal(), records);
-        return HttpResult.ok(ptlAgreementPageResult);
+
+        return agreementPage;
     }
 
     @Override