From 6a8cacfc31f8ac932844a122940fdfd127c117ac Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 수, 09 2월 2022 09:17:20 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/kr/wisestone/owl/service/CompanyFieldService.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/CompanyFieldService.java b/src/main/java/kr/wisestone/owl/service/CompanyFieldService.java
index 99c35b7..66e5cbf 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);
@@ -26,4 +34,12 @@
void removeCompany(CompanyFieldForm make);
ModelAndView downloadExcel(HttpServletRequest request, Model model);
+
+ ModelAndView downloadExcelTemplate(HttpServletRequest request, Model model);
+
+ void importExcel(MultipartFile multipartFile) throws Exception;
+
+ CompanyFieldVo CreateCompanyFieldCategory(CompanyFieldVo companyFieldVo, CompanyField companyField);
+
+ List<CompanyField> findAll();
}
--
Gitblit v1.8.0