1、增加uid，用于前端展示数据

src/main/java/com/link/bi/pojo/response/FinanceBiListDto.java

@@ -11,6 +11,9 @@ import java.math.BigDecimal;
  */
 @Data
 public class FinanceBiListDto {
+    // 前端展示用
+    private String uid;
+
     // 主播渠道类型--来自备注字段
     private String zbjQdType;
 

src/main/java/com/link/bi/pojo/response/FinanceZbjTypeListDto.java

 package com.link.bi.pojo.response;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 /**
@@ -9,8 +10,11 @@ import lombok.Data;
  */
 @Data
 public class FinanceZbjTypeListDto {
+
     // 分销商名称
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     private String fenxiaoName;
+
     // 直播间渠道类型 有分销商id,不是以上几类的，统一为达人 没有分销商id的，默认为商城
     private String zbjQdType;
 

src/main/java/com/link/bi/service/impl/FinanceOrderDetailServiceImpl.java

 package com.link.bi.service.impl;
 
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
@@ -59,8 +60,9 @@ public class FinanceOrderDetailServiceImpl extends ServiceImpl<FinanceOrderDetai
             qw.setStartDate(DateUtils.dateStart(DateUtils.dateStart(qw.getStartDate())));
             qw.setEndDate(DateUtils.dateStart(DateUtils.dateStart(DateUtils.addDays(qw.getEndDate(), 1))));
         }else{
-            qw.setStartDate(DateUtils.dateStart(-31));
-            qw.setEndDate(DateUtils.dateStart(new Date()));
+            //默认 t-1 天的数据查询
+            qw.setStartDate(DateUtils.dateStart(new Date()));
+            qw.setEndDate(DateUtils.dateStart(DateUtils.addDays(new Date(),-1)));
         }
         PageInfo<FinanceOrderDetail> orderDetailPageInfo = detailDao.selectBiFinanceCostList(qw);
         PageInfo<FinanceBiListDto> pageInfo = new PageInfo<>();
@@ -70,6 +72,7 @@ public class FinanceOrderDetailServiceImpl extends ServiceImpl<FinanceOrderDetai
             BeanUtils.copyProperties(item, dto);
             dto.setActualCostGrossProfitSum(dto.getShareAmountSum().subtract(dto.getActualCostSum()));
             dto.setStandardCostGrossProfitSum(dto.getShareAmountSum().subtract(dto.getStandardCostSum()));
+            dto.setUid(IdUtil.simpleUUID());
             return dto;
         }).collect(Collectors.toList()));
         return pageInfo;

src/main/resources/mapper/bi/FinanceOrderDetailMapper.xml

@@ -48,20 +48,20 @@
                 </foreach>
             </if>
             <if test="wq.specName!= null and !wq.specName.isEmpty()  ">
-11                and fod.spec_name_erp in
+                 and fod.spec_name_erp in
                 <foreach collection="wq.specName" item="item" index="index" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
             <if test="wq.flavor!= null and !wq.flavor.isEmpty()  ">
-                and fod.flavor_erp in
+                 and fod.flavor_erp in
                 <foreach collection="wq.flavor" item="item" index="index" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
             <if test="wq.series!= null and !wq.series.isEmpty()  ">
                 and fod.series in
-                <foreach collection="wq.flavor" item="item" index="index" open="(" separator="," close=")">
+                <foreach collection="wq.series" item="item" index="index" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>