From ec9c7e5582d4c20c35e7c3016d64a2213e9f6a50 Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 화, 15 3월 2022 12:12:17 +0900
Subject: [PATCH] - 파트너 엑셀 임포트 시 이메일 정규식표현 검사하는 코드 제거 - 이슈 상세페이지 setHideCompleteIssue null 체크 - api로 이슈 추가 시 이슈유형에 업체가 설정되어있지 않는경우 메시지 추가

---
 src/main/java/kr/wisestone/owl/web/controller/CompanyFieldController.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/web/controller/CompanyFieldController.java b/src/main/java/kr/wisestone/owl/web/controller/CompanyFieldController.java
index 8b4f065..23e9192 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/CompanyFieldController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/CompanyFieldController.java
@@ -3,8 +3,10 @@
 import kr.wisestone.owl.constant.Constants;
 
 import kr.wisestone.owl.service.CompanyFieldService;
+import kr.wisestone.owl.util.ConvertUtil;
 import kr.wisestone.owl.web.condition.CompanyFieldCondition;
 import kr.wisestone.owl.web.form.CompanyFieldForm;
+import kr.wisestone.owl.web.form.IssueForm;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.MediaType;
@@ -14,6 +16,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
@@ -93,5 +96,21 @@
     public ModelAndView downloadExcel(HttpServletRequest request, Model model) {
         return this.companyFieldService.downloadExcel(request, model);
     }
+
+    //  �뾽泥� Import �슜 �뿊�� �뀥�뵆由� �떎�슫濡쒕뱶
+    @RequestMapping(value = "/companyField/downloadExcelTemplate", method = RequestMethod.POST)
+    public ModelAndView downloadExcelImport(HttpServletRequest request, Model model) {
+        return this.companyFieldService.downloadExcelTemplate(request, model);
+    }
+
+    //  �뾽泥� �뿊�� �벑濡�
+    @RequestMapping(value = "/companyField/importExcel", method = RequestMethod.POST)
+    public @ResponseBody Map<String, Object> importExcel(MultipartHttpServletRequest request) throws Exception {
+        Map<String, Object> resJsonData = new HashMap<>();
+
+        this.companyFieldService.importExcel(request.getFile("file"));
+
+        return this.setSuccessMessage(resJsonData);
+    }
 }
 

--
Gitblit v1.8.0