新版审批辅助

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

@@ -157,6 +157,22 @@ public class BirRoiRateController {
         return R.ok(list);
     }
 
+    /**
+     * 获取费率
+     * @param query
+     * @return
+     */
+    @RepeatSubmit
+    @PostMapping("/costYearMonthBaseV2")
+    public R<List<BirBaseReportVo>> getCostRoiOfYearMonthBaseV2(@RequestBody BirBudgetTargetSo query){
+        boolean isRestBir = BirHttpUtil.isRestBir();
+        if(isRestBir){
+            return BirHttpUtil.post("/bir/roiRate/costYearMonthBaseV2",query);
+        }
+        List<BirBaseReportVo> list = birBudgetTargetService.listBaseVo(query);
+        return R.ok(list);
+    }
+
     @PostMapping("/buildCustomerCost")
     public R<?> buildCustomerCost(){
 //        boolean isRestBir = BirHttpUtil.isRestBir();

src/main/java/com/qs/serve/modules/bir/entity/so/BirBudgetTargetSo.java

@@ -30,6 +30,9 @@ public class BirBudgetTargetSo {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime yearMonthEnd;
 
+    private Integer yearMonthStartQuery;
+    private Integer yearMonthEndQuery;
+
     private Integer yearStart;
     private Integer yearEnd;
     private Integer monthStart;
@@ -39,6 +42,8 @@ public class BirBudgetTargetSo {
      */
     private String supplierId;
 
+    private String targetId;
+
     /**
      * 成本中心
      */
@@ -64,6 +69,7 @@ public class BirBudgetTargetSo {
     /**客户-成本中心编码 */
     private List<String> supplierIds;
 
+    private List<String> supplierCodes;
 
 
 }

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

@@ -0,0 +1,20 @@
+package com.qs.serve.modules.bir.entity.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author YenHex
+ * @since 2024/6/4
+ */
+@Data
+public class BirBaseDispatchVo {
+
+    /** 年月份 */
+    private Integer yearMonthNum;
+
+    /** 实际发货 */
+    private BigDecimal dispatchAmt;
+
+}

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

@@ -0,0 +1,30 @@
+package com.qs.serve.modules.bir.entity.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author YenHex
+ * @since 2024/6/4
+ */
+@Data
+public class BirBaseReportVo {
+
+    private String year;
+
+    private String month;
+
+    /** 年月份 */
+    private Integer yearMonthNum;
+
+    /** 实际发货 */
+    private BigDecimal dispatchAmt;
+
+    /** 实际总费用 */
+    private BigDecimal totalRealAmt;
+
+    /** 实际总费用率 */
+    private BigDecimal totalRealRate;
+
+}

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

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qs.serve.common.model.consts.DSName;
 import com.qs.serve.modules.bir.entity.BirActivityCenterGoods;
+import com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo;
 import com.qs.serve.modules.bir.entity.so.BirMonthCusCenterSo;
 import com.qs.serve.modules.bir.entity.vo.BirActivityCenterGoodsMonthVo;
+import com.qs.serve.modules.bir.entity.vo.BirBaseDispatchVo;
 import com.qs.serve.modules.tbs.entity.TbsActivityCenterGoods;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -38,8 +40,10 @@ public interface BirActivityCenterGoodsMapper extends BaseMapper<BirActivityCent
 
     List<BirActivityCenterGoodsMonthVo> listMonthCusCenterVo(@Param("query") BirMonthCusCenterSo param);
 
-    List<BirActivityCenterGoods> list4BirBudgetTarget();
+    List<BirActivityCenterGoods> list4BirBudgetTarget(@Param("query") BirBudgetTargetSo so);
 
+    @InterceptorIgnore(tenantLine = "true")
+    List<BirBaseDispatchVo> list4DispatchSqlserver(@Param("query") BirBudgetTargetSo so);
 
 }
 

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

@@ -3,6 +3,7 @@ package com.qs.serve.modules.bir.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qs.serve.modules.bir.entity.BirBudgetTarget;
 import com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo;
+import com.qs.serve.modules.bir.entity.vo.BirBaseReportVo;
 import com.qs.serve.modules.bir.entity.vo.BirBudgetTargetVo;
 
 import java.util.List;
@@ -16,5 +17,7 @@ public interface BirBudgetTargetService extends IService<BirBudgetTarget> {
 
     List<BirBudgetTargetVo> listVo(BirBudgetTargetSo query);
 
+    List<BirBaseReportVo> listBaseVo(BirBudgetTargetSo query);
+
 }
 

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

@@ -100,8 +100,8 @@ public class BirBudgetTargetImportServiceImpl extends ServiceImpl<BirBudgetTarge
     }
 
     public void buildCustomerCost() {
-
+        BirBudgetTargetSo so = new BirBudgetTargetSo();
-        List<BirActivityCenterGoods> birActivityCenterGoodsList = birActivityCenterGoodsMapper.list4BirBudgetTarget();
+        List<BirActivityCenterGoods> birActivityCenterGoodsList = birActivityCenterGoodsMapper.list4BirBudgetTarget(so);
         List<BirBudgetTarget> targetList = birActivityCenterGoodsList.stream()
                 .map(item->initTargetByBirCenterGoods(item)).collect(Collectors.toList());
 

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

@@ -1,10 +1,22 @@
 package com.qs.serve.modules.bir.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.modules.bir.entity.BirActivityCenterGoods;
 import com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo;
+import com.qs.serve.modules.bir.entity.vo.BirBaseDispatchVo;
+import com.qs.serve.modules.bir.entity.vo.BirBaseReportVo;
 import com.qs.serve.modules.bir.entity.vo.BirBudgetTargetVo;
+import com.qs.serve.modules.bir.mapper.BirActivityCenterGoodsMapper;
+import com.qs.serve.modules.bms.entity.BmsRegion;
+import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
+import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
+import com.qs.serve.modules.bms.service.BmsRegion2Service;
+import com.qs.serve.modules.bms.service.BmsRegionService;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -36,6 +48,176 @@ import java.util.stream.Collectors;
 public class BirBudgetTargetServiceImpl extends ServiceImpl<BirBudgetTargetMapper,BirBudgetTarget> implements BirBudgetTargetService {
 
     private BmsSupplierService bmsSupplierService;
+    private BmsSupplierMapper bmsSupplierMapper;
+    private BmsRegion2Service bmsRegion2Service;
+    private BmsRegionService bmsRegionService;
+    private BirActivityCenterGoodsMapper birActivityCenterGoodsMapper;
+
+    @Override
+    public List<BirBaseReportVo> listBaseVo(BirBudgetTargetSo query) {
+        List<BirBaseReportVo> returnList = new ArrayList<>();
+        query.setLoadType(query.getLoadType()-1);
+        LocalDateTime endMonth = query.getYearMonthEnd();
+        LocalDateTime startMonth = query.getYearMonthStart();
+        query.setYearMonthStartQuery(startMonth.getYear()*100 + startMonth.getMonthValue());
+        query.setYearMonthEndQuery(endMonth.getYear()*100 + endMonth.getMonthValue());
+        query.setSelectCenterFlag(0);
+        if(CollUtil.isNotEmpty(query.getCenterList())){
+            query.setSelectCenterFlag(1);
+        }
+        if(query.getLoadType()==0) {
+            BmsSupplier supplier =  bmsSupplierService.getById(query.getTargetId());
+            if(supplier==null){
+                Assert.throwEx("找不到该客户！");
+            }
+            List<String> supplierIds = new ArrayList<>();
+            List<String> supplierCodes = new ArrayList<>();
+            supplierIds.add(supplier.getId());
+            query.setSupplierIds(supplierIds);
+            supplierCodes.add(supplier.getCode());
+            query.setSupplierCodes(supplierCodes);
+        }else if(query.getLoadType()==1){
+            BmsSupplier param4Supplier = new BmsSupplier();
+            param4Supplier.setCurrUserId(query.getTargetId());
+            List<BmsSupplier> supplierList = bmsSupplierMapper.selectSupplierList(param4Supplier);
+            List<String> supplierIds = supplierList.stream()
+                    .map(BmsSupplier::getId)
+                    .distinct().collect(Collectors.toList());
+            query.setSupplierIds(supplierIds);
+
+            List<String> supplierCodes = supplierList.stream()
+                    .map(BmsSupplier::getCode)
+                    .distinct().collect(Collectors.toList());
+            query.setSupplierCodes(supplierCodes);
+        }else if(query.getLoadType()==2){
+            BmsRegion2 targetRegion = bmsRegion2Service.getById(query.getTargetId());
+            LambdaQueryWrapper<BmsSupplier> lqw = new LambdaQueryWrapper<>();
+            lqw.eq(BmsSupplier::getBookCode,"001");
+            if(targetRegion.getLevel()==1){
+                lqw.eq(BmsSupplier::getRegion2First,query.getTargetId());
+            }else if(targetRegion.getLevel()==2){
+                lqw.eq(BmsSupplier::getRegion2Second,query.getTargetId());
+            }else if(targetRegion.getLevel()==3){
+                lqw.eq(BmsSupplier::getRegion2Third,query.getTargetId());
+            }else{
+                Assert.throwEx("行政区域查询失败！");
+            }
+            List<BmsSupplier> supplierList  =  bmsSupplierService.list(lqw);
+            List<String> supplierIds = supplierList.stream()
+                    .map(BmsSupplier::getId)
+                    .distinct().collect(Collectors.toList());
+            query.setSupplierIds(supplierIds);
+            List<String> supplierCodes = supplierList.stream()
+                    .map(BmsSupplier::getCode)
+                    .distinct().collect(Collectors.toList());
+            query.setSupplierCodes(supplierCodes);
+        }else if(query.getLoadType()==3){
+            BmsRegion targetRegion = bmsRegionService.getById(query.getTargetId());
+            LambdaQueryWrapper<BmsSupplier> lqw = new LambdaQueryWrapper<>();
+            lqw.eq(BmsSupplier::getBookCode,"001");
+
+            if(targetRegion.getLevel()==1){
+                lqw.eq(BmsSupplier::getRegionFirst,query.getTargetId());
+            }else if(targetRegion.getLevel()==2){
+                lqw.eq(BmsSupplier::getRegionSecond,query.getTargetId());
+            }else if(targetRegion.getLevel()==3){
+                lqw.eq(BmsSupplier::getRegionThird,query.getTargetId());
+            }else{
+                Assert.throwEx("销售区域查询失败！");
+            }
+            List<BmsSupplier> supplierList  =  bmsSupplierService.list(lqw);
+            List<String> supplierIds = supplierList.stream()
+                    .map(BmsSupplier::getId)
+                    .distinct().collect(Collectors.toList());
+            query.setSupplierIds(supplierIds);
+            List<String> supplierCodes = supplierList.stream()
+                    .map(BmsSupplier::getCode)
+                    .distinct().collect(Collectors.toList());
+            query.setSupplierCodes(supplierCodes);
+        }
+
+        List<BirActivityCenterGoods> birActivityCenterGoodsList = new ArrayList<>();
+        List<BirBaseDispatchVo> birBaseDispatchVoList = new ArrayList<>();
+        if(query.getSupplierIds().size()>2000 || query.getSupplierCodes().size()>2000){
+            List<String> supplierIds = query.getSupplierIds();
+            List<String> supplierCodes = query.getSupplierCodes();
+
+            List<List<String>> supplierIdList  = CollectionUtil.createList(supplierIds,2000);
+            List<List<String>> supplierCodeList = CollectionUtil.createList(supplierCodes,2000);
+
+            for(int i=0;i<supplierIdList.size();i++){
+                List<String> tempIds = supplierIdList.get(i);
+                tempIds.add("-99");
+                query.setSupplierIds(tempIds);
+                List<String> tempCodes = supplierCodeList.get(i);
+                tempCodes.add("-99");
+                query.setSupplierCodes(tempCodes);
+
+                List<BirActivityCenterGoods> tempActivityCenterGoodsList = birActivityCenterGoodsMapper.list4BirBudgetTarget(query);
+                List<BirBaseDispatchVo> tempBaseDispatchVoList = birActivityCenterGoodsMapper.list4DispatchSqlserver(query);
+                birActivityCenterGoodsList.addAll(tempActivityCenterGoodsList);
+                birBaseDispatchVoList.addAll(tempBaseDispatchVoList);
+            }
+
+        }else{
+            //防止传入空数组，导致SQL查出所有客户
+            List<String> supplierIds = query.getSupplierIds();
+            supplierIds.add("-99");
+            query.setSupplierIds(supplierIds);
+            List<String> supplierCodes = query.getSupplierCodes();
+            supplierCodes.add("-99");
+            query.setSupplierCodes(supplierCodes);
+
+            birActivityCenterGoodsList = birActivityCenterGoodsMapper.list4BirBudgetTarget(query);
+            birBaseDispatchVoList = birActivityCenterGoodsMapper.list4DispatchSqlserver(query);
+        }
+
+        final int TOTAL_MONTH = 12;
+        for (int y = startMonth.getYear(); y <= endMonth.getYear(); y++) {
+            for (int m = 1; m <= TOTAL_MONTH; m++) {
+                //防止多空白行
+                if(y == startMonth.getYear() && m < startMonth.getMonthValue()){
+                    continue;
+                }
+                if(y == endMonth.getYear() && m > endMonth.getMonthValue()){
+                    continue;
+                }
+                returnList.add(initBaseVo(birActivityCenterGoodsList,birBaseDispatchVoList, m, y));
+            }
+        }
+
+        return returnList;
+    }
+
+    private BirBaseReportVo initBaseVo(List<BirActivityCenterGoods> birActivityCenterGoodsList,
+                                       List<BirBaseDispatchVo> birBaseDispatchVoList, int month, int year){
+        BirBaseReportVo vo = new BirBaseReportVo();
+        vo.setYearMonthNum(year*100 + month);
+        vo.setDispatchAmt(BigDecimal.ZERO);
+        vo.setTotalRealAmt(BigDecimal.ZERO);
+        vo.setTotalRealRate(BigDecimal.ZERO);
+        vo.setYear(year+"");
+        vo.setMonth(month+"");
+
+        if(birActivityCenterGoodsList.size()>0){
+            BigDecimal totalRealAmt = birActivityCenterGoodsList.stream().filter(a->a.getKeyNum().equals(vo.getYearMonthNum()))
+                    .map(a->a.getSplitUsedAmount()==null?BigDecimal.ZERO:a.getSplitUsedAmount())
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+            vo.setTotalRealAmt(totalRealAmt);
+        }
+        if(birBaseDispatchVoList.size()>0){
+            BigDecimal dispatchAmt = birBaseDispatchVoList.stream().filter(a->a.getYearMonthNum().equals(vo.getYearMonthNum()))
+                    .map(a->a.getDispatchAmt()==null?BigDecimal.ZERO:a.getDispatchAmt())
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+            vo.setDispatchAmt(dispatchAmt);
+        }
+
+        if(vo.getDispatchAmt().compareTo(BigDecimal.ZERO)!=0){
+            vo.setTotalRealRate(vo.getTotalRealAmt().divide(vo.getDispatchAmt(), 2, RoundingMode.DOWN));
+        }
+
+        return vo;
+    }
 
     @Override
     public List<BirBudgetTargetVo> listVo(BirBudgetTargetSo query) {

src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java

@@ -14,6 +14,7 @@ import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.service.SysUserService;
 import com.qs.serve.modules.tbs.common.TbsCenterType;
+import com.qs.serve.modules.third.entity.ThirtyVerification;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.annotations.Param;
@@ -119,6 +120,8 @@ public class BmsSupplierServiceImpl extends ServiceImpl<BmsSupplierMapper,BmsSup
             param.setSupplierLicenseImg("");
             param.setSupplierAttachIds(new String[]{});
         }
+        String bookCode = ThirtyVerification.getInitBookCode(null,supplier.getCode());
+        supplier.setBookCode(bookCode);
         this.saveOrUpdate(supplier);
     }
 

src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml

@@ -195,7 +195,7 @@
         and key_num >=#{endDate}
     </select>
 
-    <select id="list4BirBudgetTarget" resultType="com.qs.serve.modules.bir.entity.BirActivityCenterGoods">
+    <select id="list4BirBudgetTarget" parameterType="com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo" resultType="com.qs.serve.modules.bir.entity.BirActivityCenterGoods">
         SELECT
             supplier_id,
             supplier_name,
@@ -220,6 +220,50 @@
             SUM ( split_release_amount ) AS split_release_amount
         FROM
             bir_activity_center_goods
+        WHERE
+        1=1
+        <if test="query.supplierIds!=null and query.supplierIds.size > 0">
+            and supplier_id in
+            <foreach collection="query.supplierIds" item="selectId" index="i" open="(" close=")" separator=",">
+                #{selectId}
+            </foreach>
+        </if>
+        <if test="query.brandIds!=null and query.brandIds.size > 0">
+            and (
+                (SUBSTRING ( target_level_path_ids, 1, CHARINDEX( '_', target_level_path_ids ) - 1 ) in
+                    <foreach collection="query.brandIds" item="selectId" index="i" open="(" close=")" separator=",">
+                        #{selectId}
+                    </foreach>
+                )
+                or
+                (
+                    target_level_path_ids in
+                    <foreach collection="query.brandIds" item="selectId" index="i" open="(" close=")" separator=",">
+                        #{selectId}
+                    </foreach>
+                )
+            )
+        </if>
+        <if test="query.yearMonthStartQuery != null">
+            AND key_num &gt;=  #{query.yearMonthStartQuery}
+        </if>
+        <if test="query.yearMonthEndQuery != null">
+            AND key_num &lt;=  #{query.yearMonthEndQuery}
+        </if>
+        <if test="query.selectCenterFlag==1">
+            and (
+            1=0
+            <if test="query.centerList!=null and query.centerList.size > 0">
+                <foreach collection="query.centerList" item="selectId" index="i" >
+
+                    or (center_type = #{selectId.centerType} and center_id =
+                    #{selectId.centerId}
+                    )
+                </foreach>
+
+            </if>
+            )
+        </if>
         GROUP BY
             supplier_id,
             supplier_code,
@@ -240,5 +284,34 @@
                     SUBSTRING ( target_level_path_names, 1, CHARINDEX( '_', target_level_path_names ) - 1 ) ELSE target_level_path_names
                 END
     </select>
+
+    <select id="list4DispatchSqlserver" parameterType="com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo" resultType="com.qs.serve.modules.bir.entity.vo.BirBaseDispatchVo">
+        SELECT
+        year_month_num AS yearMonthNum,
+        sum(sum_money) as dispatchAmt
+        FROM
+        view_dispatch_data
+        where 1=1
+        <if test="query.yearMonthStartQuery != null">
+            AND year_month_num &gt;=  #{query.yearMonthStartQuery}
+        </if>
+        <if test="query.yearMonthEndQuery != null">
+            AND year_month_num &lt;=  #{query.yearMonthEndQuery}
+        </if>
+        <if test="query.supplierCodes!=null and query.supplierCodes.size > 0">
+            and customer_code in
+            <foreach collection="query.supplierCodes" item="selectId" index="i" open="(" close=")" separator=",">
+                #{selectId}
+            </foreach>
+        </if>
+        <if test="query.brandIds!=null and query.brandIds.size > 0">
+            and category_id in
+            <foreach collection="query.brandIds" item="selectId" index="i" open="(" close=")" separator=",">
+                #{selectId}
+            </foreach>
+        </if>
+        GROUP BY
+        year_month_num;
+    </select>
 </mapper>
 

src/main/resources/mapper/bir/BirBudgetTargetMapper.xml

@@ -108,27 +108,6 @@
                     </foreach>
 
                 </if>
-<!--                <if test="query.saleRegionIds!=null and query.saleRegionIds.size > 0">-->
-<!--                    or (bir_budget_target.center_type = 'saleRegion' and bir_budget_target.center_id in-->
-<!--                    <foreach collection="query.saleRegionIds" item="selectId" index="i" open="(" close=")" separator=",">-->
-<!--                        #{selectId}-->
-<!--                    </foreach>-->
-<!--                    )-->
-<!--                </if>-->
-<!--                <if test="query.bizRegionIds!=null and query.bizRegionIds.size > 0">-->
-<!--                    or (bir_budget_target.center_type = 'bizRegion' and bir_budget_target.center_id in-->
-<!--                    <foreach collection="query.bizRegionIds" item="selectId" index="i" open="(" close=")" separator=",">-->
-<!--                        #{selectId}-->
-<!--                    </foreach>-->
-<!--                    )-->
-<!--                </if>-->
-<!--                <if test="query.centerIds!=null and query.centerIds.size > 0">-->
-<!--                    or (bir_budget_target.center_type = 'costCenter' and bir_budget_target.center_id in-->
-<!--                    <foreach collection="query.centerIds" item="selectId" index="i" open="(" close=")" separator=",">-->
-<!--                        #{selectId}-->
-<!--                    </foreach>-->
-<!--                    )-->
-<!--                </if>-->
                 )
             </if>