From 00575c6f04bf10b14f55694fc351845cf15fc6ca Mon Sep 17 00:00:00 2001
From: 2369059705@qq.com <2369059705@qq.com>
Date: 星期五, 19 五月 2023 17:47:28 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-administration/V2.0.0
---
src/main/java/com/product/administration/service/ConferenceManagerService.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index e09d980..758e224 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);
}
@@ -141,6 +152,10 @@
@Override
@Transactional
public String saveConferenceApply(FieldSetEntity fse) throws BaseException {
+ if ("0".equals(fse.getString("type"))){
+ baseDao.saveFieldSetEntity(fse);
+ return fse.getUUID();
+ }
if (StringUtils.isEmpty(fse.getUUID())) {
fse.setValue(CmnConst.ORG_LEVEL_UUID, SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid());
fse.setValue("flow_flag", 0);
@@ -237,9 +252,9 @@
sql.append(" b.meeting_topic, ");
sql.append(" b.start_time, ");
sql.append(" b.end_time, ");
- sql.append(" b.created_by ");
+ sql.append(" b.created_by,b.flow_flag ");
sql.append(" ORDER BY ");
- sql.append(" a.id,b.start_time ");
+ sql.append(" b.start_time ");
DataTableEntity dt = baseDao.listTable(sql.toString(), new Object[]{startTime, endTime, startTime, endTime, org_level_uuid});
dt.getMeta().addAliasTable(CmnConst.PRODUCT_OA_CONFERENCE_APPLY, "b");
baseDao.loadPromptData(dt);
--
Gitblit v1.9.2