From 953e9f68be988b128f4489bf2f725e4fd0d33055 Mon Sep 17 00:00:00 2001
From: 2369059705@qq.com <2369059705@qq.com>
Date: 星期五, 19 五月 2023 17:47:00 +0800
Subject: [PATCH] 出差排序
---
src/main/java/com/product/administration/service/CarApplicationService.java | 2 +-
src/main/java/com/product/administration/service/GoOutApplicationService.java | 10 +++++-----
src/main/java/com/product/administration/service/LeaveRequestService.java | 4 ++--
src/main/java/com/product/administration/service/BusinessTripService.java | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/product/administration/service/BusinessTripService.java b/src/main/java/com/product/administration/service/BusinessTripService.java
index 9742595..f5e7454 100644
--- a/src/main/java/com/product/administration/service/BusinessTripService.java
+++ b/src/main/java/com/product/administration/service/BusinessTripService.java
@@ -45,7 +45,7 @@
if(!StringUtils.isEmpty(dataFilter)){
filter += " and "+dataFilter;
}
- DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_SYS_BUSINESS_TRIP,filter,null,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
+ DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_SYS_BUSINESS_TRIP,filter,null,null,"created_utc_datetime desc",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
baseDao.loadPromptData(dt);
return dt;
}
diff --git a/src/main/java/com/product/administration/service/CarApplicationService.java b/src/main/java/com/product/administration/service/CarApplicationService.java
index d325cc5..d987fcf 100644
--- a/src/main/java/com/product/administration/service/CarApplicationService.java
+++ b/src/main/java/com/product/administration/service/CarApplicationService.java
@@ -90,7 +90,7 @@
if(!StringUtils.isEmpty(dataFilter)){
filters += " and "+dataFilter;
}
- DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_OA_CAR_APPLICATION,filters,new Object[]{SpringMVCContextHolder.getCurrentUser().getUser_id()},null,null,fs.getInteger(CmnConst.PAGESIZE), fs.getInteger(CmnConst.CPAGE));
+ DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_OA_CAR_APPLICATION,filters,new Object[]{SpringMVCContextHolder.getCurrentUser().getUser_id()},null,"created_utc_datetime desc",fs.getInteger(CmnConst.PAGESIZE), fs.getInteger(CmnConst.CPAGE));
baseDao.loadPromptData(dt);
return dt;
}
diff --git a/src/main/java/com/product/administration/service/GoOutApplicationService.java b/src/main/java/com/product/administration/service/GoOutApplicationService.java
index 3e85277..dc7db39 100644
--- a/src/main/java/com/product/administration/service/GoOutApplicationService.java
+++ b/src/main/java/com/product/administration/service/GoOutApplicationService.java
@@ -48,11 +48,11 @@
if(!StringUtils.isEmpty(dataFilter)){
filter += " and "+dataFilter;
}
- DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_SYS_GO_OUT_APPLICATON,filter,null,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
+ DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_SYS_GO_OUT_APPLICATON,filter,null,null,"created_utc_datetime desc",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
baseDao.loadPromptData(dt);
return dt;
}
-
+
/**
* 澶栧嚭鐢宠璇︽儏
* @param fs
@@ -62,7 +62,7 @@
public FieldSetEntity findGoOutApplication(FieldSetEntity fs) throws BaseException {
return baseDao.listInternationDataTable(baseDao.getFieldSetEntity(CmnConst.PRODUCT_SYS_GO_OUT_APPLICATON, fs.getString(CmnConst.UUID), true),null);
}
-
+
/**
* 澶栧嚭鐢宠淇濆瓨
* @param fs
@@ -85,8 +85,8 @@
return fs.getString(CmnConst.UUID);
}
}
-
-
+
+
/**
* 澶栧嚭鐢宠鍒犻櫎
* @param fs
diff --git a/src/main/java/com/product/administration/service/LeaveRequestService.java b/src/main/java/com/product/administration/service/LeaveRequestService.java
index 453fed8..7dab13b 100644
--- a/src/main/java/com/product/administration/service/LeaveRequestService.java
+++ b/src/main/java/com/product/administration/service/LeaveRequestService.java
@@ -15,7 +15,7 @@
/**
* Copyright 漏 LX-BASE
- *
+ *
* @Title: LeaveRequestService
* @Project: LX-BASE-SERVER
* @Date: 2020-11-13 09:27:35
@@ -43,7 +43,7 @@
if(!StringUtils.isEmpty(dataFilter)){
filter += " and "+dataFilter;
}
- DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_SYS_ASK_FOR_LEAVE,filter,null,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE),false);
+ DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_SYS_ASK_FOR_LEAVE,filter,null,null,"created_utc_datetime desc",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE),false);
baseDao.loadPromptData(dt);
return dt;
}
--
Gitblit v1.9.2