From b549ebd775297e3c64981ded8741af4dd6e42f39 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 04 十二月 2024 17:41:28 +0800
Subject: [PATCH] 增加采样列表排序

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
index 0bca0d3..88addad 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
@@ -289,7 +289,8 @@
         wrapper.eq(TjSampling::getCusId, cusId);
         wrapper.eq(TjSampling::getIsSignFor,isSignFor);
         wrapper.and(i -> i.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1));
-        wrapper.orderByDesc(TjSampling::getIsMerge);
+//        wrapper.orderByDesc(TjSampling::getIsMerge);
+        wrapper.orderByAsc(TjSampling::getSpecimenTypeCode,TjSampling::getIsMerge);
         list = tjSamplingService.list(wrapper);
         return AjaxResult.success(list);
     }

--
Gitblit v1.8.0