From 71b4c4bd1f27314caaac6d245c460032f79ce830 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 수, 19 1월 2022 14:18:06 +0900 Subject: [PATCH] 전체 이슈 키워드 검색 후 하위이슈 숨기기 버튼 활성화 또는 비활성화 시 검색되는 이슈가 다른 문제 해결 (projectId, issuetypeId가 조건에 들어가면서 생긴 문제) --- src/main/java/kr/wisestone/owl/service/CompanyFieldService.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/CompanyFieldService.java b/src/main/java/kr/wisestone/owl/service/CompanyFieldService.java index c9e836b..00d8255 100644 --- a/src/main/java/kr/wisestone/owl/service/CompanyFieldService.java +++ b/src/main/java/kr/wisestone/owl/service/CompanyFieldService.java @@ -4,8 +4,10 @@ import kr.wisestone.owl.vo.CompanyFieldVo; import kr.wisestone.owl.web.condition.CompanyFieldCondition; import kr.wisestone.owl.web.form.CompanyFieldForm; +import kr.wisestone.owl.web.form.IssueForm; import org.springframework.data.domain.Pageable; import org.springframework.ui.Model; +import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; @@ -17,7 +19,13 @@ List<CompanyFieldVo> findCompany(Map<String, Object> resJsonData, CompanyFieldCondition make, Pageable pageable); + List<Map<String, Object>> find(CompanyFieldCondition condition); + CompanyField getCompany(Long id); + + List<CompanyField> findByIsp(Long id); + + List<CompanyField> findByHosting(Long id); void detailCompany(Map<String, Object> resJsonData, CompanyFieldCondition make); @@ -27,5 +35,9 @@ ModelAndView downloadExcel(HttpServletRequest request, Model model); - boolean company(Long id); + ModelAndView downloadExcelTemplate(HttpServletRequest request, Model model); + + void importExcel(MultipartFile multipartFile) throws Exception; + + CompanyFieldVo CreateCompanyFieldCategory(CompanyFieldVo companyFieldVo, CompanyField companyField); } -- Gitblit v1.8.0