From f919af96e5e083ad462a5e71c00ff148ebdb91c6 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 20 1월 2022 15:23:28 +0900
Subject: [PATCH] - 오토 컴플릿 항목 선택하면 목록 사라지게 수정 - 업체 메일 발송 시 템플릿 선택 문구 변경 - 연락처 입력 폼 정규식 제거하고 숫자만 입력 가능하게 수정 - 모든 사용자 필드(날짜) 24시간 타입으로 변경
---
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldCategoryServiceImpl.java | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldCategoryServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldCategoryServiceImpl.java
index 0601504..3eb3462 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldCategoryServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldCategoryServiceImpl.java
@@ -1,39 +1,22 @@
package kr.wisestone.owl.service.impl;
import com.google.common.collect.Lists;
-import kr.wisestone.owl.common.ExcelConditionCheck;
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.constant.MsgConstants;
-import kr.wisestone.owl.domain.CompanyField;
import kr.wisestone.owl.domain.CompanyFieldCategory;
-import kr.wisestone.owl.domain.HostingField;
-import kr.wisestone.owl.domain.IspField;
+import kr.wisestone.owl.domain.enumType.CompanyFieldCategoryType;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.CompanyFieldCategoryMapper;
-import kr.wisestone.owl.mapper.CompanyFieldMapper;
import kr.wisestone.owl.repository.CompanyFieldCategoryRepository;
-import kr.wisestone.owl.repository.CompanyFieldRepository;
-import kr.wisestone.owl.repository.HostingFieldRepository;
-import kr.wisestone.owl.repository.IspFieldRepository;
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.vo.*;
import kr.wisestone.owl.web.condition.CompanyFieldCategoryCondition;
-import kr.wisestone.owl.web.condition.CompanyFieldCondition;
-import kr.wisestone.owl.web.condition.HostingFieldCondition;
-import kr.wisestone.owl.web.form.CompanyFieldForm;
-import kr.wisestone.owl.web.view.ExcelView;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
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;
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -76,6 +59,28 @@
return this.companyFieldCategoryMapper.findById(id);
}
+ public List<Map<String, Object>> findByType(CompanyFieldCategoryType categoryType) {
+ CompanyFieldCategoryCondition condition = new CompanyFieldCategoryCondition();
+ switch (categoryType) {
+ case COMPANYTYPE:
+ condition.setTypeCategory("COMPANYTYPE");
+ break;
+ case PARENTSECTOR:
+ condition.setTypeCategory("PARENTSECTOR");
+ break;
+ case CHILDSECTOR:
+ condition.setTypeCategory("CHILDSECTOR");
+ break;
+ case REGION:
+ condition.setTypeCategory("REGION");
+ break;
+ case STATUS:
+ condition.setTypeCategory("STATUS");
+ break;
+ }
+ return this.companyFieldCategoryMapper.find(condition);
+ }
+
// 寃��깋 寃곌낵瑜� Vo 濡� 蹂��솚�븳�떎.
private List<CompanyFieldCategoryVo> convertCompanyFieldCategoryVoToMap(List<Map<String, Object>> results, Long totalCount, Pageable pageable, Map<String, Object> resJsonData) {
List<CompanyFieldCategoryVo> companyFieldCategoryVos = Lists.newArrayList();
--
Gitblit v1.8.0