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

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

@@ -142,7 +142,7 @@ public class BirRoiRateController {
 
     /**
      * 获取成本中心费率
-     * @param id
+     * @param
      * @return
      */
     @RepeatSubmit

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) {
 
@@ -106,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));
+                            currentAmount = currentAmount.subtract(amount.multiply(dayRate).setScale(2, RoundingMode.HALF_UP));
-                            currentCheckAmount = currentCheckAmount.subtract(activity.getUsedAmount().multiply(dayRate));
+                            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);
+                        currentAmount = amount.multiply(dayRate).setScale(2, RoundingMode.HALF_UP);
-                        currentCheckAmount = activity.getUsedAmount().multiply(dayRate);
+                        currentCheckAmount = activity.getUsedAmount().multiply(dayRate).setScale(2, RoundingMode.HALF_UP);
                     }
 
                     baseActivity.setKeyNum(dto.getYearMonth());

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) {