运营数据统计测试，无法测试，必须绑定内部机构才可以测试

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

@@ -33,7 +33,7 @@ public class OperationDataReportConroller {
     *  @Description: 查询业务数据
     */
     @PostMapping("queryBusinessDataPage")
-    @ApiOperation(value = "查询运营数据")
+    @ApiOperation(value = "查询运营业务数据")
     public HttpResult<BasePageResult<BusinessDataDto>> queryBusinessDataPage(@RequestBody BusinessDataQueryDto businessDataQueryDto) {
         try{
             BasePageResult<BusinessDataDto> result = operationDataReportService.queryBusinessDataPage(businessDataQueryDto);
@@ -83,7 +83,7 @@ public class OperationDataReportConroller {
      *  @Description: 查询电销数据
      */
     @PostMapping("queryTelemarketingDataDtoCountDataPage")
-    @ApiOperation(value = "查询运营人员数据")
+    @ApiOperation(value = "查询电销数据")
     public HttpResult<BasePageResult<TelemarketingDataDto>> queryTelemarketingDataDtoCountDataPage(@RequestBody TelemarketingDataQueryDto telemarketingDataQueryDto) {
         try{
             BasePageResult<TelemarketingDataDto> result = operationDataReportService.queryTelemarketingDataDtoCountDataPage(telemarketingDataQueryDto);

src/main/java/com/ydtech/modules/admin/model/report/opetationData/BusinessDataDto.java

@@ -30,12 +30,6 @@ public class BusinessDataDto {
      */
     @ApiModelProperty(value = "商业险保费金额")
     private BigDecimal syPremiumAmount;
-    /***
-     *  商业险保费金额
-     */
-    @ApiModelProperty("商业险保费金额")
-    private String endData;
-
     /***
      *  车船税金额
      */

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

@@ -1,7 +1,6 @@
 package com.ydtech.modules.admin.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.dao.SysDeptInternalAgentMapper;
 import com.ydtech.modules.admin.dao.SysUserLinkAreaMapper;
 import com.ydtech.modules.admin.model.SysUser;
@@ -11,7 +10,6 @@ import com.ydtech.modules.admin.service.SysUserLinkDeptInternalAgentService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.order.dao.InsAreaCompanyMapper;
 import com.ydtech.modules.order.entity.BasePageResult;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -53,9 +51,9 @@ public class OperationDataReportServiceImpl implements OperationDataReportServic
      */
     @Override
     public BasePageResult<BusinessDataDto> queryBusinessDataPage(BusinessDataQueryDto businessDataQueryDto) {
-        if(StringUtils.isBlank(businessDataQueryDto.getDeptId())){
-            throw new SystemException("机构id不能为空");
-        }
+       // if(StringUtils.isBlank(businessDataQueryDto.getDeptId())){
+       //     throw new SystemException("机构id不能为空");
+       // }
         Result resultData = new Result().getRestData(businessDataQueryDto.getDeptId(), businessDataQueryDto.getDeptType());
         if(resultData.userIds ==null || resultData.userIds.size()==0){
              return  new BasePageResult<BusinessDataDto>();
@@ -120,9 +118,9 @@ public class OperationDataReportServiceImpl implements OperationDataReportServic
      */ 
     @Override
     public BasePageResult<QuotationCountDataDto> queryQuotationCountDataPage(QuotationCountQueryDto quotationCountQueryDto) {
-        if(StringUtils.isBlank(quotationCountQueryDto.getDeptId())){
-            throw new SystemException("机构id不能为空");
-        }
+        //if(StringUtils.isBlank(quotationCountQueryDto.getDeptId())){
+        //    throw new SystemException("机构id不能为空");
+        //}
         Result resultData = new Result().getRestData(quotationCountQueryDto.getDeptId(),quotationCountQueryDto.getDeptType());
         if(resultData.userIds ==null || resultData.userIds.size()==0){
             return  new BasePageResult<QuotationCountDataDto>();
@@ -144,9 +142,9 @@ public class OperationDataReportServiceImpl implements OperationDataReportServic
      */
     @Override
     public BasePageResult<OperationsPersonnelDataDto> queryOperationsPersonnelDataPage(QuotationCountQueryDto quotationCountQueryDto) {
-        if(StringUtils.isBlank(quotationCountQueryDto.getDeptId())){
-            throw new SystemException("机构id不能为空");
-        }
+        //if(StringUtils.isBlank(quotationCountQueryDto.getDeptId())){
+        //    throw new SystemException("机构id不能为空");
+        //}
         List<String> userIds= sysUserLinkDeptInternalAgentService.getUserIdListByDeptId(quotationCountQueryDto.getDeptId());
         //渠道用户数据
         List<SysUser> qdUserList=new ArrayList<SysUser>();

src/main/java/com/ydtech/modules/protocol/dao/PtlAgreementMapper.java

@@ -42,7 +42,7 @@ public interface PtlAgreementMapper extends BaseMapper<PtlAgreement> {
      *  @Date: 2024/6/28 11:29
      *  @Description: 查询分页统计
      */
-    Page<AgreeReportDto> queryReportPage(Page<AgreeReportDto> page, AgreeReportQueryDto agreeReportQueryDto);
+    Page<AgreeReportDto> queryReportPage(@Param("page") Page<AgreeReportDto> page, @Param("vo") AgreeReportQueryDto agreeReportQueryDto);
 }
 
 

src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -685,11 +685,11 @@
             o.userid   as userId,
             o.username as userName,
         </if>
-        sum(iac.sumpremium),
-        sum(iac.jqpremium),
-        sum(iac.sypremium),
-        sum(iac.taxamount),
-        sum(ion.no_premium)
+        sum( iac.sumpremium ) as signeSumPremiumAmount,
+        sum( iac.jqpremium ) as jqPremiumAmount,
+        sum( iac.sypremium ) as  syPremiumAmount,
+        sum( iac.taxamount ) as taxAmount,
+        sum( ion.no_premium ) as  fcFeeAmount
         FROM
         ins_area_company iac
         LEFT JOIN ins_orders o ON iac.orderno = o.orderno