diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java index 6dee5fa5..ff884e69 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java @@ -68,7 +68,7 @@ public class TbsScheduleController { public R> getPage(TbsScheduleVo param){ TbsSchedule entity = CopierUtil.copy(param,new TbsSchedule()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); - lqw.orderByDesc(TbsSchedule::getId); + lqw.orderByDesc(TbsSchedule::getName); PageUtil.startPage(); List list = tbsScheduleService.list(lqw); return R.byPageHelperList(list); diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsBudgetWithAmount.java b/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsBudgetWithAmount.java index 974ce813..5a5320b8 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsBudgetWithAmount.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsBudgetWithAmount.java @@ -18,6 +18,8 @@ public class TbsBudgetWithAmount { String budgetName; + String scheduleName; + String centerId; String centerName; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java index 0aa3ee15..570e4e34 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java @@ -18,6 +18,7 @@ import com.qs.serve.modules.tbs.mapper.TbsScheduleItemBudgetMapper; import java.time.LocalDate; import java.util.ArrayList; import java.util.Arrays; +import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; @@ -250,6 +251,7 @@ public class TbsScheduleItemBudgetServiceImpl extends ServiceImpl #{selectId}