From 18f635828401a4583fe2a70ebb91e9afdfec81da Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Thu, 17 Aug 2023 17:25:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/bir/service/impl/BirBaseActivityServiceImpl.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java
index da30fc0a..be31ce00 100644
--- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java
@@ -37,6 +37,7 @@ import java.util.stream.Collectors;
 public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMapper,BirBaseActivity> implements BirBaseActivityService {
 
     private final TbsCostApplyMapper costApplyMapper;
+    private final TbsActivityMapper tbsActivityMapper;
 
     @Override
     public void buildReport(int year, int month) {
@@ -62,6 +63,10 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
         costApplyLqw.in(TbsCostApply::getId,costIds);
         List<TbsCostApply> costApplyList = costApplyMapper.selectList(costApplyLqw);
 
+        LambdaQueryWrapper<TbsActivity> activityLqw = new LambdaQueryWrapper<>();
+        activityLqw.in(TbsActivity::getId,ids);
+        activityList = tbsActivityMapper.selectList(activityLqw);
+
         List<BirBaseActivity> birBaseActivities = new ArrayList<>();
         for (TbsActivity activity : activityList) {
 

From dbfbf79dc8e769d9202894261bfaeeb3dc5f3099 Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Thu, 17 Aug 2023 17:38:50 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=88=86=E5=89=B2?=
 =?UTF-8?q?=E5=B0=8F=E6=95=B0=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/bir/controller/BirRoiRateController.java      | 2 +-
 .../bir/service/impl/BirBaseActivityServiceImpl.java      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

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 09f2f9db..5ce7f2ca 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
@@ -142,7 +142,7 @@ public class BirRoiRateController {
 
     /**
      * 获取成本中心费率
-     * @param id
+     * @param
      * @return
      */
     @RepeatSubmit
diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java
index be31ce00..8c862d00 100644
--- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java
@@ -111,15 +111,15 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
                             //日期占比
                             BigDecimal dayRate = new BigDecimal(splitDTO.getDays() + "")
                                     .divide(new BigDecimal(currentActDays + ""), 2, BigDecimal.ROUND_HALF_DOWN);
-                            currentAmount = currentAmount.subtract(amount.multiply(dayRate));
-                            currentCheckAmount = currentCheckAmount.subtract(activity.getUsedAmount().multiply(dayRate));
+                            currentAmount = currentAmount.subtract(amount.multiply(dayRate).setScale(2, RoundingMode.HALF_UP));
+                            currentCheckAmount = currentCheckAmount.subtract(activity.getUsedAmount().multiply(dayRate).setScale(2, RoundingMode.HALF_UP));
                         }
                     } else {
                         //日期占比
                         BigDecimal dayRate = new BigDecimal(currDateSplit.getDays() + "")
                                 .divide(new BigDecimal(currentActDays + ""), 2, BigDecimal.ROUND_HALF_DOWN);
-                        currentAmount = amount.multiply(dayRate);
-                        currentCheckAmount = activity.getUsedAmount().multiply(dayRate);
+                        currentAmount = amount.multiply(dayRate).setScale(2, RoundingMode.HALF_UP);
+                        currentCheckAmount = activity.getUsedAmount().multiply(dayRate).setScale(2, RoundingMode.HALF_UP);
                     }
 
                     baseActivity.setKeyNum(dto.getYearMonth());

From 2897bf4f75f201fef9e7dfd78c7a8c9c316c578a Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Thu, 17 Aug 2023 23:03:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qs/serve/modules/tbs/controller/TbsBudgetController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java
index 1facc00c..6d0cb72a 100644
--- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java
+++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java
@@ -97,7 +97,7 @@ public class TbsBudgetController {
             PageUtil.startPage();
             LambdaQueryWrapper<TbsBudget> lqw = new LambdaQueryWrapper<>();
             lqw.in(TbsBudget::getId,budgetIds);
-            lqw.orderByDesc(TbsBudget::getId);
+            lqw.orderByDesc(TbsBudget::getCreateTime);
             List<TbsBudget> list = tbsBudgetService.list(lqw);
             List<TbsBudgetVo> voList = new ArrayList<>();
             for (TbsBudget budget : list) {