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/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