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 da30fc0a..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 @@ -37,6 +37,7 @@ import java.util.stream.Collectors; public class BirBaseActivityServiceImpl extends ServiceImpl 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 costApplyList = costApplyMapper.selectList(costApplyLqw); + LambdaQueryWrapper activityLqw = new LambdaQueryWrapper<>(); + activityLqw.in(TbsActivity::getId,ids); + activityList = tbsActivityMapper.selectList(activityLqw); + List birBaseActivities = new ArrayList<>(); for (TbsActivity activity : activityList) { @@ -106,15 +111,15 @@ public class BirBaseActivityServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.in(TbsBudget::getId,budgetIds); - lqw.orderByDesc(TbsBudget::getId); + lqw.orderByDesc(TbsBudget::getCreateTime); List list = tbsBudgetService.list(lqw); List voList = new ArrayList<>(); for (TbsBudget budget : list) {