1.控制台人员渠道跳转 任务 订单时间变为签单日期

src/main/java/com/ydtech/modules/admin/model/report/company/CompanyQutationCountDataQueryDto.java

@@ -63,5 +63,11 @@ public class CompanyQutationCountDataQueryDto {
     @ApiModelProperty(value = "用户ids")
     private List<String> userIds;
 
+    @ApiModelProperty(value = "传参任务类型")
+    private String taskType;
+    @ApiModelProperty(value = "筛选签单开始时间")
+    private String signingTimeStart;
 
+    @ApiModelProperty(value = "筛选签单结束时间")
+    private String signingTimeEnd;
 }

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

@@ -84,13 +84,24 @@ public class CompanyDataReportServiceImpl implements CompanyDataReportService {
      */
     @Override
     public BasePageResult<CompanyQutationCountDataDto> queryCompanyQutationCountDataPage(CompanyQutationCountDataQueryDto companyQutationCountDataQueryDto) {
+
         Page<QuotationCountDataDto> page = new Page<>(companyQutationCountDataQueryDto.getPageNum(), companyQutationCountDataQueryDto.getPageSize());
         //判断开始时间和结束时间是否为空,如果为空的走时间类型逻辑
         HashMap<String, String> dateMapByType = getDateMapByType(companyQutationCountDataQueryDto.getDateType(), companyQutationCountDataQueryDto.getBeginDate(), companyQutationCountDataQueryDto.getEndDate());
-        companyQutationCountDataQueryDto.setBeginDate(dateMapByType.get("startDate"));
-        companyQutationCountDataQueryDto.setEndDate(dateMapByType.get("endDate"));
+//        companyQutationCountDataQueryDto.setBeginDate(dateMapByType.get("startDate"));
+//        companyQutationCountDataQueryDto.setEndDate(dateMapByType.get("endDate"));
         page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
 
+        if(StringUtils.isNotEmpty(companyQutationCountDataQueryDto.getTaskType()) && "1".equals(companyQutationCountDataQueryDto.getTaskType())){
+            companyQutationCountDataQueryDto.setBeginDate(null);
+            companyQutationCountDataQueryDto.setEndDate(null);
+            companyQutationCountDataQueryDto.setSigningTimeStart(dateMapByType.get("startDate"));
+            companyQutationCountDataQueryDto.setSigningTimeEnd(dateMapByType.get("endDate"));
+        }else {
+            companyQutationCountDataQueryDto.setBeginDate(dateMapByType.get("startDate"));
+            companyQutationCountDataQueryDto.setEndDate(dateMapByType.get("endDate"));
+        }
+
         Page<CompanyQutationCountDataDto> resultSubOrder = insAreaCompanyMapper.queryCompanyQutationCountDataPage(companyQutationCountDataQueryDto, page);
         Long total = this.insAreaCompanyMapper.queryCompanyQutationCountDataPageTotal(companyQutationCountDataQueryDto);