预算使用情况报表改BUG

src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java

@@ -68,7 +68,7 @@ public class TbsScheduleController {
     public R<PageVo<TbsSchedule>> getPage(TbsScheduleVo param){
         TbsSchedule entity = CopierUtil.copy(param,new TbsSchedule());
         LambdaQueryWrapper<TbsSchedule> lqw = new LambdaQueryWrapper<>(entity);
-        lqw.orderByDesc(TbsSchedule::getId);
+        lqw.orderByDesc(TbsSchedule::getName);
         PageUtil.startPage();
         List<TbsSchedule> list = tbsScheduleService.list(lqw);
         return R.byPageHelperList(list);

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;

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<TbsScheduleIte
                     withAmount.setCenterId(budget.getCenterId());
                     withAmount.setCenterName(budget.getCenterName());
                     withAmount.setCenterType(budget.getCenterType());
+                    withAmount.setScheduleName(budget.getScheduleName());
                 }
             }
 
@@ -302,6 +304,12 @@ public class TbsScheduleItemBudgetServiceImpl extends ServiceImpl<TbsScheduleIte
             result.add(withAmount);
         }
 
+        result.sort(
+                Comparator.comparing(TbsBudgetWithAmount::getCenterName)
+                        .thenComparing(TbsBudgetWithAmount::getScheduleName)
+                        .thenComparing(TbsBudgetWithAmount::getBudgetName)
+        );
+
         return result;
     }
 }

src/main/resources/mapper/tbs/TbsBudget2Mapper.xml

@@ -42,7 +42,7 @@
         sum(amount) as amt
         from tbs_budget_log
         where
-        del_flag = 0 and  opt_type not in
+        del_flag = 0 and  opt_type in
         <foreach collection="optNumbers" item ="selectId" index="i" open="(" close=")" separator=",">
             #{selectId}
         </foreach>