1、修改bug,xml错误：where条件少了in

src/main/java/com/link/bi/controller/query/FinanceOrderQueryController.java

@@ -47,10 +47,10 @@ public class FinanceOrderQueryController extends BaseController {
     @RequiresPermissions("bi:finance:list")
     @PostMapping("/cost/detail/list")
     public PageInfo selectBiFinanceCostDetailList(@RequestBody FinanceCostVo financeCostVo) {
-        return detailService.selectBiFinanceCostDetailList(financeCostVo);
+        return detailService.selectBiFinanceCostDetailPage(financeCostVo);
     }
 
-    // 直播间类型下拉
+    // 直播间类型下拉列表用
     @RequiresPermissions("bi:finance:list")
     @GetMapping("/zbjType/list")
     public List<FinanceZbjTypeListDto> baseZbjTypeList(FinanceSelectCommonVo commonVo) {
@@ -70,7 +70,7 @@ public class FinanceOrderQueryController extends BaseController {
     }
     // 系列
     @RequiresPermissions("bi:finance:list")
-    @GetMapping("/serieses/list")
+    @GetMapping("/series/list")
     public List<FinanceBaseProductListDto> seriesList(FinanceSelectCommonVo commonVo) {
         return baseProductService.seriesList(commonVo);
     }
@@ -81,4 +81,16 @@ public class FinanceOrderQueryController extends BaseController {
         return baseProductService.productNameList(commonVo);
     }
 
+
+    /**
+     * 直播间分类的页面查询
+     * @param commonVo
+     * @return
+     */
+    @RequiresPermissions("bi:finance:list")
+    @GetMapping("/baseZbjType/list")
+    public List<FinanceZbjTypeListDto> baseZbjTypeAllList(FinanceSelectCommonVo commonVo) {
+        return baseZbjTypeService.baseZbjTypeAllList(commonVo);
+    }
+
 }

src/main/java/com/link/bi/domain/dao/impl/FinanceOrderDetailDaoImpl.java

@@ -45,8 +45,7 @@ public class FinanceOrderDetailDaoImpl implements IFinanceOrderDetailDao {
     @Override
     public PageInfo<FinanceOrderDetail> selectBiFinanceCostDetailList(FinanceCostWq wq) {
         // 查询分页数据
-        Page<Object> objectPage = TableSupport.pageI();
-        PageHelper.startPage((int) objectPage.getCurrent(), (int) objectPage.getSize());
+        PageHelper.startPage(wq.getPageNum(), wq.getPageSize());
 
         List<FinanceOrderDetail> financeOrderDetails = detailMapper.selectBiFinanceCostDetailList( wq);
         PageInfo<FinanceOrderDetail> pageInfo = new PageInfo<>(financeOrderDetails);

src/main/java/com/link/bi/domain/wq/FinanceCostWq.java

@@ -12,15 +12,7 @@ import java.util.List;
  */
 @Data
 public class FinanceCostWq {
-    // 入参 查询类型
-    private String type;
-    // 入参 查询值
-//    private String value;
-//    private String zbjQdType;
-//    private String flavor;
-//    private String specName;
-//    private String series;
-//    private String goodsName;
+
     // 入参 时间开始时间
     private Date startDate;
     // 入参 时间结束时间
@@ -31,5 +23,9 @@ public class FinanceCostWq {
     private List<String> specName;
     private List<String> series;
     private List<String> goodsName;
+    private Integer pageNum ;
+    private Integer pageSize ;
+
+
 
 }

src/main/java/com/link/bi/pojo/request/FinanceCostVo.java

@@ -9,9 +9,9 @@ import java.util.List;
 public class FinanceCostVo {
 
     // 入参 分页当前页
-    private String pageNum;
+    private Integer pageNum = 1;
     // 入参 分页大小
-    private String pageSize;
+    private Integer pageSize =10;
     // 入参 时间开始时间
     private Date startDate;
     // 入参 时间结束时间

src/main/java/com/link/bi/service/FinanceBaseZbjTypeService.java

@@ -12,11 +12,11 @@ import java.util.Map;
 
 
 public interface FinanceBaseZbjTypeService extends IService<FinanceBaseZbjType> {
-    boolean saveFinanceBaseZbjType(FinanceBaseZbjType financeBaseZbjType);
-    boolean removeFinanceBaseZbjTypeById(Long id);
-    boolean updateFinanceBaseZbjTypeById(FinanceBaseZbjType financeBaseZbjType);
-    FinanceBaseZbjType getFinanceBaseZbjTypeById(Long id);
-    IPage<FinanceZbjTypeListDto> pageFinanceBaseZbjType(String keyword);
     Map<String,String> selectBaseZbjType();
+
+    IPage<FinanceZbjTypeListDto> pageFinanceBaseZbjType(String keyword);
+
     List<FinanceZbjTypeListDto> baseZbjTypeList(FinanceSelectCommonVo commonVo);
+
+    List<FinanceZbjTypeListDto> baseZbjTypeAllList(FinanceSelectCommonVo commonVo);
 }

src/main/java/com/link/bi/service/FinanceOrderDetailService.java

@@ -10,5 +10,5 @@ import com.link.bi.pojo.response.FinanceOrderDetailListDto;
 public interface FinanceOrderDetailService extends IService<FinanceOrderDetail> {
     PageInfo<FinanceBiListDto> selectBiFinanceCostList(FinanceCostVo financeCostVo);
 
-    PageInfo<FinanceOrderDetailListDto> selectBiFinanceCostDetailList(FinanceCostVo financeCostVo);
+    PageInfo<FinanceOrderDetailListDto> selectBiFinanceCostDetailPage(FinanceCostVo financeCostVo);
 }

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

@@ -41,28 +41,6 @@ public class FinanceBaseZbjTypeServiceImpl extends ServiceImpl<FinanceBaseZbjTyp
         return map;
     }
 
-    @Override
-    public boolean saveFinanceBaseZbjType(FinanceBaseZbjType financeBaseZbjType) {
-        return this.save(financeBaseZbjType);
-    }
-
-
-    @Override
-    public boolean removeFinanceBaseZbjTypeById(Long id) {
-        return this.removeById(id);
-    }
-
-
-    @Override
-    public boolean updateFinanceBaseZbjTypeById(FinanceBaseZbjType financeBaseZbjType) {
-        return this.updateById(financeBaseZbjType);
-    }
-
-
-    @Override
-    public FinanceBaseZbjType getFinanceBaseZbjTypeById(Long id) {
-        return this.getById(id);
-    }
 
 
     /**
@@ -93,6 +71,24 @@ public class FinanceBaseZbjTypeServiceImpl extends ServiceImpl<FinanceBaseZbjTyp
 
     @Override
     public List<FinanceZbjTypeListDto> baseZbjTypeList(FinanceSelectCommonVo commonVo) {
+        LambdaQueryWrapper<FinanceBaseZbjType> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.select(FinanceBaseZbjType::getZbjQdType);
+        queryWrapper.like(commonVo.getKeyword() != null && !commonVo.getKeyword().isEmpty(), FinanceBaseZbjType::getZbjQdType, commonVo.getKeyword());
+        queryWrapper.groupBy(FinanceBaseZbjType::getZbjQdType);
+        List<FinanceBaseZbjType> list = list(queryWrapper);
+
+        // 转化成List<FinanceZbjTypeListDto>
+        List<FinanceZbjTypeListDto> result = new ArrayList<>();
+        list.forEach(item -> {
+            FinanceZbjTypeListDto dto = new FinanceZbjTypeListDto();
+            BeanUtils.copyProperties(item, dto);
+            result.add(dto);
+        });
+        return result;
+    }
+
+    @Override
+    public List<FinanceZbjTypeListDto> baseZbjTypeAllList(FinanceSelectCommonVo commonVo) {
         LambdaQueryWrapper<FinanceBaseZbjType> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(commonVo.getKeyword() != null && !commonVo.getKeyword().isEmpty(), FinanceBaseZbjType::getZbjQdType, commonVo.getKeyword());
         List<FinanceBaseZbjType> list = list(queryWrapper);

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

@@ -76,8 +76,9 @@ public class FinanceOrderDetailServiceImpl extends ServiceImpl<FinanceOrderDetai
     }
 
     @Override
-    public PageInfo<FinanceOrderDetailListDto> selectBiFinanceCostDetailList(FinanceCostVo financeCostVo) {
+    public PageInfo<FinanceOrderDetailListDto> selectBiFinanceCostDetailPage(FinanceCostVo financeCostVo) {
         FinanceCostWq qw = new FinanceCostWq();
+
         BeanUtils.copyProperties(financeCostVo, qw);
         PageInfo<FinanceOrderDetail> financeOrderDetailPageInfo = detailDao.selectBiFinanceCostDetailList(qw);