From 26ce635192510a10cb77c3a8d1b0ef90476979fa Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Sat, 1 Jul 2023 15:46:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E7=8E=87=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=8C=E5=8A=A0=E4=BA=86=20=E4=BC=A0=E5=8E=BBOA=E7=9A=84?= =?UTF-8?q?=E5=87=A0=E4=B8=AA=E8=B4=B9=E7=94=A8=E7=8E=87=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bir/controller/BirRoiRateController.java | 10 +- .../modules/bir/entity/so/BirCostRoiSo.java | 2 +- .../bir/entity/vo/BirRoiCostItemVo.java | 4 +- .../serve/modules/bir/entity/vo/BirRoiVo.java | 46 +-- .../modules/bir/entity/vo/YtdQtdToOAVo.java | 29 ++ .../modules/bir/mapper/BirRoiRateMapper.java | 3 + .../bir/service/BirRoiRateService.java | 8 + .../service/impl/BirRoiRateServiceImpl.java | 270 ++++++++++++++---- .../erp/mapper/ErpDispatchDataMapper.java | 6 + .../resources/mapper/bir/BirRoiRateMapper.xml | 37 ++- .../mapper/erp/ErpDispatchDataMapper.xml | 13 + 11 files changed, 319 insertions(+), 109 deletions(-) create mode 100644 src/main/java/com/qs/serve/modules/bir/entity/vo/YtdQtdToOAVo.java 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 365b0b4a..4c72465e 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 @@ -12,6 +12,7 @@ import com.qs.serve.common.util.AuthContextUtils; import com.qs.serve.modules.bir.entity.BirBaseActivity; import com.qs.serve.modules.bir.entity.so.BirCostRoiSo; 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.BirBaseActivityService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -79,8 +80,13 @@ public class BirRoiRateController { */ @RepeatSubmit @GetMapping("/costYearMonth") - public R> getCostRoiOfYearMonth(BirCostRoiSo param){ - return R.ok(birRoiRateService.getCostRoiOfYearMonth(param)); + public R getCostRoiOfYearMonth(BirCostRoiSo param){ + BirRoiVo vo = new BirRoiVo(); + List itemList = birRoiRateService.getCostRoiOfYearMonth(param); + vo.setItemList(itemList); + vo.setYtdPercent(birRoiRateService.getYtdPercent(itemList)); + vo.setQtdPercent(birRoiRateService.getQtdPercent(itemList)); + return R.ok(vo); } diff --git a/src/main/java/com/qs/serve/modules/bir/entity/so/BirCostRoiSo.java b/src/main/java/com/qs/serve/modules/bir/entity/so/BirCostRoiSo.java index 8d3d3b58..d27ba7c8 100644 --- a/src/main/java/com/qs/serve/modules/bir/entity/so/BirCostRoiSo.java +++ b/src/main/java/com/qs/serve/modules/bir/entity/so/BirCostRoiSo.java @@ -23,5 +23,5 @@ public class BirCostRoiSo { */ private Integer loadType; - + private String userId; } diff --git a/src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiCostItemVo.java b/src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiCostItemVo.java index e4cf6e9e..54510393 100644 --- a/src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiCostItemVo.java +++ b/src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiCostItemVo.java @@ -32,7 +32,7 @@ public class BirRoiCostItemVo { private BigDecimal costAmt; /** - * 核销金额（实际金额+预估金额） + * 核销金额（实际金额） */ private BigDecimal checkAmt; @@ -56,5 +56,7 @@ public class BirRoiCostItemVo { */ private BigDecimal dispatchAmt; + private Float ytdPercent; + private Float qtdPercent; } diff --git a/src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiVo.java b/src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiVo.java index 54510393..fce71d0b 100644 --- a/src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiVo.java +++ b/src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiVo.java @@ -5,56 +5,16 @@ import lombok.Data; import java.math.BigDecimal; import java.time.LocalDate; +import java.util.List; /** * @author YenHex * @since 2023/6/6 */ @Data -public class BirRoiCostItemVo { +public class BirRoiVo { - /** - * 年/月 - */ - private Integer yearMonth; - - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - private LocalDate yearMonthDate; - - /** - * 预估金额 - */ - private BigDecimal preAmt; - - /** - * 费用金额（实际金额+预估金额） - */ - private BigDecimal costAmt; - - /** - * 核销金额（实际金额） - */ - private BigDecimal checkAmt; - - /** - * 费用金额（实际金额） - */ - private BigDecimal costRealAmt; - - /** - * 核销金额（实际金额） - */ - private BigDecimal checkRealAmt; - - /** - * 利润金额 - */ - private BigDecimal returnAmt; - - /** - * 发货金额(原发货金额) - */ - private BigDecimal dispatchAmt; + private List itemList; private Float ytdPercent; diff --git a/src/main/java/com/qs/serve/modules/bir/entity/vo/YtdQtdToOAVo.java b/src/main/java/com/qs/serve/modules/bir/entity/vo/YtdQtdToOAVo.java new file mode 100644 index 00000000..5acc41a4 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bir/entity/vo/YtdQtdToOAVo.java @@ -0,0 +1,29 @@ +package com.qs.serve.modules.bir.entity.vo; + +import lombok.Data; + +import java.util.List; + +/** + * @author YenHex + * @since 2023/6/6 + */ +@Data +public class YtdQtdToOAVo { + + private Float ytdCustomerPercent; + + private Float ytdUserPercent; + + private Float ytdRegion2Percent; + + private Float ytdRegionPercent; + + private Float qtdCustomerPercent; + + private Float qtdUserPercent; + + private Float qtdRegion2Percent; + + private Float qtdRegionPercent; +} diff --git a/src/main/java/com/qs/serve/modules/bir/mapper/BirRoiRateMapper.java b/src/main/java/com/qs/serve/modules/bir/mapper/BirRoiRateMapper.java index 9b9df5a5..b7d477da 100644 --- a/src/main/java/com/qs/serve/modules/bir/mapper/BirRoiRateMapper.java +++ b/src/main/java/com/qs/serve/modules/bir/mapper/BirRoiRateMapper.java @@ -7,6 +7,7 @@ import com.qs.serve.modules.bir.entity.dto.BirRoiCostDTO; import com.qs.serve.modules.bir.entity.vo.BirRoiCostItemVo; import org.apache.ibatis.annotations.Param; +import java.math.BigDecimal; import java.util.List; /** @@ -23,5 +24,7 @@ public interface BirRoiRateMapper extends BaseMapper { @InterceptorIgnore(tenantLine = "1") List queryRoiCostItems(@Param("query") BirRoiCostDTO param); + @InterceptorIgnore(tenantLine = "1") + BigDecimal querySumAmt(@Param("query") BirRoiCostDTO param); } diff --git a/src/main/java/com/qs/serve/modules/bir/service/BirRoiRateService.java b/src/main/java/com/qs/serve/modules/bir/service/BirRoiRateService.java index 8e19051e..04007c34 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/BirRoiRateService.java +++ b/src/main/java/com/qs/serve/modules/bir/service/BirRoiRateService.java @@ -6,6 +6,8 @@ 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.BirRoiCostItemVo; +import com.qs.serve.modules.bir.entity.vo.YtdQtdToOAVo; +import com.qs.serve.modules.tbs.entity.TbsCostApply; import java.util.List; @@ -30,5 +32,11 @@ public interface BirRoiRateService extends IService { */ List getCostRoiOfYearMonth(BirCostRoiSo param); + Float getYtdPercent(List list); + + Float getQtdPercent(List list); + + YtdQtdToOAVo buildYtdAndQtdData(TbsCostApply apply); + } diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java index e27dee1b..495fb58a 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java @@ -6,10 +6,12 @@ import com.qs.serve.common.model.dto.DateSplitDTO; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.util.Assert; import com.qs.serve.common.util.AuthContextUtils; +import com.qs.serve.common.util.CopierUtil; import com.qs.serve.common.util.DateSplitUtil; 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.BirRoiCostItemVo; +import com.qs.serve.modules.bir.entity.vo.YtdQtdToOAVo; import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.bms.mapper.BmsSupplierMapper; import com.qs.serve.modules.erp.entity.ErpDispatchData; @@ -18,6 +20,7 @@ import com.qs.serve.modules.erp.mapper.ErpDispatchDataMapper; import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.mapper.SysUserMapper; import com.qs.serve.modules.tbs.entity.TbsActivity; +import com.qs.serve.modules.tbs.entity.TbsCostApply; import com.qs.serve.modules.tbs.mapper.TbsActivityMapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -29,6 +32,7 @@ import com.qs.serve.modules.bir.mapper.BirRoiRateMapper; 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; @@ -102,68 +106,10 @@ public class BirRoiRateServiceImpl extends ServiceImpl supplierCodeList = new ArrayList<>(); - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.select(BmsSupplier::getId,BmsSupplier::getCode); - if(loadType.equals(0)){ - //0->客户 - supplierCodeList.add(bmsSupplier.getCode()); - costDTO.setSupplierId(supplierId); - }else if (loadType.equals(1)){ - //1->申请人的客户 - String userId = AuthContextUtils.getSysUserId(); - costDTO.setNotSupplierId(supplierId); - costDTO.setUserId(userId); - //加载用户的其它供应商编码 - BmsSupplier param4Supplier = new BmsSupplier(); - param4Supplier.setUserId(userId); - List supplierList = bmsSupplierMapper.selectSupplierList(param4Supplier); - List supplierCodes = supplierList.stream() - .filter(a->!a.getId().equals(supplierId)).map(BmsSupplier::getCode) - .distinct().collect(Collectors.toList()); - supplierCodeList.addAll(supplierCodes); - }else if(loadType.equals(2)){ - //2->客户的行政区域 - if(checkNotNullVale(bmsSupplier.getRegion2Fourthly())){ - lqw.eq(BmsSupplier::getRegion2Fourthly,bmsSupplier.getRegion2Fourthly()); - }else if (checkNotNullVale(bmsSupplier.getRegion2Third())){ - lqw.eq(BmsSupplier::getRegion2Third,bmsSupplier.getRegion2Third()); - } if (checkNotNullVale(bmsSupplier.getRegion2Second())){ - lqw.eq(BmsSupplier::getRegion2Second,bmsSupplier.getRegion2Second()); - } if (checkNotNullVale(bmsSupplier.getRegion2First())){ - lqw.eq(BmsSupplier::getRegion2First,bmsSupplier.getRegion2First()); - }else{ - lqw.eq(BmsSupplier::getId,"0"); - } - }else if(loadType.equals(3)){ - //3->客户的销售区域 - if(checkNotNullVale(bmsSupplier.getRegionFourthly())){ - lqw.eq(BmsSupplier::getRegionFourthly,bmsSupplier.getRegionFourthly()); - }else if (checkNotNullVale(bmsSupplier.getRegionThird())){ - lqw.eq(BmsSupplier::getRegionThird,bmsSupplier.getRegionThird()); - } if (checkNotNullVale(bmsSupplier.getRegionSecond())){ - lqw.eq(BmsSupplier::getRegionSecond,bmsSupplier.getRegionSecond()); - } if (checkNotNullVale(bmsSupplier.getRegionFirst())){ - lqw.eq(BmsSupplier::getRegionFirst,bmsSupplier.getRegionFirst()); - }else{ - lqw.eq(BmsSupplier::getId,"0"); - } - } - if (loadType.equals(2)||loadType.equals(3)){ - List supplierList = bmsSupplierMapper.selectList(lqw); - List supplierIds = supplierList.stream().map(BmsSupplier::getId) - .distinct().collect(Collectors.toList()); - List supplierCodes = supplierList.stream().map(BmsSupplier::getCode) - .distinct().collect(Collectors.toList()); - supplierCodeList.addAll(supplierCodes); - //防止空值 - supplierIds.add("0"); - costDTO.setSupplierIds(supplierIds); - } - //防止空值 - supplierCodeList.add("0"); + //设置查询条件和返回客户CODELIST + List supplierCodeList = setBiroiCostDTOAndFindSupplierCodes(costDTO,supplierId,loadType,param.getUserId()); + List costItemVoList = this.queryRoiCostItems(costDTO); //发货单 @@ -228,5 +174,207 @@ public class BirRoiRateServiceImpl extends ServiceImpl list){ + Float ytdPercent = null; + + LocalDate currMonth = LocalDate.now(); + if(currMonth.getMonthValue()==1){ + return ytdPercent; + } + + BigDecimal costAmt = BigDecimal.ZERO; + BigDecimal dispatchAmt = BigDecimal.ZERO; + + int currMonthNum = currMonth.getYear()*100 + currMonth.getMonthValue(); + int startMonthNum = currMonth.getYear()*100 + 1; + + for(BirRoiCostItemVo vo:list){ + if(vo.getYearMonth()<=currMonthNum && vo.getYearMonth()>=startMonthNum){ + costAmt = costAmt.add(vo.getCostAmt()); + dispatchAmt = dispatchAmt.add(vo.getDispatchAmt()); + } + } + + if(dispatchAmt.compareTo(BigDecimal.ZERO)>0) { + ytdPercent = costAmt.divide(dispatchAmt,4, RoundingMode.HALF_UP).floatValue(); + } + + return ytdPercent; + } + + public Float getQtdPercent(List list){ + Float qtdPercent = null; + + LocalDate currMonth = LocalDate.now(); + if(currMonth.getMonthValue()==1){ + return qtdPercent; + } + // 获取当前季度的第一个月 + Month firstMonthOfQuarter = currMonth.getMonth().firstMonthOfQuarter(); + // 获取当季第一个月的整数表示 + int firstMonthInteger = firstMonthOfQuarter.getValue(); + + if(firstMonthInteger == currMonth.getMonthValue()){ + return qtdPercent; + } + + int currMonthNum = currMonth.getYear()*100 + currMonth.getMonthValue(); + int startMonthNum = currMonth.getYear()*100 + firstMonthInteger; + + BigDecimal costAmt = BigDecimal.ZERO; + BigDecimal dispatchAmt = BigDecimal.ZERO; + + for(BirRoiCostItemVo vo:list){ + if(vo.getYearMonth()<=currMonthNum && vo.getYearMonth()>=startMonthNum){ + costAmt = costAmt.add(vo.getCostAmt()); + dispatchAmt = dispatchAmt.add(vo.getDispatchAmt()); + } + } + + if(dispatchAmt.compareTo(BigDecimal.ZERO)>0) { + qtdPercent = costAmt.divide(dispatchAmt,4, RoundingMode.HALF_UP).floatValue(); + } + + return qtdPercent; + } + + + public YtdQtdToOAVo buildYtdAndQtdData(TbsCostApply apply){ + YtdQtdToOAVo vo = new YtdQtdToOAVo(); + getYtdData(vo,apply.getSupplierId().toString(), apply.getUserId()); + getQtdData(vo,apply.getSupplierId().toString(), apply.getUserId()); + return vo; + } + + private void getYtdData(YtdQtdToOAVo vo,String supplierId,String userId){ + LocalDate currMonth = LocalDate.now(); + if(currMonth.getMonthValue()==1){ + return ; + } + + int currMonthNum = currMonth.getYear()*100 + currMonth.getMonthValue(); + int startMonthNum = currMonth.getYear()*100 + 1; + + BirRoiCostDTO costDTO = new BirRoiCostDTO(); + costDTO.setStartMonthNum(startMonthNum); + costDTO.setEndMonthNum(currMonthNum); + + Float customerPercent = getPercenDateByLoadType(0,costDTO,supplierId,userId); + Float userPercent = getPercenDateByLoadType(1,costDTO,supplierId,userId);; + Float region2Percent = getPercenDateByLoadType(2,costDTO,supplierId,userId);; + Float regionPercent = getPercenDateByLoadType(3,costDTO,supplierId,userId);; + + vo.setYtdCustomerPercent(customerPercent); + vo.setYtdUserPercent(userPercent); + vo.setYtdRegion2Percent(region2Percent); + vo.setYtdRegionPercent(regionPercent); + } + + private void getQtdData(YtdQtdToOAVo vo,String supplierId,String userId){ + LocalDate currMonth = LocalDate.now(); + if(currMonth.getMonthValue()==1){ + return ; + } + + Month firstMonthOfQuarter = currMonth.getMonth().firstMonthOfQuarter(); + // 获取当季第一个月的整数表示 + int firstMonthInteger = firstMonthOfQuarter.getValue(); + + if(firstMonthInteger == currMonth.getMonthValue()){ + return ; + } + + int currMonthNum = currMonth.getYear()*100 + currMonth.getMonthValue(); + int startMonthNum = currMonth.getYear()*100 + firstMonthInteger; + + BirRoiCostDTO costDTO = new BirRoiCostDTO(); + costDTO.setStartMonthNum(startMonthNum); + costDTO.setEndMonthNum(currMonthNum); + + Float customerPercent = getPercenDateByLoadType(0,costDTO,supplierId,userId); + Float userPercent = getPercenDateByLoadType(1,costDTO,supplierId,userId);; + Float region2Percent = getPercenDateByLoadType(2,costDTO,supplierId,userId);; + Float regionPercent = getPercenDateByLoadType(3,costDTO,supplierId,userId);; + + vo.setQtdCustomerPercent(customerPercent); + vo.setQtdUserPercent(userPercent); + vo.setQtdRegion2Percent(region2Percent); + vo.setQtdRegionPercent(regionPercent); + } + + private Float getPercenDateByLoadType(Integer loadType,BirRoiCostDTO oriCostDTO,String supplierId,String userId){ + BirRoiCostDTO costDTO = CopierUtil.copy(oriCostDTO,new BirRoiCostDTO()); + List supplierCodeList = setBiroiCostDTOAndFindSupplierCodes(costDTO, supplierId, loadType, userId); + Float tempPercent = getPercentDate(costDTO,supplierCodeList); + return tempPercent; + } + + private Float getPercentDate(BirRoiCostDTO costDTO,List supplierCodeList){ + Float percent = null; + + Integer startMonthNum = costDTO.getStartMonthNum(); + Integer endMonthNum = costDTO.getEndMonthNum(); + BigDecimal dispatchSumAmt = dispatchDataMapper.querySumCostAmt(startMonthNum,endMonthNum,supplierCodeList); + + if(dispatchSumAmt == null || dispatchSumAmt.compareTo(BigDecimal.ZERO)<=0) { + return percent; + } + + BigDecimal costSumAmt = baseMapper.querySumAmt(costDTO); + percent = costSumAmt.divide(dispatchSumAmt,4, RoundingMode.HALF_UP).floatValue(); + return percent; + } + + private List setBiroiCostDTOAndFindSupplierCodes(BirRoiCostDTO costDTO,String supplierId,Integer loadType,String userId){ + BmsSupplier bmsSupplier = bmsSupplierMapper.selectById(supplierId); + List supplierCodeList = new ArrayList<>(); + + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.select(BmsSupplier::getId,BmsSupplier::getCode); + if(loadType.equals(0)){ + //0->客户 + supplierCodeList.add(bmsSupplier.getCode()); + costDTO.setSupplierId(supplierId); + }else if (loadType.equals(1)){ + //1->申请人的客户 + costDTO.setUserId(userId); + //加载用户的其它供应商编码 + BmsSupplier param4Supplier = new BmsSupplier(); + param4Supplier.setCurrUserId(userId); + List supplierList = bmsSupplierMapper.selectSupplierList(param4Supplier); + List supplierCodes = supplierList.stream() + .map(BmsSupplier::getCode) + .distinct().collect(Collectors.toList()); + supplierCodeList.addAll(supplierCodes); + }else if(loadType.equals(2)){ + //2->客户的行政区域 + if (checkNotNullVale(bmsSupplier.getRegion2Second())){ + lqw.eq(BmsSupplier::getRegion2Second,bmsSupplier.getRegion2Second()); + }else{ + lqw.eq(BmsSupplier::getId,"0"); + } + }else if(loadType.equals(3)){ + //3->客户的销售区域 + if (checkNotNullVale(bmsSupplier.getRegionSecond())){ + lqw.eq(BmsSupplier::getRegionSecond,bmsSupplier.getRegionSecond()); + }else{ + lqw.eq(BmsSupplier::getId,"0"); + } + } + if (loadType.equals(2)||loadType.equals(3)){ + List supplierList = bmsSupplierMapper.selectList(lqw); + List supplierIds = supplierList.stream().map(BmsSupplier::getId) + .distinct().collect(Collectors.toList()); + List supplierCodes = supplierList.stream().map(BmsSupplier::getCode) + .distinct().collect(Collectors.toList()); + supplierCodeList.addAll(supplierCodes); + //防止空值 + supplierIds.add("0"); + costDTO.setSupplierIds(supplierIds); + } + //防止空值 + supplierCodeList.add("0"); + return supplierCodeList; + } } diff --git a/src/main/java/com/qs/serve/modules/erp/mapper/ErpDispatchDataMapper.java b/src/main/java/com/qs/serve/modules/erp/mapper/ErpDispatchDataMapper.java index ab3994c6..e1144d92 100644 --- a/src/main/java/com/qs/serve/modules/erp/mapper/ErpDispatchDataMapper.java +++ b/src/main/java/com/qs/serve/modules/erp/mapper/ErpDispatchDataMapper.java @@ -6,6 +6,7 @@ import com.qs.serve.modules.erp.entity.ErpDispatchData; import com.qs.serve.modules.erp.entity.dto.ErpDispatchSumVo; import org.apache.ibatis.annotations.Param; +import java.math.BigDecimal; import java.util.List; /** @@ -27,5 +28,10 @@ public interface ErpDispatchDataMapper extends BaseMapper { @Param("endNumber")Integer endNumber, @Param("cusCodes")List cusCodes); + @InterceptorIgnore(tenantLine = "1") + BigDecimal querySumCostAmt(@Param("startNumber")Integer startNumber, + @Param("endNumber")Integer endNumber, + @Param("cusCodes")List cusCodes); + } diff --git a/src/main/resources/mapper/bir/BirRoiRateMapper.xml b/src/main/resources/mapper/bir/BirRoiRateMapper.xml index c8eed514..9716487e 100644 --- a/src/main/resources/mapper/bir/BirRoiRateMapper.xml +++ b/src/main/resources/mapper/bir/BirRoiRateMapper.xml @@ -105,7 +105,6 @@ and bir_base_activity.supplier_id = #{query.supplierId} - and bir_base_activity.supplier_id != #{query.notSupplierId} and bir_base_activity.user_id = #{query.userId} @@ -127,6 +126,42 @@ `year_month` desc + diff --git a/src/main/resources/mapper/erp/ErpDispatchDataMapper.xml b/src/main/resources/mapper/erp/ErpDispatchDataMapper.xml index 94336433..ef12539a 100644 --- a/src/main/resources/mapper/erp/ErpDispatchDataMapper.xml +++ b/src/main/resources/mapper/erp/ErpDispatchDataMapper.xml @@ -64,6 +64,19 @@ GROUP BY DATE_FORMAT(date,'%Y%m') +