From 9f955be440cad5e6b868800ff0a0acd17c0a3004 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 13 1월 2022 15:30:35 +0900
Subject: [PATCH] - issue_company 테이블에 컬럼 추가 및 'tel' 컬럼 사이즈 변경 - 이슈 추가,수정 시 업체 추가된 항목들 추가 - 하위이슈 페이징 오류 수정
---
src/main/java/kr/wisestone/owl/service/impl/HostingFieldServiceImpl.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/HostingFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/HostingFieldServiceImpl.java
index 4266bd9..9ae3495 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/HostingFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/HostingFieldServiceImpl.java
@@ -6,6 +6,7 @@
import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.domain.CompanyField;
import kr.wisestone.owl.domain.HostingField;
+import kr.wisestone.owl.domain.IspField;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.HostingFieldMapper;
import kr.wisestone.owl.repository.HostingFieldRepository;
@@ -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 HostingField add(HostingFieldForm HostingFieldForm) {
if (HostingFieldForm.getTelList() != null && HostingFieldForm.getTelList().size() > 0) {
- String[] tels = ConvertUtil.ToArray(HostingFieldForm.getTelList());
- HostingFieldForm.setTel(Arrays.toString(tels));
+ String tels = HostingFieldForm.getTelList().toString();
+ if (tels.contains("[")) {
+ tels = tels.substring(1, tels.indexOf("]"));
+ }
+ HostingFieldForm.setTel(tels.trim());
}
if (HostingFieldForm.getEmailList() != null && HostingFieldForm.getEmailList().size() > 0) {
- String[] emails = ConvertUtil.ToArray(HostingFieldForm.getEmailList());
- HostingFieldForm.setEmail(Arrays.toString(emails));
+ String emails = HostingFieldForm.getEmailList().toString();
+ if (emails.contains("[")) {
+ emails = emails.substring(1, emails.indexOf("]"));
+ }
+ HostingFieldForm.setEmail(emails.trim());
}
HostingField hostingField = ConvertUtil.copyProperties(HostingFieldForm, HostingField.class);
@@ -115,12 +123,18 @@
@Override
public void modify(HostingFieldForm HostingFieldForm) {
if (HostingFieldForm.getTelList() != null && HostingFieldForm.getTelList().size() > 0) {
- String[] tels = ConvertUtil.ToArray(HostingFieldForm.getTelList());
- HostingFieldForm.setTel(Arrays.toString(tels));
+ String tels = HostingFieldForm.getTelList().toString();
+ if (tels.contains("[")) {
+ tels = tels.substring(1, tels.indexOf("]"));
+ }
+ HostingFieldForm.setTel(tels.trim());
}
if (HostingFieldForm.getEmailList() != null && HostingFieldForm.getEmailList().size() > 0) {
- String[] emails = ConvertUtil.ToArray(HostingFieldForm.getEmailList());
- HostingFieldForm.setEmail(Arrays.toString(emails));
+ String emails = HostingFieldForm.getEmailList().toString();
+ if (emails.contains("[")) {
+ emails = emails.substring(1, emails.indexOf("]"));
+ }
+ HostingFieldForm.setEmail(emails.trim());
}
HostingField HostingField = ConvertUtil.copyProperties(HostingFieldForm, HostingField.class);
hostingFieldRepository.saveAndFlush(HostingField);
@@ -145,6 +159,12 @@
this.hostingFieldRepository.flush();
}
+ @Override
+ @Transactional(readOnly = true)
+ public List<HostingField> findAll() {
+ return this.hostingFieldRepository.findAll();
+ }
+
// Hosting 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
@Override
public ModelAndView downloadExcel(HttpServletRequest request, Model model) {
--
Gitblit v1.8.0