1、财务分析基础数据-直播间分类上传接口

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

 package com.link.bi.controller.query;
 
-import com.link.bi.pojo.request.FinanceSelectCommonVo;
+import com.link.bi.pojo.request.FinanceBaseZbjTypeListVo;
 import com.link.bi.pojo.response.FinanceZbjTypeListDto;
 import com.link.bi.service.FinanceBaseZbjTypeService;
 import com.sfa.common.core.web.controller.BaseController;
@@ -25,13 +25,13 @@ public class FinanceBaseZbjTypeController extends BaseController {
     private FinanceBaseZbjTypeService baseZbjTypeService;
     /**
      * 直播间分类的页面查询
-     * @param commonVo
+     * @param zbjTypeListVo
      * @return
      */
     @RequiresPermissions("bi:livecate:list")
     @GetMapping("/list")
-    public List<FinanceZbjTypeListDto> baseZbjTypeAllList(FinanceSelectCommonVo commonVo) {
-        return baseZbjTypeService.baseZbjTypeAllList(commonVo);
+    public List<FinanceZbjTypeListDto> baseZbjTypeAllList(FinanceBaseZbjTypeListVo zbjTypeListVo) {
+        return baseZbjTypeService.baseZbjTypeAllList(zbjTypeListVo);
     }
 
     @RequiresPermissions("bi:livecate:list")

src/main/java/com/link/bi/domain/entity/CollectErrorInfo.java

 package com.link.bi.domain.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -19,6 +21,7 @@ public class CollectErrorInfo {
         /**
          * 唯一键，自动递增
          */
+        @TableId(type = IdType.AUTO)
         private Long ceiId;
 
         /**

src/main/java/com/link/bi/domain/entity/EcBaStoreDailyData.java

 package com.link.bi.domain.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sfa.common.core.annotation.Excel;
@@ -24,6 +26,7 @@ public class EcBaStoreDailyData extends BaseDo
     private static final long serialVersionUID = 1L;
 
     /** id标识 */
+    @TableId(type = IdType.AUTO)
     private Long ebtId;
 
     /** 年份 */

src/main/java/com/link/bi/domain/entity/FinanceBaseProduct.java

@@ -2,6 +2,7 @@ package com.link.bi.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import java.math.BigDecimal;
 
@@ -11,6 +12,7 @@ import java.math.BigDecimal;
  * @author lvbencai
  * @date 2025年01月07日10:04:25
   */
+@TableName(value = "finance_base_product")
 @Data
 public class FinanceBaseProduct {
     // 唯一标识主键

src/main/java/com/link/bi/domain/entity/FinanceBaseZbjType.java

@@ -2,6 +2,7 @@ package com.link.bi.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -12,6 +13,7 @@ import java.time.LocalDateTime;
  * @author lvbcai
  * @date 2025年01月07日10:04:25
  */
+@TableName(value = "finance_base_zbj_type")
 @Data
 public class FinanceBaseZbjType {
     // 唯一键
@@ -26,7 +28,7 @@ public class FinanceBaseZbjType {
     // 备注
     private String remark;
     // 是否删除标志 0 未删除 1 已删除
-    private char delFlag;
+    private Integer delFlag;
     // 创建者
     private String createBy;
     // 创建人 UserID

src/main/java/com/link/bi/domain/entity/OppoCmm.java

 package com.link.bi.domain.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sfa.common.core.annotation.Excel;
@@ -25,6 +27,7 @@ public class OppoCmm implements Serializable {
     /**
      * id标识
      */
+    @TableId(type = IdType.AUTO)
     private Long cmmId;
 
     /**

src/main/java/com/link/bi/domain/entity/OppoSycm.java

 package com.link.bi.domain.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sfa.common.core.annotation.Excel;
@@ -24,6 +26,7 @@ public class OppoSycm implements Serializable {
     /**
      * id标识
      */
+    @TableId(type = IdType.AUTO)
     private Long sycmId;
 
     /**

src/main/java/com/link/bi/domain/entity/OppoSycmStore.java

 package com.link.bi.domain.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sfa.common.core.annotation.Excel;
@@ -25,6 +27,7 @@ public class OppoSycmStore extends BaseDo implements Serializable {
     /**
      * id标识
      */
+    @TableId(type = IdType.AUTO)
     private Long sycmsId;
 
     /**

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

+package com.link.bi.pojo.request;
+
+import lombok.Data;
+
+/**
+ * 财务成本页面下拉选择框搜索的通用vo
+ */
+@Data
+public class FinanceBaseZbjTypeListVo {
+    private String zbjQdType;
+}

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

@@ -4,6 +4,7 @@ package com.link.bi.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.link.bi.domain.entity.FinanceBaseZbjType;
+import com.link.bi.pojo.request.FinanceBaseZbjTypeListVo;
 import com.link.bi.pojo.request.FinanceSelectCommonVo;
 import com.link.bi.pojo.response.FinanceZbjTypeListDto;
 import org.springframework.web.multipart.MultipartFile;
@@ -19,7 +20,7 @@ public interface FinanceBaseZbjTypeService extends IService<FinanceBaseZbjType>
 
     List<FinanceZbjTypeListDto> baseZbjTypeList(FinanceSelectCommonVo commonVo);
 
-    List<FinanceZbjTypeListDto> baseZbjTypeAllList(FinanceSelectCommonVo commonVo);
+    List<FinanceZbjTypeListDto> baseZbjTypeAllList(FinanceBaseZbjTypeListVo commonVo);
 
     String importData(MultipartFile file);
 }

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

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.link.bi.config.listener.FinanceBaseZbjTypeListener;
 import com.link.bi.domain.entity.FinanceBaseZbjType;
 import com.link.bi.domain.mapper.FinanceBaseZbjTypeMapper;
+import com.link.bi.pojo.request.FinanceBaseZbjTypeListVo;
 import com.link.bi.pojo.request.FinanceSelectCommonVo;
 import com.link.bi.pojo.response.FinanceZbjTypeListDto;
 import com.link.bi.service.FinanceBaseZbjTypeService;
@@ -75,6 +76,11 @@ public class FinanceBaseZbjTypeServiceImpl extends ServiceImpl<FinanceBaseZbjTyp
         return result;
     }
 
+    /**
+     * 成本分析页面-查询下拉列表数据
+     * @param commonVo
+     * @return
+     */
     @Override
     public List<FinanceZbjTypeListDto> baseZbjTypeList(FinanceSelectCommonVo commonVo) {
         LambdaQueryWrapper<FinanceBaseZbjType> queryWrapper = new LambdaQueryWrapper<>();
@@ -93,10 +99,15 @@ public class FinanceBaseZbjTypeServiceImpl extends ServiceImpl<FinanceBaseZbjTyp
         return result;
     }
 
+    /**
+     * 直播间分类页面-查询列表数据
+     * @param zbjTypeListVo
+     * @return
+     */
     @Override
-    public List<FinanceZbjTypeListDto> baseZbjTypeAllList(FinanceSelectCommonVo commonVo) {
+    public List<FinanceZbjTypeListDto> baseZbjTypeAllList(FinanceBaseZbjTypeListVo zbjTypeListVo) {
         LambdaQueryWrapper<FinanceBaseZbjType> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.like(commonVo.getKeyword() != null && !commonVo.getKeyword().isEmpty(), FinanceBaseZbjType::getZbjQdType, commonVo.getKeyword());
+        queryWrapper.like(zbjTypeListVo.getZbjQdType() != null && !zbjTypeListVo.getZbjQdType().isEmpty(), FinanceBaseZbjType::getZbjQdType, zbjTypeListVo.getZbjQdType());
         List<FinanceBaseZbjType> list = list(queryWrapper);
 
         // 转化成List<FinanceZbjTypeListDto>