报表

src/main/java/com/qs/serve/common/model/dto/HeaderOption.java

@@ -0,0 +1,23 @@
+package com.qs.serve.common.model.dto;
+
+import com.qs.serve.common.util.PageUtil;
+import lombok.Data;
+
+/**
+ * @author YenHex
+ * @since 2023/5/17
+ */
+@Data
+public class HeaderOption {
+
+    private String name;
+    private String width;
+    private String prefix;
+    private String suffix;
+    private Boolean isSum;
+    private Integer decimalLength;
+
+    public HeaderOption(String name){
+        this.name = name;
+    }
+}

src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java

@@ -17,6 +17,7 @@ import com.qs.serve.modules.bir.entity.vo.BirRoiCostItemVo;
 import com.qs.serve.modules.bir.entity.vo.BirRoiVo;
 import com.qs.serve.modules.bir.service.BirActivityCenterGoodsService;
 import com.qs.serve.modules.bir.service.BirBaseActivityService;
+import com.qs.serve.modules.bir.service.BirReportAccountBookService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -42,6 +43,7 @@ public class BirRoiRateController {
     private BirRoiRateService birRoiRateService;
     private BirBaseActivityService activityService;
     private BirActivityCenterGoodsService activityCenterGoodsService;
+    private BirReportAccountBookService birReportAccountBookService;
 
     /**
      * 台账数据集
@@ -93,7 +95,7 @@ public class BirRoiRateController {
      */
     @GetMapping("/test33")
     public R<?> test33(){
-        activityCenterGoodsService.buildReport(2023,1);
+        birReportAccountBookService.getReportAccountBookData("");
 
         return R.ok();
     }

src/main/java/com/qs/serve/modules/bir/entity/vo/BirReportVo.java

@@ -0,0 +1,20 @@
+package com.qs.serve.modules.bir.entity.vo;
+
+import com.qs.serve.common.model.dto.HeaderOption;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author YenHex
+ * @since 2023/6/6
+ */
+@Data
+public class BirReportVo {
+
+    private List<Map<String,Object>> itemList;
+
+    private List<HeaderOption> headerList;
+
+}

src/main/java/com/qs/serve/modules/bir/mapper/BirReportAccountBookMapper.java

@@ -0,0 +1,51 @@
+package com.qs.serve.modules.bir.mapper;
+
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qs.serve.modules.bir.entity.BirBaseActivity;
+import com.qs.serve.modules.tbs.entity.TbsActivity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.mapping.StatementType;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * ROI费率(活动档案) Mapper
+ * @author YenHex
+ * @date 2023-06-05
+ */
+@Mapper
+public interface BirReportAccountBookMapper {
+
+    @Select("call get_report_header(#{result, mode=OUT, jdbcType=VARCHAR})")
+    @Options(statementType = StatementType.CALLABLE)
+    @InterceptorIgnore(tenantLine = "true")
+    void getReportHeader(@Param("result") String headerString);
+
+    @Select("call get_tbs_report_region()")
+    @Options(statementType = StatementType.CALLABLE)
+    @InterceptorIgnore(tenantLine = "true")
+    List<Map<String, Object>> reportAccountBookRegion();
+
+    @Select("call get_tbs_report_customer()")
+    @Options(statementType = StatementType.CALLABLE)
+    @InterceptorIgnore(tenantLine = "true")
+    List<Map<String, Object>> reportAccountBookCustomer();
+
+    @Select("call get_tbs_report_bizregion()")
+    @Options(statementType = StatementType.CALLABLE)
+    @InterceptorIgnore(tenantLine = "true")
+    List<Map<String, Object>> reportAccountBookBizRegion();
+
+    @Select("call get_tbs_report_center()")
+    @Options(statementType = StatementType.CALLABLE)
+    @InterceptorIgnore(tenantLine = "true")
+    List<Map<String, Object>> reportAccountBookCenter();
+
+}
+

src/main/java/com/qs/serve/modules/bir/service/BirActivityCenterGoodsService.java

@@ -17,7 +17,5 @@ public interface BirActivityCenterGoodsService extends IService<BirActivityCente
      */
     void buildReport(int year, int month);
 
-
-
 }
 

src/main/java/com/qs/serve/modules/bir/service/BirReportAccountBookService.java

@@ -0,0 +1,16 @@
+package com.qs.serve.modules.bir.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qs.serve.modules.bir.entity.BirBaseActivity;
+import com.qs.serve.modules.bir.entity.vo.BirReportVo;
+
+/**
+ * 台帐 服务接口
+ * @author YenHex
+ * @date 2023-06-05
+ */
+public interface BirReportAccountBookService  {
+
+     BirReportVo getReportAccountBookData(String type);
+}
+

src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.common.model.dto.DateSplitDTO;
 import com.qs.serve.common.util.DateSplitUtil;
+import com.qs.serve.common.util.PageUtil;
 import com.qs.serve.modules.bir.entity.BirBaseActivity;
 import com.qs.serve.modules.bir.entity.dto.BirCenterGoodSplitDTO;
 import com.qs.serve.modules.bms.entity.BmsCostCenter;
@@ -17,6 +18,7 @@ import com.qs.serve.modules.tbs.entity.TbsActivity;
 import com.qs.serve.modules.tbs.entity.TbsActivityCenter;
 import com.qs.serve.modules.tbs.entity.TbsActivityCenterGoods;
 import com.qs.serve.modules.tbs.service.TbsActivityCenterGoodsService;
+import com.tencentcloudapi.cii.v20201210.models.ResultObject;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;

src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java

@@ -0,0 +1,59 @@
+package com.qs.serve.modules.bir.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.modules.bir.entity.BirRoiRate;
+import com.qs.serve.modules.bir.entity.dto.BirRoiCostDTO;
+import com.qs.serve.modules.bir.entity.so.BirCostRoiSo;
+import com.qs.serve.modules.bir.entity.vo.BirReportVo;
+import com.qs.serve.modules.bir.entity.vo.BirRoiCostItemVo;
+import com.qs.serve.modules.bir.entity.vo.YtdQtdToOAVo;
+import com.qs.serve.modules.bir.mapper.BirReportAccountBookMapper;
+import com.qs.serve.modules.bir.mapper.BirRoiRateMapper;
+import com.qs.serve.modules.bir.service.BirReportAccountBookService;
+import com.qs.serve.modules.bir.service.BirRoiRateService;
+import com.qs.serve.modules.bms.entity.BmsSupplier;
+import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
+import com.qs.serve.modules.erp.entity.dto.ErpDispatchSumVo;
+import com.qs.serve.modules.erp.mapper.ErpDispatchDataMapper;
+import com.qs.serve.modules.tbs.entity.TbsCostApply;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.Month;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ *  服务实现类
+ * @author YenHex
+ * @since 2023-06-05
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class BirReportAccountBookServiceImpl implements BirReportAccountBookService {
+
+    private final BirReportAccountBookMapper birReportAccountBookMapper;
+
+    public BirReportVo getReportAccountBookData(String type){
+
+        BirReportVo vo = new BirReportVo();
+
+        String headerString = new String();
+        birReportAccountBookMapper.getReportHeader(headerString);
+
+        System.out.println();
+
+        return vo;
+    }
+}
+

src/main/java/com/qs/serve/modules/bir/service/impl/BirScheduleItemBudgetServiceImpl.java

@@ -45,6 +45,7 @@ public class BirScheduleItemBudgetServiceImpl extends ServiceImpl<BirScheduleIte
 
     @Override
     public void buildScheduleItemBudget() {
+
         //加载所有启用的预算
         LambdaQueryWrapper<TbsBudget> lqw = new LambdaQueryWrapper<>();
         lqw.select(TbsBudget::getId);

src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java

@@ -28,7 +28,7 @@ import java.util.List;
  * @since 2022-11-08
  */
 @Data
-@TableName("tbs_activity")
+@TableName(value = "tbs_activity", autoResultMap = true)
 public class TbsActivity implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -37,6 +37,10 @@ public class TbsActivity implements Serializable {
     @TableId(type = IdType.AUTO)
     private Long id;
 
+    /** 附件id */
+    @TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR)
+    private String[] attachIds;
+
     /** 编码 */
     @TableField(condition = SqlCondition.LIKE)
     private String activityCode;
@@ -193,10 +197,6 @@ public class TbsActivity implements Serializable {
 
     private String templateBudgetIds;
 
-    /** 附件id */
-    @TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR)
-    private String[] attachIds;
-
     @TableField(exist = false)
     private List<?> attachList;