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 index d7711575..1c3e0e4c 100644 --- a/src/main/java/com/qs/serve/common/model/dto/HeaderOption.java +++ b/src/main/java/com/qs/serve/common/model/dto/HeaderOption.java @@ -11,11 +11,11 @@ import lombok.Data; public class HeaderOption { private String name; - private String width; - private String prefix; - private String suffix; - private Boolean isSum; - private Integer decimalLength; +// 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 96d87a84..2fdf203e 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 @@ -93,11 +93,9 @@ public class BirRoiRateController { * 台账 * @return */ - @GetMapping("/test33") - public R test33(){ - birReportAccountBookService.getReportAccountBookData(""); - - return R.ok(); + @GetMapping("/standingBookByCall") + public R standingBookByCall(String type){ + return R.ok(birReportAccountBookService.getReportAccountBookData(type)); } /** 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 index 2ffaa228..c9905d4c 100644 --- a/src/main/java/com/qs/serve/modules/bir/mapper/BirReportAccountBookMapper.java +++ b/src/main/java/com/qs/serve/modules/bir/mapper/BirReportAccountBookMapper.java @@ -25,7 +25,7 @@ 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); + void getReportHeader(Map map); @Select("call get_tbs_report_region()") @Options(statementType = StatementType.CALLABLE) diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java index d0234cf7..9624e13b 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java @@ -2,6 +2,7 @@ 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.model.dto.HeaderOption; import com.qs.serve.common.util.CopierUtil; import com.qs.serve.modules.bir.entity.BirRoiRate; import com.qs.serve.modules.bir.entity.dto.BirRoiCostDTO; @@ -17,6 +18,7 @@ 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.common.TbsCenterType; import com.qs.serve.modules.tbs.entity.TbsCostApply; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -26,10 +28,7 @@ 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.*; import java.util.stream.Collectors; /** @@ -48,10 +47,18 @@ public class BirReportAccountBookServiceImpl implements BirReportAccountBookServ BirReportVo vo = new BirReportVo(); - String headerString = new String(); - birReportAccountBookMapper.getReportHeader(headerString); + Map map = new HashMap<>(); + map.put("result",""); + birReportAccountBookMapper.getReportHeader(map); - System.out.println(); + String headerString = map.get("result"); + List headerOptions = Arrays.stream(headerString.split(",")).map(a->new HeaderOption(a)).collect(Collectors.toList()); + + vo.setHeaderList(headerOptions); + + if(type.equals(TbsCenterType.saleRegion.name())){ + vo.setItemList(birReportAccountBookMapper.reportAccountBookRegion()); + } return vo; }