From da4f7077a96cab425d7710d60624174b10c0c9e2 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 01 八月 2024 17:07:48 +0800
Subject: [PATCH] commit

---
 src/main/java/com/product/administration/service/PunchRecordService.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/product/administration/service/PunchRecordService.java b/src/main/java/com/product/administration/service/PunchRecordService.java
index 3a969d6..cbfc2c6 100644
--- a/src/main/java/com/product/administration/service/PunchRecordService.java
+++ b/src/main/java/com/product/administration/service/PunchRecordService.java
@@ -41,7 +41,9 @@
 	 * @return
 	 */
 	public DataTableEntity listRecordInfo(FieldSetEntity fse) {
-		DataTableEntity dt=baseDao.listTable(CmnConst.PRODUCT_OA_PUNCH_RECORD, "created_by=?", new Object[] {SpringMVCContextHolder.getCurrentUser().getUser_id()}, null, null, fse.getInteger(CmnConst.PAGESIZE), fse.getInteger(CmnConst.CPAGE));
+		DataTableEntity dt=baseDao.listTable(CmnConst.PRODUCT_OA_PUNCH_RECORD, "created_by=?", new Object[] {SpringMVCContextHolder.getCurrentUser().getUser_id()}, null, CmnConst.CREATED_UTC_DATETIME+" DESC", fse.getInteger(CmnConst.PAGESIZE), fse.getInteger(CmnConst.CPAGE));
+		dt.setFieldFormat("punch_time_one", "yyyy-MM-dd HH:mm:ss");
+		dt.setFieldFormat("punch_time_three", "yyyy-MM-dd HH:mm:ss");
 		baseDao.loadPromptData(dt);
 		return dt;
 	}

--
Gitblit v1.9.2