From 4e19e7116e6b83e8b6dddea66283f3875b0bac39 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 27 1월 2022 11:24:57 +0900
Subject: [PATCH] - 이슈 엑셀 임포트 시 오류 수정 - 업체 임포트 시 전화번호 입력 오류 수정 - 업체정보 리스트 ISP,호스팅 컬럼 명칭 변경
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 45 +++++++++++++++++++++++++++------------------
src/main/webapp/scripts/app/companyField/companyFieldList.controller.js | 4 ++--
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 9 +++++++++
src/main/java/kr/wisestone/owl/constant/MsgConstants.java | 1 +
src/main/webapp/WEB-INF/i18n/messages_ko_KR.properties | 1 +
5 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/constant/MsgConstants.java b/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
index 5077250..85c9443 100644
--- a/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
+++ b/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
@@ -188,6 +188,7 @@
public static final String EXCEL_IMPORT_HOSTING_NOT_EXIST = "EXCEL_IMPORT_HOSTING_NOT_EXIST"; // �떎�쓬 �뿊�� �씪�씤�뿉�꽌 �엯�젰�맂 �샇�뒪�똿紐낆쑝濡� 寃��깋�릺�뒗 �샇�뒪�똿�씠 �뾾�뒿�땲�떎.
public static final String EXCEL_IMPORT_PARENT_SECTOR_NOT_EQUAL = "EXCEL_IMPORT_PARENT_SECTOR_NOT_EQUAL"; // �떎�쓬 �뿊�� �씪�씤�뿉�꽌 �엯�젰�맂 �뾽醫�(以묐텇瑜�)�� �뾽醫�(��遺꾨쪟)�뿉 �냽�빐�엳吏� �븡�뒿�땲�떎.
public static final String EXCEL_IMPORT_PARENT_SECTOR_IS_NULL = "EXCEL_IMPORT_PARENT_SECTOR_IS_NULL"; // �떎�쓬 �뿊�� �씪�씤�뿉�꽌 �뾽醫�(以묐텇瑜�)留� �엯�젰 �뻽�뒿�땲�떎. �뾽醫�(��遺꾨쪟)�룄 �엯�젰�씠 �븘�슂�빀�땲�떎.
+ public static final String EXCEL_IMPORT_TEL_NOT_STRING_TYPE = "EXCEL_IMPORT_TEL_NOT_STRING_TYPE"; // �떎�쓬 �뿊�� �씪�씤�뿉�꽌 �엯�젰�맂 �뿰�씫泥섏쓽 �삎�떇�씠 �옒紐� �릺�뿀�뒿�땲�떎.
public static final String EXCEL_IMPORT_COMPANY_TYPE_NOT_EXIST = "EXCEL_IMPORT_COMPANY_TYPE_NOT_EXIST"; // �떎�쓬 �뿊�� �씪�씤�뿉�꽌 �엯�젰�맂 湲곗뾽援щ텇紐낆쑝濡� 寃��깋�릺�뒗 湲곗뾽援щ텇�씠 �뾾�뒿�땲�떎
public static final String EXCEL_IMPORT_PARENT_SECTOR_NOT_EXIST = "EXCEL_IMPORT_PARENT_SECTOR_NOT_EXIST"; // �떎�쓬 �뿊�� �씪�씤�뿉�꽌 �엯�젰�맂 �뾽醫낅챸�쑝濡� 寃��깋�릺�뒗 �뾽醫�(��遺꾨쪟)�씠 �뾾�뒿�땲�떎
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 0e3b6e7..06e4059 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -441,6 +441,13 @@
return cell != null && cell.getStringCellValue() != null && cell.getCellType() != Cell.CELL_TYPE_BLANK;
}
+ private void telTypeCheck (Cell cell, int rowIndex) {
+ if (cell.getCellType() != cell.CELL_TYPE_STRING) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_TEL_NOT_STRING_TYPE, rowIndex));
+ }
+ }
+
// �뿊�� �븘�뱶�뿉 �엳�뒗 �젙蹂대�� �뾽泥� form �쑝濡� �삷湲대떎.
private CompanyFieldForm setCompanyFieldFormToExcelField(Row row, int rowIndex, Map<String, IspField> ispFieldMaps, Map<String, HostingField> hostingFieldMaps,
Map<String, Map<String, Object>> companyTypeMaps, Map<String, Map<String, Object>> parentSectorMaps,
@@ -478,6 +485,8 @@
case 4:
// �뿰�씫泥�
+ this.telTypeCheck(cell, rowIndex); // �뀓�뒪�듃 �삎�떇 泥댄겕
+
if (cellNullCheck(cell)) {
this.setCompanyFormTel(cell, companyFieldForm, rowIndex);
}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 1168f58..acbd32b 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -3204,37 +3204,46 @@
* @param issueForm IssueForm
*/
private void setIssuePartners(IssueForm issueForm, Issue issue) {
+ IssueCompany issueCompany = new IssueCompany();
+ IssueIsp issueIsp = new IssueIsp();
+ IssueHosting issueHosting = new IssueHosting();
//issueCompany �벑濡�
if (issueForm.getIssueCompanyFields() != null && issueForm.getIssueCompanyFields().size() > 0) {
for (Map<String, Object> issueCompanyMap : issueForm.getIssueCompanyFields()) {
CompanyField companyField = ConvertUtil.convertMapToClass(issueCompanyMap, CompanyField.class);
- IssueCompany issueCompany = ConvertUtil.convertMapToClass(issueCompanyMap, IssueCompany.class);
+ issueCompany = ConvertUtil.convertMapToClass(issueCompanyMap, IssueCompany.class, "id");
issueCompany.setCompanyField(companyField);
issueCompany.setIssue(issue);
this.issueCompanyRepository.saveAndFlush(issueCompany);
-
- // �뾽泥댁쓽 ISP媛� �엳�뒗 寃쎌슦 issueISP �벑濡�
- if (companyField.getIspId() != null && companyField.getIspId() != -1) {
- IspField ispField = this.ispFieldService.getIsp(companyField.getIspId());
- IssueIsp issueIsp = ConvertUtil.copyProperties(ispField, IssueIsp.class);
- issueIsp.setIspField(ispField);
- issueIsp.setIssue(issue);
- this.issueIspRepository.saveAndFlush(issueIsp);
+
+ // �궗�슜�옄媛� ISP瑜� 吏곸젒 �엯�젰�븯吏� �븡�븯�쓣 寃쎌슦 �뾽泥댁뿉 �벑濡앸릺�뼱�엳�뒗 ISP �꽕�젙
+ if (issueForm.getIssueIspFields() == null || issueForm.getIssueIspFields().size() < 1) {
+ // �뾽泥댁쓽 ISP媛� �엳�뒗 寃쎌슦 issueISP �벑濡�
+ if (companyField.getIspId() != null && companyField.getIspId() != -1) {
+ IspField ispField = this.ispFieldService.getIsp(companyField.getIspId());
+ issueIsp = ConvertUtil.copyProperties(ispField, IssueIsp.class, "id");
+ issueIsp.setIspField(ispField);
+ issueIsp.setIssue(issue);
+ this.issueIspRepository.saveAndFlush(issueIsp);
+ }
}
- // �뾽泥댁쓽 �샇�뒪�똿�씠 �엳�뒗 寃쎌슦 issueHosting �벑濡�
- if (companyField.getHostingId() != null && companyField.getHostingId() != -1) {
- HostingField hostingField = this.hostingFieldService.getHosting(companyField.getHostingId());
- IssueHosting issueHosting = ConvertUtil.copyProperties(hostingField, IssueHosting.class);
- issueHosting.setHostingField(hostingField);
- issueHosting.setIssue(issue);
- this.issueHostingRepository.saveAndFlush(issueHosting);
+ // �궗�슜�옄媛� �샇�뒪�똿�쓣 吏곸젒 �엯�젰�븯吏� �븡�븯�쓣 寃쎌슦 �뾽泥댁뿉 �벑濡앸릺�뼱�엳�뒗 �샇�뒪�똿 �꽕�젙
+ if (issueForm.getIssueHostingFields() == null || issueForm.getIssueHostingFields().size() < 1) {
+ // �뾽泥댁쓽 �샇�뒪�똿�씠 �엳�뒗 寃쎌슦 issueHosting �벑濡�
+ if (companyField.getHostingId() != null && companyField.getHostingId() != -1) {
+ HostingField hostingField = this.hostingFieldService.getHosting(companyField.getHostingId());
+ issueHosting = ConvertUtil.copyProperties(hostingField, IssueHosting.class, "id");
+ issueHosting.setHostingField(hostingField);
+ issueHosting.setIssue(issue);
+ this.issueHostingRepository.saveAndFlush(issueHosting);
+ }
}
}
}
//issueIsp �벑濡�
if (issueForm.getIssueIspFields() != null && issueForm.getIssueIspFields().size() > 0) {
for (Map<String, Object> issueIspMap : issueForm.getIssueIspFields()) {
- IssueIsp issueIsp = ConvertUtil.convertMapToClass(issueIspMap, IssueIsp.class);
+ issueIsp = ConvertUtil.convertMapToClass(issueIspMap, IssueIsp.class, "id");
IspField ispField = ConvertUtil.convertMapToClass(issueIspMap, IspField.class);
issueIsp.setIspField(ispField);
issueIsp.setIssue(issue);
@@ -3244,7 +3253,7 @@
//issueHosting �벑濡�
if (issueForm.getIssueHostingFields() != null && issueForm.getIssueHostingFields().size() > 0) {
for (Map<String, Object> issueHostingMap : issueForm.getIssueHostingFields()) {
- IssueHosting issueHosting = ConvertUtil.convertMapToClass(issueHostingMap, IssueHosting.class);
+ issueHosting = ConvertUtil.convertMapToClass(issueHostingMap, IssueHosting.class, "id");
HostingField hostingField = ConvertUtil.convertMapToClass(issueHostingMap, HostingField.class);
issueHosting.setHostingField(hostingField);
issueHosting.setIssue(issue);
diff --git a/src/main/webapp/WEB-INF/i18n/messages_ko_KR.properties b/src/main/webapp/WEB-INF/i18n/messages_ko_KR.properties
index 43cd4a3..98da405 100644
--- a/src/main/webapp/WEB-INF/i18n/messages_ko_KR.properties
+++ b/src/main/webapp/WEB-INF/i18n/messages_ko_KR.properties
@@ -196,6 +196,7 @@
EXCEL_IMPORT_CHILD_SECTOR_NOT_EXIST=\uB2E4\uC74C \uC5D1\uC140 \uB77C\uC778\uC5D0\uC11C \uC785\uB825\uB41C \uC5C5\uC885\uBA85\uC73C\uB85C \uAC80\uC0C9\uB418\uB294 \uC5C5\uC885(\uC911\uBD84\uB958)\uC774 \uC5C6\uC2B5\uB2C8\uB2E4. \n \uB77C\uC778 \uC815\uBCF4 : {0}
EXCEL_IMPORT_REGION_NOT_EXIST=\uB2E4\uC74C \uC5D1\uC140 \uB77C\uC778\uC5D0\uC11C \uC785\uB825\uB41C \uC9C0\uC5ED\uBA85\uC73C\uB85C \uAC80\uC0C9\uB418\uB294 \uC9C0\uC5ED\uC774 \uC5C6\uC2B5\uB2C8\uB2E4. \n \uB77C\uC778 \uC815\uBCF4 : {0}
EXCEL_IMPORT_PARENT_SECTOR_IS_NULL=\uB2E4\uC74C \uC5D1\uC140 \uB77C\uC778\uC5D0\uC11C \uC5C5\uC885(\uC911\uBD84\uB958)\uB9CC \uC785\uB825 \uD588\uC2B5\uB2C8\uB2E4. \n \uC5C5\uC885(\uB300\uBD84\uB958)\uB3C4 \uC785\uB825\uC774 \uD544\uC694\uD569\uB2C8\uB2E4. \n \uB77C\uC778 \uC815\uBCF4 : {0}
+EXCEL_IMPORT_TEL_NOT_STRING_TYPE=\uB2E4\uC74C \uC5D1\uC140 \uB77C\uC778\uC5D0\uC11C \uC785\uB825\uB41C \uC5F0\uB77D\uCC98\uC758 \uD615\uC2DD\uC774 \uC798\uBABB \uB418\uC5C8\uC2B5\uB2C8\uB2E4. \n \uB77C\uC778 \uC815\uBCF4 : {0}
ISSUE_RESERVATION_VALUE_INVALID=\uC774\uC288 \uBC1C\uC0DD \uC608\uC57D\uC77C\uC774 \uC798\uBABB\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
ISSUE_RESERVATION_NOT_EXIST=\uC774\uC288 \uBC1C\uC0DD \uC608\uC57D \uC815\uBCF4\uAC00 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
index 89addc2..69207f3 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
@@ -109,12 +109,12 @@
.setDName("url")
.setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("ispField.name")
+ .setHName("common.isp")
.setHWidth("bold")
.setDName("ispName")
.setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("hostingField.name")
+ .setHName("common.hosting")
.setHWidth("bold")
.setDName("hostingName")
.setDAlign("text-center"));
--
Gitblit v1.8.0