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/IspFieldController.java |   48 ++++++++++++++++++++++++++++++++----------------
 1 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/web/controller/IspFieldController.java b/src/main/java/kr/wisestone/owl/web/controller/IspFieldController.java
index 4285f77..450be62 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/IspFieldController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/IspFieldController.java
@@ -2,7 +2,7 @@
 
 import kr.wisestone.owl.constant.Constants;
 import kr.wisestone.owl.service.IspFieldService;
-import kr.wisestone.owl.web.condition.IspCondition;
+import kr.wisestone.owl.web.condition.IspFieldCondition;
 import kr.wisestone.owl.web.form.IspFieldForm;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
@@ -13,6 +13,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;
@@ -25,8 +26,8 @@
     @Autowired
     private IspFieldService IspFieldService;
 
-    // �뾽泥� �깮�꽦
-    @RequestMapping(value = "/isp/add", method = RequestMethod.POST)
+    // ISP �깮�꽦
+    @RequestMapping(value = "/ispField/add", method = RequestMethod.POST)
     public
     @ResponseBody
     Map<String, Object> add(@RequestBody Map<String, Map<String, Object>> params) {
@@ -37,32 +38,32 @@
         return this.setSuccessMessage(resJsonData);
     }
 
-    // �뾽泥� 議고쉶
-    @RequestMapping(value = "/isp/find", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+    // ISP 議고쉶
+    @RequestMapping(value = "/ispField/find", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
     public
     @ResponseBody
     Map<String, Object> find(@RequestBody Map<String, Map<String, Object>> params) {
         Map<String, Object> resJsonData = new HashMap<>();
         Pageable pageable = this.pageUtil.convertPageable(this.getPageVo(params));
 
-        this.IspFieldService.find(resJsonData, IspCondition.make(params.get(Constants.REQ_KEY_CONTENT)), pageable);
+        this.IspFieldService.find(resJsonData, IspFieldCondition.make(params.get(Constants.REQ_KEY_CONTENT)), pageable);
 
         return this.setSuccessMessage(resJsonData);
     }
 
-    // �뾽泥� �긽�꽭 議고쉶
-    @RequestMapping(value = "/isp/detail", produces = MediaType.APPLICATION_JSON_VALUE)
+    // ISP �긽�꽭 議고쉶
+    @RequestMapping(value = "/ispField/detail", produces = MediaType.APPLICATION_JSON_VALUE)
     public
     @ResponseBody
     Map<String, Object> detail(@RequestBody Map<String, Map<String, Object>> params) {
         Map<String, Object> resJsonData = new HashMap<>();
-        this.IspFieldService.detail(resJsonData, IspCondition.make(params.get(Constants.REQ_KEY_CONTENT)));
+        this.IspFieldService.detail(resJsonData, IspFieldCondition.make(params.get(Constants.REQ_KEY_CONTENT)));
 
         return this.setSuccessMessage(resJsonData);
     }
 
-    // �뾽泥� �닔�젙
-    @RequestMapping(value = "/isp/modify", produces = MediaType.APPLICATION_JSON_VALUE)
+    // ISP �닔�젙
+    @RequestMapping(value = "/ispField/modify", produces = MediaType.APPLICATION_JSON_VALUE)
     public
     @ResponseBody
     Map<String, Object> modify(@RequestBody Map<String, Map<String, Object>> params) {
@@ -73,8 +74,8 @@
         return this.setSuccessMessage(resJsonData);
     }
 
-    // �뾽泥� �궘�젣
-    @RequestMapping(value = "/isp/remove", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+    // ISP �궘�젣
+    @RequestMapping(value = "/ispField/remove", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
     public
     @ResponseBody
     Map<String, Object> remove(@RequestBody Map<String, Map<String, Object>> params) {
@@ -86,11 +87,26 @@
         return this.setSuccessMessage(resJsonData);
     }
 
-
-    // �뾽泥� �뿊�� �떎�슫濡쒕뱶
-    @RequestMapping(value = "/isp/downloadExcel", method = RequestMethod.POST)
+    // ISP �뿊�� �떎�슫濡쒕뱶
+    @RequestMapping(value = "/ispField/downloadExcel", method = RequestMethod.POST)
     public ModelAndView downloadExcel(HttpServletRequest request, Model model) {
         return this.IspFieldService.downloadExcel(request, model);
     }
+
+    //  ISP Import �슜 �뿊�� �뀥�뵆由� �떎�슫濡쒕뱶
+    @RequestMapping(value = "/ispField/downloadExcelTemplate", method = RequestMethod.POST)
+    public ModelAndView downloadExcelImport(HttpServletRequest request, Model model) {
+        return this.IspFieldService.downloadExcelTemplate(request, model);
+    }
+
+    //  ISP �뿊�� �벑濡�
+    @RequestMapping(value = "/ispField/importExcel", method = RequestMethod.POST)
+    public @ResponseBody Map<String, Object> importExcel(MultipartHttpServletRequest request) throws Exception {
+        Map<String, Object> resJsonData = new HashMap<>();
+
+        this.IspFieldService.importExcel(request.getFile("file"));
+
+        return this.setSuccessMessage(resJsonData);
+    }
 }
 

--
Gitblit v1.8.0