From 754a0c9096e0d49854027654d970e71d0e55439c Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Mon, 10 Jul 2023 09:14:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serve/common/model/dto/HeaderOption.java | 23 ++++++++ .../bir/controller/BirRoiRateController.java | 4 +- .../modules/bir/entity/vo/BirReportVo.java | 20 +++++++ .../mapper/BirReportAccountBookMapper.java | 51 ++++++++++++++++ .../BirActivityCenterGoodsService.java | 2 - .../service/BirReportAccountBookService.java | 16 +++++ .../BirActivityCenterGoodsServiceImpl.java | 2 + .../impl/BirReportAccountBookServiceImpl.java | 59 +++++++++++++++++++ .../BirScheduleItemBudgetServiceImpl.java | 1 + .../serve/modules/tbs/entity/TbsActivity.java | 10 ++-- 10 files changed, 180 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/qs/serve/common/model/dto/HeaderOption.java create mode 100644 src/main/java/com/qs/serve/modules/bir/entity/vo/BirReportVo.java create mode 100644 src/main/java/com/qs/serve/modules/bir/mapper/BirReportAccountBookMapper.java create mode 100644 src/main/java/com/qs/serve/modules/bir/service/BirReportAccountBookService.java create mode 100644 src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java diff --git a/src/main/java/com/qs/serve/common/model/dto/HeaderOption.java b/src/main/java/com/qs/serve/common/model/dto/HeaderOption.java new file mode 100644 index 00000000..d7711575 --- /dev/null +++ b/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; + } +} diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java index 9df0d154..96d87a84 100644 --- a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java +++ b/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(); } diff --git a/src/main/java/com/qs/serve/modules/bir/entity/vo/BirReportVo.java b/src/main/java/com/qs/serve/modules/bir/entity/vo/BirReportVo.java new file mode 100644 index 00000000..e92c9c19 --- /dev/null +++ b/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> itemList; + + private List headerList; + +} diff --git a/src/main/java/com/qs/serve/modules/bir/mapper/BirReportAccountBookMapper.java b/src/main/java/com/qs/serve/modules/bir/mapper/BirReportAccountBookMapper.java new file mode 100644 index 00000000..2ffaa228 --- /dev/null +++ b/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> reportAccountBookRegion(); + + @Select("call get_tbs_report_customer()") + @Options(statementType = StatementType.CALLABLE) + @InterceptorIgnore(tenantLine = "true") + List> reportAccountBookCustomer(); + + @Select("call get_tbs_report_bizregion()") + @Options(statementType = StatementType.CALLABLE) + @InterceptorIgnore(tenantLine = "true") + List> reportAccountBookBizRegion(); + + @Select("call get_tbs_report_center()") + @Options(statementType = StatementType.CALLABLE) + @InterceptorIgnore(tenantLine = "true") + List> reportAccountBookCenter(); + +} + diff --git a/src/main/java/com/qs/serve/modules/bir/service/BirActivityCenterGoodsService.java b/src/main/java/com/qs/serve/modules/bir/service/BirActivityCenterGoodsService.java index 7a3a3855..3b9a99fa 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/BirActivityCenterGoodsService.java +++ b/src/main/java/com/qs/serve/modules/bir/service/BirActivityCenterGoodsService.java @@ -17,7 +17,5 @@ public interface BirActivityCenterGoodsService extends IService lqw = new LambdaQueryWrapper<>(); lqw.select(TbsBudget::getId); diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java index 34c5390d..0c48ef42 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java +++ b/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;