Merge remote-tracking branch 'origin/v1.0' into v1.0

src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java

@@ -0,0 +1,46 @@
+package com.qs.serve.modules.tbs.service;
+
+import com.qs.serve.modules.tbs.entity.TbsActivityCenterGoods;
+import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget;
+import com.qs.serve.modules.tbs.entity.vo.TbsBudgetTableVo;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 匹配规则2
+ * @author YenHex
+ * @since 2023/7/21
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbsBudgetMatchApplication {
+
+    private TbsActivityCenterGoodsService tbsActivityCenterGoodsService;
+
+    public TbsBudgetTableVo buildResultTable(Long costApplyId){
+        List<TbsActivityCenterGoods> activityCenterGoodsList = tbsActivityCenterGoodsService.listByCostApplyId(costApplyId);
+        for (TbsActivityCenterGoods centerGoods : activityCenterGoodsList) {
+            //通过TbsActivityCenterGoods获取匹配条件的预算
+            List<TbsScheduleItemBudget> scheduleItemBudgetList = getCenterGoodsMatchTbsScheduleItemBudget(centerGoods);
+            //TODO 拼接Table
+            //TODO 关联通用数据
+        }
+        return null;
+    }
+
+    /**
+     * 通过TbsActivityCenterGoods获取匹配条件的预算
+     * @param centerGoods
+     * @return
+     */
+    private List<TbsScheduleItemBudget> getCenterGoodsMatchTbsScheduleItemBudget(TbsActivityCenterGoods centerGoods){
+        //TODO
+        return new ArrayList<>();
+    }
+
+}

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -573,9 +573,9 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
                     costCenter.setTargetExpenseRate(totalBudgetAmount.divide(totalPreDispatchAmount,2, BigDecimal.ROUND_DOWN));
                 }
                 //暂保持目标相关数据一致
-                costCenter.setYtdTargetSales(costCenter.getTargetSales());
+                costCenter.setYtdTargetSales(costCenter.getTargetSales().setScale(2,BigDecimal.ROUND_DOWN));
-                costCenter.setYtdTargetBudget(costCenter.getAreaBudget());
+                costCenter.setYtdTargetBudget(costCenter.getAreaBudget().setScale(2, RoundingMode.DOWN));
-                costCenter.setYtdTargetExpenseRate(costCenter.getTargetExpenseRate());
+                costCenter.setYtdTargetExpenseRate(costCenter.getTargetExpenseRate().setScale(2, RoundingMode.DOWN));
 //                costCenter.setQtdTargetSales(costCenter.getTargetSales());
 //                costCenter.setQtdTargetBudget(costCenter.getAreaBudget());
 //                costCenter.setQtdTargetExpenseRate(costCenter.getTargetExpenseRate());