fix 任务数据的明细接口完善

consoleStatistics/src/main/java/com/jzg/console/taskDataReport/service/impl/ReportChannelDataServiceImpl.java

@@ -47,11 +47,13 @@ public class ReportChannelDataServiceImpl extends ReportBaseServiceImpl implemen
     }
 
     /**
-     * 浠诲姟鏁版嵁-娓犻亾-鏄庣粏鏌ヨ
+     * 任务数据-渠道-分页查询-详情
      */
     @Override
     public IPage<ReportSalesmanDataDetailDto> getPageDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
         Page<ReportSalesmanDataDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        reportSearchCommonVo.setRecordTimeBegin(reportSearchCommonVo.getRecordTime().get(0));
+        reportSearchCommonVo.setRecordTimeEnd(reportSearchCommonVo.getRecordTime().get(1));
         return reportChannelDataMapper.detailPage(page, reportSearchCommonVo);
     }
 

consoleStatistics/src/main/java/com/jzg/console/taskDataReport/service/impl/ReportCompanyDataServiceImpl.java

@@ -54,6 +54,8 @@ public class ReportCompanyDataServiceImpl extends ReportBaseServiceImpl implemen
     @Override
     public IPage<ReportCompanyDataDetailDto> getPageDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
         Page<ReportCompanyDataDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        reportSearchCommonVo.setRecordTimeBegin(reportSearchCommonVo.getRecordTime().get(0));
+        reportSearchCommonVo.setRecordTimeEnd(reportSearchCommonVo.getRecordTime().get(1));
         return reportCompanyDataMapper.detailPage(page, reportSearchCommonVo);
     }
 

consoleStatistics/src/main/java/com/jzg/console/taskDataReport/service/impl/ReportSalesmanDataServiceImpl.java

@@ -60,6 +60,8 @@ public class ReportSalesmanDataServiceImpl extends ReportBaseServiceImpl impleme
     @Override
     public IPage<ReportSalesmanDataDetailDto> getPageDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
         Page<ReportSalesmanDataDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        reportSearchCommonVo.setRecordTimeBegin(reportSearchCommonVo.getRecordTime().get(0));
+        reportSearchCommonVo.setRecordTimeEnd(reportSearchCommonVo.getRecordTime().get(1));
         return reportSalesmanDataMapper.detailPage(page, reportSearchCommonVo);
     }
 

consoleStatistics/src/main/java/com/jzg/console/taskDataReport/service/impl/ReportTelemarketingDataServiceImpl.java

@@ -61,6 +61,8 @@ public class ReportTelemarketingDataServiceImpl extends ReportBaseServiceImpl im
     @Override
     public IPage<ReportSalesmanDataDetailDto> getPageDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
         Page<ReportSalesmanDataDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        reportSearchCommonVo.setRecordTimeBegin(reportSearchCommonVo.getRecordTime().get(0));
+        reportSearchCommonVo.setRecordTimeEnd(reportSearchCommonVo.getRecordTime().get(1));
         return reportTelemarketingDataMapper.detailPage(page, reportSearchCommonVo);
     }
 

consoleStatistics/src/main/resources/mapper/ReportCompanyDataMapper.xml

@@ -116,10 +116,10 @@
 
     <!-- ==================== 明细查询 ==================== -->
     <sql id="detailSelect"><![CDATA[
-        SELECT o.company_name                                                                            companyName,
-               o.company_id                                                                              companyId,
-               COALESCE(pc.name_simple, '')                                                              partnerCompanyName,
-               COALESCE(a.partner_company_id, '')                                                        partnerCompanyId,
+        SELECT ANY_VALUE(o.company_name)               companyName,
+               o.company_id                            companyId,
+               ANY_VALUE(COALESCE(pc.name_simple, '')) partnerCompanyName,
+               a.partner_company_id                    partnerCompanyId,
                COUNT(DISTINCT o.id)                                                                      quoteOrderNum,
                COUNT(DISTINCT CASE WHEN o.entry_status = 2 THEN o.id END)                                proxyCustomerOrderNum,
                COUNT(DISTINCT CASE WHEN o.order_source = 0 THEN o.id END)                                pcOrderNum,