From 261950c3d8e20fb94141c03b37a2872f75477831 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 14 1월 2022 21:07:15 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.28:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java
index 08d0ffc..95d5d2b 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java
@@ -6,6 +6,7 @@
import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.domain.CompanyField;
import kr.wisestone.owl.domain.IspField;
+import kr.wisestone.owl.domain.Priority;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.IspFieldMapper;
import kr.wisestone.owl.repository.IspFieldRepository;
@@ -25,6 +26,7 @@
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.Model;
import org.springframework.web.servlet.ModelAndView;
@@ -64,12 +66,18 @@
@Override
public IspField add(IspFieldForm IspFieldForm) {
if (IspFieldForm.getTelList() != null && IspFieldForm.getTelList().size() > 0) {
- String[] tels = ConvertUtil.ToArray(IspFieldForm.getTelList());
- IspFieldForm.setTel(Arrays.toString(tels));
+ String tels = IspFieldForm.getTelList().toString();
+ if (tels.contains("[")) {
+ tels = tels.substring(1, tels.indexOf("]"));
+ }
+ IspFieldForm.setTel(tels.trim());
}
if (IspFieldForm.getEmailList() != null && IspFieldForm.getEmailList().size() > 0) {
- String[] emails = ConvertUtil.ToArray(IspFieldForm.getEmailList());
- IspFieldForm.setEmail(Arrays.toString(emails));
+ String emails = IspFieldForm.getEmailList().toString();
+ if (emails.contains("[")) {
+ emails = emails.substring(1, emails.indexOf("]"));
+ }
+ IspFieldForm.setEmail(emails.trim());
}
IspField ispField = ConvertUtil.copyProperties(IspFieldForm, IspField.class);
@@ -115,12 +123,18 @@
@Override
public void modify(IspFieldForm IspFieldForm) {
if (IspFieldForm.getTelList() != null && IspFieldForm.getTelList().size() > 0) {
- String[] tels = ConvertUtil.ToArray(IspFieldForm.getTelList());
- IspFieldForm.setTel(Arrays.toString(tels));
+ String tels = IspFieldForm.getTelList().toString();
+ if (tels.contains("[")) {
+ tels = tels.substring(1, tels.indexOf("]"));
+ }
+ IspFieldForm.setTel(tels.trim());
}
if (IspFieldForm.getEmailList() != null && IspFieldForm.getEmailList().size() > 0) {
- String[] emails = ConvertUtil.ToArray(IspFieldForm.getEmailList());
- IspFieldForm.setEmail(Arrays.toString(emails));
+ String emails = IspFieldForm.getEmailList().toString();
+ if (emails.contains("[")) {
+ emails = emails.substring(1, emails.indexOf("]"));
+ }
+ IspFieldForm.setEmail(emails.trim());
}
IspField IspField = ConvertUtil.copyProperties(IspFieldForm, IspField.class);
@@ -147,6 +161,12 @@
this.ispFieldRepository.flush();
}
+ @Override
+ @Transactional(readOnly = true)
+ public List<IspField> findAll() {
+ return this.ispFieldRepository.findAll();
+ }
+
// Isp 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
@Override
public ModelAndView downloadExcel(HttpServletRequest request, Model model) {
--
Gitblit v1.8.0