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"; // 다음 엑셀 라인에서 입력된 업종명으로 검색되는 업종(대분류)이 없습니다 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); } 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); 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. 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"));
