From a0707b8eb76490f2541ff4349f67512e68f24927 Mon Sep 17 00:00:00 2001 From: 354798ggg <1074825718@qq.com> Date: 星期三, 24 五月 2023 17:43:26 +0800 Subject: [PATCH] 考勤相关调整 --- src/main/java/com/product/administration/service/PunchRecordService.java | 2 +- src/main/java/com/product/administration/config/SystemCode.java | 1 + src/main/java/com/product/administration/service/ReplenishPunchRecordService.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/product/administration/config/SystemCode.java b/src/main/java/com/product/administration/config/SystemCode.java index 2c346fe..d89bce9 100644 --- a/src/main/java/com/product/administration/config/SystemCode.java +++ b/src/main/java/com/product/administration/config/SystemCode.java @@ -270,6 +270,7 @@ CONFERENCE_ROOM_SAVE_FIAL_DUPLICATE_NAME("浼氳瀹や繚瀛樺け璐�,宸插瓨鍦ㄥ悓鍚嶇О浼氳瀹�", ModuleEnum.ADMINISTRAT.getValue() + "193"), + WORK_ATTENDANCE_REPORT_FAIL("鑰冨嫟鎶ヨ〃鑾峰彇澶辫触锛�", ModuleEnum.ADMINISTRAT.getValue() + "194"), EXPORT_FILE_FAIL("瀵煎嚭鏂囦欢澶辫触", ModuleEnum.ADMINISTRAT.getValue() + "998"), IMPORT_FILE_FAIL("瀵煎叆鏂囦欢澶辫触", ModuleEnum.ADMINISTRAT.getValue() + "999"), diff --git a/src/main/java/com/product/administration/service/PunchRecordService.java b/src/main/java/com/product/administration/service/PunchRecordService.java index b469c53..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,7 @@ * @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); diff --git a/src/main/java/com/product/administration/service/ReplenishPunchRecordService.java b/src/main/java/com/product/administration/service/ReplenishPunchRecordService.java index 4c655ae..66326a3 100644 --- a/src/main/java/com/product/administration/service/ReplenishPunchRecordService.java +++ b/src/main/java/com/product/administration/service/ReplenishPunchRecordService.java @@ -40,7 +40,7 @@ if(!StringUtils.isEmpty(dataFilter)){ filter += " and "+dataFilter; } - DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_SYS_REPLENISH_PUNCH,filter,null,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE)); + DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_SYS_REPLENISH_PUNCH,filter,null,null,"replenish_date DESC",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE)); baseDao.loadPromptData(dt); return dt; } -- Gitblit v1.9.2