From e2f83cb40be10312aca97e7d6a645b30272b2dfd Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Tue, 2 Jan 2024 23:13:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E4=BD=BF=E7=94=A8=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E6=8A=A5=E8=A1=A8=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/tbs/controller/TbsScheduleController.java     | 2 +-
 .../serve/modules/tbs/entity/dto/TbsBudgetWithAmount.java | 2 ++
 .../service/impl/TbsScheduleItemBudgetServiceImpl.java    | 8 ++++++++
 src/main/resources/mapper/tbs/TbsBudget2Mapper.xml        | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

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<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);
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 56f2441f..ed5973cb 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<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;
     }
 }
diff --git a/src/main/resources/mapper/tbs/TbsBudget2Mapper.xml b/src/main/resources/mapper/tbs/TbsBudget2Mapper.xml
index b61bfa7a..4b416f3f 100644
--- a/src/main/resources/mapper/tbs/TbsBudget2Mapper.xml
+++ b/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>