From e3d738cc6945888fbb92749af67a84c01c02bae1 Mon Sep 17 00:00:00 2001
From: 354798ggg <1074825718@qq.com>
Date: 星期四, 18 五月 2023 17:05:32 +0800
Subject: [PATCH] 打卡信息列表调整和会议室管理调整
---
src/main/java/com/product/administration/service/PunchRecordService.java | 2 ++
src/main/java/com/product/administration/config/SystemCode.java | 3 +++
src/main/java/com/product/administration/service/ConferenceManagerService.java | 13 ++++++++++++-
3 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/product/administration/config/SystemCode.java b/src/main/java/com/product/administration/config/SystemCode.java
index 842fce2..2c346fe 100644
--- a/src/main/java/com/product/administration/config/SystemCode.java
+++ b/src/main/java/com/product/administration/config/SystemCode.java
@@ -268,6 +268,9 @@
KNOWLEDGE_SHARING_GET_TAG_FAIL("鑾峰彇鐭ヨ瘑鍏变韩鏍囩澶辫触", ModuleEnum.ORGCOMMON.getValue() + "191"),
KNOWLEDGE_SHARING_GET_IMAGE_FAIL("鑾峰彇鍥剧墖澶辫触", ModuleEnum.ORGCOMMON.getValue() + "192"),
+
+ CONFERENCE_ROOM_SAVE_FIAL_DUPLICATE_NAME("浼氳瀹や繚瀛樺け璐�,宸插瓨鍦ㄥ悓鍚嶇О浼氳瀹�", ModuleEnum.ADMINISTRAT.getValue() + "193"),
+
EXPORT_FILE_FAIL("瀵煎嚭鏂囦欢澶辫触", ModuleEnum.ADMINISTRAT.getValue() + "998"),
IMPORT_FILE_FAIL("瀵煎叆鏂囦欢澶辫触", ModuleEnum.ADMINISTRAT.getValue() + "999"),
diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index c43c8e7..06cca3b 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -111,10 +111,21 @@
@Transactional
@Override
public boolean saveConferenceRoom(FieldSetEntity fse) throws BaseException {
+ //閲嶅悕楠岃瘉瀵硅薄
+ FieldSetEntity nameVerification = null;
if (StringUtils.isEmpty(fse.getUUID())) {
fse.setValue(CmnConst.ORG_LEVEL_UUID, SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid());
- }
+ nameVerification = baseDao.getFieldSetEntityByFilter(CmnConst.PRODUCT_OA_CONFERENCE_ROOM_CONFIG, "room_name=?", new Object[] {fse.getString("room_name")}, false);
+ }else {
+ nameVerification = baseDao.getFieldSetEntityByFilter(CmnConst.PRODUCT_OA_CONFERENCE_ROOM_CONFIG, "room_name=? and uuid!=?", new Object[] {fse.getString("room_name"), fse.getUUID()}, false);
+ }
+ if (nameVerification!=null) {
+ throw new BaseException(SystemCode.CONFERENCE_ROOM_SAVE_FIAL_DUPLICATE_NAME.getValue(), SystemCode.CONFERENCE_ROOM_SAVE_FIAL_DUPLICATE_NAME.getText());
+ }
+
BaseUtil.createCreatorAndCreationTime(SpringMVCContextHolder.getCurrentUser(), fse);
+ //閲嶅悕楠岃瘉
+
return baseDao.saveFieldSetEntity(fse);
}
diff --git a/src/main/java/com/product/administration/service/PunchRecordService.java b/src/main/java/com/product/administration/service/PunchRecordService.java
index 3a969d6..b469c53 100644
--- a/src/main/java/com/product/administration/service/PunchRecordService.java
+++ b/src/main/java/com/product/administration/service/PunchRecordService.java
@@ -42,6 +42,8 @@
*/
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));
+ 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