From e84c3729557624f91782c0c5d35330e661d86c0b Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 18 1월 2022 11:20:06 +0900
Subject: [PATCH] 이슈상세 - 개별 메일 보내기 코드 수정
---
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 112 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 74 insertions(+), 38 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
index 01602a2..5c5ea3e 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -85,12 +85,19 @@
this.verifyUrl(companyFieldForm.getUrl(), null);
if (companyFieldForm.getTelList() != null && companyFieldForm.getTelList().size() > 0) {
- String[] tels = ConvertUtil.ToArray(companyFieldForm.getTelList());
- companyFieldForm.setTel(Arrays.toString(tels));
+ String tels = companyFieldForm.getTelList().toString();
+ if (tels.contains("[")) {
+ tels = tels.substring(1, tels.indexOf("]"));
+ }
+ companyFieldForm.setTel(tels.trim());
}
if (companyFieldForm.getEmailList() != null && companyFieldForm.getEmailList().size() > 0) {
- String[] emails = ConvertUtil.ToArray(companyFieldForm.getEmailList());
- companyFieldForm.setEmail(Arrays.toString(emails));
+ String emails = companyFieldForm.getEmailList().toString();
+ String email = "";
+ if (emails.contains("[")) {
+ email = emails.substring(1, emails.indexOf("]"));
+ }
+ companyFieldForm.setEmail(email.trim());
}
CompanyField companyField = ConvertUtil.copyProperties(companyFieldForm, CompanyField.class);
@@ -135,6 +142,39 @@
return this.companyFieldMapper.find(condition);
}
+ /**
+ * companyFieldCategory Name �꽕�젙
+ * @param companyFieldVo CompanyFieldVo
+ * @param companyField CompanyField
+ */
+ private CompanyFieldVo CreateCompanyFieldCategory(CompanyFieldVo companyFieldVo, CompanyField companyField) {
+ if (companyField.getCompanyTypeId() != null && companyField.getCompanyTypeId() != -1) {
+ CompanyFieldCategory companyType = this.companyFieldCategoryService.find(companyField.getCompanyTypeId());
+ if (companyType != null) {
+ companyFieldVo.setCompanyTypeName(companyType.getUseValue());
+ }
+ }
+ if (companyField.getParentSectorId() != null && companyField.getParentSectorId() != -1) {
+ CompanyFieldCategory parentSector = this.companyFieldCategoryService.find(companyField.getParentSectorId());
+ if (parentSector != null) {
+ companyFieldVo.setParentSectorName(parentSector.getUseValue());
+ }
+ }
+ if (companyField.getChildSectorId() != null && companyField.getChildSectorId() != -1) {
+ CompanyFieldCategory childSector = this.companyFieldCategoryService.find(companyField.getChildSectorId());
+ if (childSector != null) {
+ companyFieldVo.setChildSectorName(childSector.getUseValue());
+ }
+ }
+ if (companyField.getRegionId() != null && companyField.getRegionId() != -1) {
+ CompanyFieldCategory region = this.companyFieldCategoryService.find(companyField.getRegionId());
+ if (region != null) {
+ companyFieldVo.setRegionName(region.getUseValue());
+ }
+ }
+ return companyFieldVo;
+ }
+
// �뾽泥� �긽�꽭 議고쉶�븳�떎.
@Override
@Transactional
@@ -159,36 +199,7 @@
ispFieldVo = ConvertUtil.copyProperties(ispField, IspFieldVo.class);
hostingFieldVo = ConvertUtil.copyProperties(hostingField, HostingFieldVo.class);
- if (companyField.getCompanyTypeId() != null && companyField.getCompanyTypeId() != -1) {
- CompanyFieldCategory companyType = this.companyFieldCategoryService.find(companyField.getCompanyTypeId());
- if (companyType != null) {
- companyFieldVo.setCompanyTypeName(companyType.getUseValue());
- }
- }
- if (companyField.getParentSectorId() != null && companyField.getParentSectorId() != -1) {
- CompanyFieldCategory parentSector = this.companyFieldCategoryService.find(companyField.getParentSectorId());
- if (parentSector != null) {
- companyFieldVo.setParentSectorName(parentSector.getUseValue());
- }
- }
- if (companyField.getChildSectorId() != null && companyField.getChildSectorId() != -1) {
- CompanyFieldCategory childSector = this.companyFieldCategoryService.find(companyField.getChildSectorId());
- if (childSector != null) {
- companyFieldVo.setChildSectorName(childSector.getUseValue());
- }
- }
- if (companyField.getRegionId() != null && companyField.getRegionId() != -1) {
- CompanyFieldCategory region = this.companyFieldCategoryService.find(companyField.getRegionId());
- if (region != null) {
- companyFieldVo.setRegionName(region.getUseValue());
- }
- }
- /*if (companyField.getStatusId() != null && companyField.getStatusId() != -1) {
- CompanyFieldCategory status = this.companyFieldCategoryService.find(companyField.getStatusId());
- if (status != null) {
- companyFieldVo.setStatusName(status.getUseValue());
- }
- }*/
+ CreateCompanyFieldCategory(companyFieldVo, companyField);
companyFieldVo.setIspFieldVo(ispFieldVo);
companyFieldVo.setHostingFieldVo(hostingFieldVo);
@@ -203,12 +214,24 @@
this.verifyUrl(companyFieldForm.getUrl(), companyFieldForm.getId());
if (companyFieldForm.getTelList() != null && companyFieldForm.getTelList().size() > 0) {
- String[] tels = ConvertUtil.ToArray(companyFieldForm.getTelList());
- companyFieldForm.setTel(Arrays.toString(tels));
+ String tels = companyFieldForm.getTelList().toString();
+ if (tels.contains("[")) {
+ tels = tels.substring(1, tels.indexOf("]"));
+ }
+ companyFieldForm.setTel(tels.trim());
}
if (companyFieldForm.getEmailList() != null && companyFieldForm.getEmailList().size() > 0) {
- String[] emails = ConvertUtil.ToArray(companyFieldForm.getEmailList());
- companyFieldForm.setEmail(Arrays.toString(emails));
+ String emails = companyFieldForm.getEmailList().toString();
+ if (emails.contains("[")) {
+ emails = emails.substring(1, emails.indexOf("]"));
+ }
+ companyFieldForm.setEmail(emails.trim());
+ }
+
+ CompanyFieldCategory companyFieldCategory = this.companyFieldCategoryService.find(companyFieldForm.getChildSectorId());
+ if (!companyFieldCategory.getParentId().equals(companyFieldForm.getParentSectorId())) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.PARENT_SECTOR_NOT_EQUAL));
}
CompanyField companyField = ConvertUtil.copyProperties(companyFieldForm, CompanyField.class);
@@ -654,6 +677,19 @@
CompanyFieldCondition companyFieldCondition = CompanyFieldCondition.make(conditions);
List<Map<String, Object>> results = this.companyFieldMapper.find(companyFieldCondition);
+ CompanyFieldVo companyFieldVo = new CompanyFieldVo();
+
+ if (results != null && results.size() > 0) {
+ for (Map<String, Object> result : results) {
+ CompanyField companyField = ConvertUtil.convertMapToClass(result, CompanyField.class);
+ CompanyFieldVo companyFieldVo2 = CreateCompanyFieldCategory(companyFieldVo, companyField);
+
+ result.put("companyTypeName", companyFieldVo2.getCompanyTypeName());
+ result.put("parentSectorName", companyFieldVo2.getParentSectorName());
+ result.put("childSectorName", companyFieldVo2.getChildSectorName());
+ result.put("regionName", companyFieldVo2.getRegionName());
+ }
+ }
List<CompanyFieldVo> companyFieldVos = ConvertUtil.convertListToListClass(results, CompanyFieldVo.class);
// code_ko_KR �뿉 code紐� �꽕�젙
--
Gitblit v1.8.0