From 7a9f9f26ed90c33190382645d0851490ce94424b Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 07 三月 2024 10:02:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java
index 76d4642..65edb21 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java
@@ -167,11 +167,18 @@
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"璁垮绛旈涓婚 瀛楀吀涓嶅瓨鍦�");
}
visitConfigDTO.setTheme(theme.getCode());
+
SystemDictData description = systemDictList.stream().filter(m->m.getLabel().equals(Constants.DESCRIPTION)).findFirst().get();
if(Objects.isNull(description)){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"璁垮绛旈璇存槑 瀛楀吀涓嶅瓨鍦�");
}
visitConfigDTO.setDescription(description.getCode());
+
+ SystemDictData visitNotice = systemDictList.stream().filter(m->m.getLabel().equals(Constants.VISIT_NOTICE)).findFirst().get();
+ if(Objects.isNull(visitNotice)){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"鍏ュ巶椤荤煡 瀛楀吀涓嶅瓨鍦�");
+ }
+ visitConfigDTO.setVisitNotice(visitNotice.getCode());
return visitConfigDTO;
}
@@ -223,11 +230,19 @@
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"璁垮绛旈涓婚 瀛楀吀涓嶅瓨鍦�");
}
theme.setCode(visitConfigDTO.getTheme());
+
SystemDictData description = systemDictList.stream().filter(m->m.getLabel().equals(Constants.DESCRIPTION)).findFirst().get();
if(Objects.isNull(description)){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"璁垮绛旈璇存槑 瀛楀吀涓嶅瓨鍦�");
}
description.setCode(visitConfigDTO.getDescription());
+
+ SystemDictData visitNotice = systemDictList.stream().filter(m->m.getLabel().equals(Constants.VISIT_NOTICE)).findFirst().get();
+ if(Objects.isNull(visitNotice)){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"鍏ュ巶椤荤煡 瀛楀吀涓嶅瓨鍦�");
+ }
+ visitNotice.setCode(visitConfigDTO.getVisitNotice());
+
systemDictDataMapper.updateById(reservationWay);
systemDictDataMapper.updateById(checkVisit);
@@ -235,6 +250,7 @@
systemDictDataMapper.updateById(isAnswer);
systemDictDataMapper.updateById(theme);
systemDictDataMapper.updateById(description);
+ systemDictDataMapper.updateById(visitNotice);
}
--
Gitblit v1.9.3