fix: 修复bir生成

src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java

@@ -91,7 +91,13 @@ public class HttpServletRequestFilter implements Filter{
                 buffer.append("  时间:["+ LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)+"]");
             }
         } catch (Exception e) {}
+        if(diffTime< 1D){
             log.debug(buffer.toString());
+        }else if (diffTime< 20D){
+            log.warn(buffer.toString());
+        }else {
+            log.error(buffer.toString());
+        }
     }
 
     @Override

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

@@ -39,7 +39,7 @@ public interface BirBaseActivityMapper extends BaseMapper<BirBaseActivity> {
             " on bir.cost_apply_id = cost.id " +
             " set bir.del_flag = 1 " +
             " where act.cancel_flag = 1 or act.del_flag = 1 or cost.del_flag = 1 or cost.cancel_flag = 1 and bir.del_flag=0 ")
-    int removeActivityBirError();
+    Integer removeActivityBirError();
 
 
     @InterceptorIgnore(tenantLine = "true")

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

@@ -233,7 +233,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
         regionSupplierLqw.eq(BmsSupplier::getRegionFirst, supplier.getRegionFirst());
         regionSupplierLqw.select(BmsSupplier::getId,BmsSupplier::getCode);
         List<BmsSupplier> regionSupplierList = bmsSupplierMapper.selectList(regionSupplierLqw);
-        List<String> regionSupplierIds = regionSupplierList.stream().map(BmsSupplier::getId).collect(Collectors.toList());
+        List<String> regionSupplierIds = regionSupplierList.stream().map(BmsSupplier::getId).distinct().collect(Collectors.toList());
         regionSupplierIds.add("-999");
         //加载公司内费用
         BirRoiCostDTO costDTO4Com = new BirRoiCostDTO();
@@ -322,10 +322,14 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
 
         for(BirRoiCostItemVo vo:list){
             if(vo.getYearMonth()<=currMonthNum && vo.getYearMonth()>=startMonthNum){
+                if(vo.getAllCostAmt()!=null){
                     costAmt = costAmt.add(vo.getAllCostAmt());
+                }
+                if(vo.getAllDispatchAmt()!=null){
                     dispatchAmt = dispatchAmt.add(vo.getAllDispatchAmt());
                 }
             }
+        }
 
         if(dispatchAmt.compareTo(BigDecimal.ZERO)>0) {
             ytdPercent = costAmt.divide(dispatchAmt,4, RoundingMode.HALF_UP).floatValue();
@@ -428,10 +432,14 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
 
         for(BirRoiCostItemVo vo:list){
             if(vo.getYearMonth()<=currMonthNum && vo.getYearMonth()>=startMonthNum){
+                if(vo.getAllCostAmt()!=null){
                     costAmt = costAmt.add(vo.getAllCostAmt());
+                }
+                if(vo.getAllDispatchAmt()!=null){
                     dispatchAmt = dispatchAmt.add(vo.getAllDispatchAmt());
                 }
             }
+        }
 
         if(dispatchAmt.compareTo(BigDecimal.ZERO)>0) {
             qtdPercent = costAmt.divide(dispatchAmt,4, RoundingMode.HALF_UP).floatValue();

src/main/java/com/qs/serve/modules/erp/mapper/ErpDispatchDataMapper.java

@@ -28,6 +28,16 @@ public interface ErpDispatchDataMapper extends BaseMapper<ErpDispatchData> {
     BigDecimal getSumCost(@Param("startNumber")Integer startNumber,
                                         @Param("endNumber")Integer endNumber);
 
+    /**
+     * 查询发货单合计
+     * @param startNumber
+     * @param endNumber
+     * @return
+     */
+    @InterceptorIgnore(tenantLine = "1")
+    BigDecimal getSumCostGroup(@Param("startNumber")Integer startNumber,
+                          @Param("endNumber")Integer endNumber);
+
     /**
      * 查询发货单合计
      * @param startNumber

src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java

@@ -144,6 +144,14 @@ public class GoodsSpuController {
      */
     private void initSpuWithCustomerPrice(String cusCode, List<GoodsSpu> list, List<String> skuCodes) {
         List<InventoryCusPrice> cusPriceList = this.getInventoryCusPrices(cusCode, skuCodes);
+        List<GoodsSku> skus = goodsSkuService.getByCodes(skuCodes);
+        for (GoodsSpu spu : list) {
+            for (GoodsSku sku : skus) {
+                if(sku.getSpuId().equals(spu.getId())){
+                    spu.setSkuAddCode(sku.getSkuAddCode());
+                }
+            }
+        }
         if(cusPriceList!=null){
             for (InventoryCusPrice cusPrice : cusPriceList) {
                 for (GoodsSpu spu : list) {

src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java

@@ -152,6 +152,10 @@ public class GoodsSpu implements Serializable {
     @TableField(exist = false)
     private String searchValue;
 
+    /** 搜索值，搜索sku标题及编码 */
+    @TableField(exist = false)
+    private String skuAddCode;
+
     @TableField(exist = false)
     private List<Long> selectIds;
 

src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyCheckController.java

@@ -65,7 +65,8 @@ public class TbsCostApplyCheckController {
     @GetMapping("devDoFinished")
     public R<Long> devDoFinished(String costApplyId){
         TbsAffairCommitBo commitBo = new TbsAffairCommitBo();
-        //commitBo.setTargetId();
+        commitBo.setCostApplyId(Long.parseLong(costApplyId));
+        //tbsCostApplyOperationServiceImpl.doFinished(commitBo);
         return R.ok();
     }
 

src/main/java/com/qs/serve/task/BirTask.java

@@ -27,11 +27,9 @@ public class BirTask {
     public void buildTempTable(){
         AuthContextUtils.setTenant("001");
         //移除取消的和删除的费用ID
-
-
-        int year = LocalDate.now().getYear();
         for (int i = 1;i < 13; i++) {
-            birActivityCenterGoodsService.buildReport(year,i);
+            birActivityCenterGoodsService.buildReport(2023,i);
+            birActivityCenterGoodsService.buildReport(2024,i);
         }
     }
 

src/main/java/com/qs/serve/task/BitTask.java

@@ -35,6 +35,7 @@ public class BitTask {
         }
         activityService.buildReport(2024,1);
         activityService.buildReport(2024,2);
+        activityService.buildReport(2024,3);
     }
 
 }

src/main/java/com/qs/serve/task/controller/TaskActivityController.java

@@ -51,13 +51,10 @@ public class TaskActivityController {
      */
     @GetMapping("syncActivityCenterGoods")
     public R taskBir(Integer month){
-        Integer year = 2023;
-        if(month == null){
+        //移除取消的和删除的费用ID
         for (int i = 1;i < 13; i++) {
-                birActivityCenterGoodsService.buildReport(year,i);
-            }
-        }else {
-            birActivityCenterGoodsService.buildReport(year,month);
+            birActivityCenterGoodsService.buildReport(2023,i);
+            birActivityCenterGoodsService.buildReport(2024,i);
         }
         return R.ok();
     }

src/main/resources/mapper/erp/ErpDispatchDataMapper.xml

@@ -85,7 +85,7 @@
         </if>
     </select>
 
-    <select id="getSumCost" resultType="java.math.BigDecimal">
+    <select id="getSumCostGroup" resultType="java.math.BigDecimal">
         SELECT
         SUM(sum_money) as dispatchSumCost
         FROM
@@ -96,5 +96,16 @@
         GROUP BY DATE_FORMAT(date,'%Y%m')
     </select>
 
+
+    <select id="getSumCost" resultType="java.math.BigDecimal">
+        SELECT
+            SUM(sum_money) as dispatchSumCost
+        FROM
+            `erp_dispatch_data`
+        where
+            DATE_FORMAT(date,'%Y%m') &gt;= #{startNumber}
+          and DATE_FORMAT(date,'%Y%m') &lt;= #{endNumber}
+    </select>
+
 </mapper>
 

src/main/resources/mapper/goods/GoodsSpuMapper.xml

@@ -74,6 +74,9 @@
         <if test="query.selectSpecialFlag != null and query.selectSpecialFlag != -1">
             and `goods_sku`.`special_flag` = #{query.selectSpecialFlag}
         </if>
+        <if test="query.skuAddCode != null and query.skuAddCode != ''">
+            and `goods_sku`.`sku_add_code` like concat('%', #{query.skuAddCode},'%')
+        </if>
         <if test="query.orderFlag != null ">
             and (`goods_sku`.`order_flag` = #{query.orderFlag} or `goods_sku`.`special_flag` = 1)
          </if>
@@ -273,6 +276,9 @@
             `spu`.`name` like concat('%', #{query.keywordName},'%')
             )
         </if>
+        <if test="query.skuAddCode != null and query.skuAddCode != '' ">
+            and `sku`.`sku_add_code` like concat('%', #{query.skuAddCode},'%')
+        </if>
         )
         UNION ALL
         SELECT sku.*,1 as rn FROM goods_sku sku