From 70e3ad43e441d07d16c7e4e1af0e093befd62c01 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 월, 27 12월 2021 19:36:11 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/java/kr/wisestone/owl/web/controller/DepartmentController.java | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/web/controller/DepartmentController.java b/src/main/java/kr/wisestone/owl/web/controller/DepartmentController.java index 1c3f1c0..945f430 100644 --- a/src/main/java/kr/wisestone/owl/web/controller/DepartmentController.java +++ b/src/main/java/kr/wisestone/owl/web/controller/DepartmentController.java @@ -3,6 +3,7 @@ import kr.wisestone.owl.constant.Constants; import kr.wisestone.owl.service.DepartmentService; import kr.wisestone.owl.web.condition.DepartmentCondition; +import kr.wisestone.owl.web.condition.UserCondition; import kr.wisestone.owl.web.form.DepartmentForm; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; @@ -89,6 +90,29 @@ return this.setSuccessMessage(resJsonData); } + // �봽濡쒖젥�듃�뿉 李몄뿬�븯�뒗 遺��꽌 紐⑸줉 議고쉶 + @RequestMapping(value = "/department/findProjectDepartment", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) + public + @ResponseBody + Map<String, Object> findProjectDepartment(@RequestBody Map<String, Map<String, Object>> params) { + Map<String, Object> resJsonData = new HashMap<>(); + + this.departmentService.findProjectDepartment(resJsonData, DepartmentCondition.make(params.get(Constants.REQ_KEY_CONTENT))); + + return this.setSuccessMessage(resJsonData); + } + + // �썙�겕�뵆濡쒖슦�뿉 �냽�빐�엳�뒗 遺��꽌 紐⑸줉 議고쉶 + @RequestMapping(value = "/department/findWorkflowDepartment", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) + public + @ResponseBody + Map<String, Object> findWorkflowDepartment(@RequestBody Map<String, Map<String, Object>> params) { + Map<String, Object> resJsonData = new HashMap<>(); + + this.departmentService.findWorkflowDepartment(resJsonData, DepartmentCondition.make(params.get(Constants.REQ_KEY_CONTENT))); + + return this.setSuccessMessage(resJsonData); + } // 遺��꽌 �뿊�� �떎�슫濡쒕뱶 @RequestMapping(value = "/department/downloadExcel", method = RequestMethod.POST) -- Gitblit v1.8.0