添加财务实收预收相关接口，已编写部分

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

@@ -0,0 +1,105 @@
+package com.ydtech.modules.admin.controller;
+
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.admin.model.report.financeData.AdvanceAndActualDataDto;
+import com.ydtech.modules.admin.model.report.financeData.AdvanceAndActualDeptDataDto;
+import com.ydtech.modules.admin.model.report.financeData.AdvanceAndActualDeptQueryDto;
+import com.ydtech.modules.admin.model.report.financeData.AdvanceAndActualQueryDto;
+import com.ydtech.modules.admin.model.report.opetationData.OperationsPersonnelDataDto;
+import com.ydtech.modules.admin.model.report.opetationData.QuotationCountDataDto;
+import com.ydtech.modules.admin.model.report.opetationData.QuotationCountQueryDto;
+import com.ydtech.modules.admin.service.FinanceDataReportService;
+import com.ydtech.modules.order.entity.BasePageResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/7/1 11:31
+ *  @Description:  控制台  运营数据统计
+ */
+@Api(tags = "财务数据统计")
+@RequestMapping("/financeDataReport")
+@RestController
+public class FinanceDataReportConroller {
+
+    @Autowired
+    private FinanceDataReportService financeDataReportService;
+
+   /**
+    *  @version 
+    *  @author: hxl
+    *  @Date: 2024/7/3 14:54
+    *  @Description: 财务数据 - 渠道/代理人 - 预收、实收数据
+    */ 
+    @PostMapping("queryAdvanceAndActualDataPage")
+    @ApiOperation(value = "财务数据 - 渠道/代理人 - 预收、实收数据")
+    public HttpResult<BasePageResult<AdvanceAndActualDataDto>> queryAdvanceAndActualDataPage(@RequestBody AdvanceAndActualQueryDto advanceAndActualQueryDto) {
+        try{
+            BasePageResult<AdvanceAndActualDataDto> result = financeDataReportService.queryAdvanceAndActualDataPage(advanceAndActualQueryDto);
+            return HttpResult.ok("查询数据成功", result);
+        }catch (Exception e){
+            return HttpResult.error("查询错误"+e.getMessage());
+        }
+    }
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/7/3 14:54
+     *  @Description: 财务数据 -机构的 -预收、实收数据
+     */
+    @PostMapping("queryAdvanceAndActualDeptDataPage")
+    @ApiOperation(value = "财务数据 -机构的 -预收、实收数据")
+    public HttpResult<BasePageResult<AdvanceAndActualDeptDataDto>> queryAdvanceAndActualDeptDataPage(@RequestBody AdvanceAndActualDeptQueryDto advanceAndActualDeptQueryDto) {
+        try{
+            BasePageResult<AdvanceAndActualDeptDataDto> result = financeDataReportService.queryAdvanceAndActualDeptDataPage(advanceAndActualDeptQueryDto);
+            return HttpResult.ok("查询数据成功", result);
+        }catch (Exception e){
+            return HttpResult.error("查询错误"+e.getMessage());
+        }
+    }
+
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/7/3 11:17
+     *  @Description:   财务数据 -渠道/代理人 - 已提现/提现中/驳回的金额
+     */
+    @PostMapping("queryQuotationCountDataPage11")
+    @ApiOperation(value = "查询报价次数数据")
+    public HttpResult<BasePageResult<QuotationCountDataDto>> queryQuotationCountDataPage(@RequestBody QuotationCountQueryDto quotationCountQueryDto) {
+        try{
+            BasePageResult<QuotationCountDataDto> result = null;
+                   // financeDataReportService.queryQuotationCountDataPage(quotationCountQueryDto);
+            return HttpResult.ok("查询数据成功", result);
+        }catch (Exception e){
+            return HttpResult.error("查询错误"+e.getMessage());
+        }
+    }
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/7/3 11:17
+     *  @Description: 财务数据 -机构 - 已提现/提现中/驳回的金额
+     */
+    @PostMapping("queryOperationsPersonnelDataPage22")
+    @ApiOperation(value = "查询运营人员数据")
+    public HttpResult<BasePageResult<OperationsPersonnelDataDto>> queryOperationsPersonnelDataPage(@RequestBody QuotationCountQueryDto quotationCountQueryDto) {
+        try{
+            BasePageResult<OperationsPersonnelDataDto> result = null;
+                    //financeDataReportService.queryOperationsPersonnelDataPage(quotationCountQueryDto);
+            return HttpResult.ok("查询数据成功", result);
+        }catch (Exception e){
+            return HttpResult.error("查询错误"+e.getMessage());
+        }
+    }
+}

src/main/java/com/ydtech/modules/admin/model/report/financeData/AdvanceAndActualDataDto.java

@@ -0,0 +1,66 @@
+package com.ydtech.modules.admin.model.report.financeData;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/7/3 16:44
+ *  @Description: 预收、实收数据
+ */
+@Data
+@ApiModel("预收、实收渠道/代理人数据对象")
+public class AdvanceAndActualDataDto {
+
+    /***
+     * 用户id
+     */
+    @ApiModelProperty("用户id")
+    private String userId;
+    /***
+     * 用户名称
+     */
+    @ApiModelProperty("用户名称")
+    private String userName;
+
+    /***
+     * 渠道、代理人
+     */
+    @ApiModelProperty("机构类型")
+    private  String deptType;
+    /***
+     * 渠道、代理人
+     */
+    @ApiModelProperty("签单日期")
+    private String signingTime;
+
+    @ApiModelProperty("车牌号")
+    private String licenseNo;
+
+    @ApiModelProperty(value = "总金额")
+    private BigDecimal  sumAmount;
+
+    @ApiModelProperty(value = "手续费金额")
+    private BigDecimal  haldingAmount;
+
+    @ApiModelProperty(value = "跟单金额")
+    private BigDecimal documentaryAmount;
+
+    @ApiModelProperty(value = "推广费金额")
+    private BigDecimal promotionAmount;
+    /***
+     *   未审核 0 已审核 1
+     */
+    @ApiModelProperty(value = "未审核 0 已审核 1")
+    private String auditstatus;
+
+    /***
+     *   子订单号
+     */
+    @ApiModelProperty(value = "子订单号")
+    private String subOrderNo;
+}

src/main/java/com/ydtech/modules/admin/model/report/financeData/AdvanceAndActualDeptDataDto.java

@@ -0,0 +1,52 @@
+package com.ydtech.modules.admin.model.report.financeData;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/7/3 16:44
+ *  @Description: 预收、实收数据
+ */
+@Data
+@ApiModel("预收、实收机构数据对象")
+public class AdvanceAndActualDeptDataDto {
+
+    /***
+     * 机构id
+     */
+    @ApiModelProperty("机构id")
+    private String deptId;
+    /***
+     * 机构名称
+     */
+    @ApiModelProperty("机构名称")
+    private String deptName;
+    /***
+     * 签单日期
+     */
+    @ApiModelProperty("签单日期")
+    private String signingTime;
+
+    @ApiModelProperty("车牌号")
+    private String licenseNo;
+
+    @ApiModelProperty(value = "总金额")
+    private BigDecimal  sumAmount;
+
+    /*
+     *   未审核 0 已审核 1
+     */
+    @ApiModelProperty(value = "未审核 0 已审核 1")
+    private String auditstatus;
+
+    /***
+     *   子订单号
+     */
+    @ApiModelProperty(value = "子订单号")
+    private String subOrderNo;
+}

src/main/java/com/ydtech/modules/admin/model/report/financeData/AdvanceAndActualDeptQueryDto.java

@@ -0,0 +1,56 @@
+package com.ydtech.modules.admin.model.report.financeData;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/7/3 16:44
+ *  @Description: 预收、实收数据
+ */
+@Data
+@ApiModel("预收、实收机构数据对象")
+public class AdvanceAndActualDeptQueryDto {
+
+    /***
+     * 用户id
+     */
+    @ApiModelProperty("机构id")
+    private String deptId;
+
+    @ApiModelProperty("车牌号")
+    private String licenseNo;
+
+    /***
+     *   未审核 0 已审核 1
+     */
+    @ApiModelProperty(value = "未审核 0 已审核 1")
+    private String auditstatus;
+
+    /***
+     *   子订单号
+     */
+    @ApiModelProperty(value = "子订单号")
+    private String subOrderNo;
+
+    @ApiModelProperty("页码")
+    private int pageNum;
+
+    @ApiModelProperty("页数")
+    private int pageSize;
+
+
+    /***
+     * 开始时间
+     */
+    @ApiModelProperty("开始时间")
+    private String startDate;
+
+    /***
+     *  结束时间
+     */
+    @ApiModelProperty("endData")
+    private String endData;
+}

src/main/java/com/ydtech/modules/admin/model/report/financeData/AdvanceAndActualQueryDto.java

@@ -0,0 +1,68 @@
+package com.ydtech.modules.admin.model.report.financeData;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/7/3 16:44
+ *  @Description: 预收、实收数据
+ */
+@Data
+@ApiModel("预收、实收数据对象")
+public class AdvanceAndActualQueryDto {
+
+    /***
+     * 用户id
+     */
+    @ApiModelProperty("用户id")
+    private String deptId;
+    /***
+     * 用户名称
+     */
+    @ApiModelProperty("用户名称")
+    private String userName;
+
+    /***
+     * 渠道、代理人
+     */
+    @ApiModelProperty("机构类型")
+    private  String deptType;
+
+
+    @ApiModelProperty("车牌号")
+    private String licenseNo;
+
+    /***
+     *   未审核 0 已审核 1
+     */
+    @ApiModelProperty(value = "未审核 0 已审核 1")
+    private String auditstatus;
+
+    /***
+     *   子订单号
+     */
+    @ApiModelProperty(value = "子订单号")
+    private String subOrderNo;
+
+    @ApiModelProperty("页码")
+    private int pageNum;
+
+    @ApiModelProperty("页数")
+    private int pageSize;
+
+
+    /***
+     * 开始时间
+     */
+    @ApiModelProperty("开始时间")
+    private String startDate;
+
+    /***
+     *  结束时间
+     */
+    @ApiModelProperty("endData")
+    private String endData;
+}

src/main/java/com/ydtech/modules/admin/service/FinanceDataReportService.java

@@ -0,0 +1,34 @@
+package com.ydtech.modules.admin.service;
+
+
+import com.ydtech.modules.admin.model.report.financeData.AdvanceAndActualDataDto;
+import com.ydtech.modules.admin.model.report.financeData.AdvanceAndActualDeptDataDto;
+import com.ydtech.modules.admin.model.report.financeData.AdvanceAndActualDeptQueryDto;
+import com.ydtech.modules.admin.model.report.financeData.AdvanceAndActualQueryDto;
+import com.ydtech.modules.order.entity.BasePageResult;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/7/1 11:35
+ *  @Description:  控制台之运营数据
+ */
+public interface FinanceDataReportService {
+    /**
+     *  @version 
+     *  @author: hxl
+     *  @Date: 2024/7/3 18:02
+     *  @Description: 财务数据 - 渠道/代理人 - 预收、实收数据
+     */ 
+    BasePageResult<AdvanceAndActualDataDto> queryAdvanceAndActualDataPage(AdvanceAndActualQueryDto advanceAndActualQueryDto);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/7/4 9:23
+     *  @Description:   财务数据 - 五级机构 - 预收、实收数据
+     */
+    BasePageResult<AdvanceAndActualDeptDataDto> queryAdvanceAndActualDeptDataPage(AdvanceAndActualDeptQueryDto advanceAndActualDeptQueryDto);
+}
+
+
+

src/main/java/com/ydtech/modules/admin/service/impl/FinanceDataReportServiceImpl.java

@@ -0,0 +1,57 @@
+package com.ydtech.modules.admin.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydtech.modules.admin.model.report.financeData.AdvanceAndActualDataDto;
+import com.ydtech.modules.admin.model.report.financeData.AdvanceAndActualDeptDataDto;
+import com.ydtech.modules.admin.model.report.financeData.AdvanceAndActualDeptQueryDto;
+import com.ydtech.modules.admin.model.report.financeData.AdvanceAndActualQueryDto;
+import com.ydtech.modules.admin.service.FinanceDataReportService;
+import com.ydtech.modules.order.entity.BasePageResult;
+import com.ydtech.modules.protocols.dao.InsFeeOrderNewMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/7/1 11:36
+ *  @Description: 控制台-运营数据
+ */
+@Service
+public class FinanceDataReportServiceImpl implements FinanceDataReportService {
+
+
+
+    @Autowired
+    private InsFeeOrderNewMapper insFeeOrderNewMapper;
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/7/3 18:05
+     *  @Description:  财务数据 - 渠道/代理人 - 预收、实收数据
+     */
+    @Override
+    public BasePageResult<AdvanceAndActualDataDto> queryAdvanceAndActualDataPage(AdvanceAndActualQueryDto advanceAndActualQueryDto) {
+        Page<AdvanceAndActualDataDto> page = new Page<>(advanceAndActualQueryDto.getPageNum(), advanceAndActualQueryDto.getPageSize());
+        Page<AdvanceAndActualDataDto> result = insFeeOrderNewMapper.queryAdvanceAndActualDataPage(advanceAndActualQueryDto, page);
+        return new BasePageResult<>(advanceAndActualQueryDto.getPageNum(), page.getSize(), result.getTotal(), page.getPages(),
+                result.getRecords());
+    }
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/7/4 9:25
+     *  @Description:   财务数据 - 五级机构 - 预收、实收数据
+     */
+    @Override
+    public BasePageResult<AdvanceAndActualDeptDataDto> queryAdvanceAndActualDeptDataPage(AdvanceAndActualDeptQueryDto advanceAndActualDeptQueryDto) {
+        Page<AdvanceAndActualDeptDataDto> page = new Page<>(advanceAndActualDeptQueryDto.getPageNum(), advanceAndActualDeptQueryDto.getPageSize());
+        Page<AdvanceAndActualDeptDataDto> result = insFeeOrderNewMapper.queryAdvanceAndActualDeptDataPage(advanceAndActualDeptQueryDto, page);
+        return new BasePageResult<>(advanceAndActualDeptQueryDto.getPageNum(), page.getSize(), result.getTotal(), page.getPages(),
+                result.getRecords());
+    }
+}
+
+
+