From 9c879ab12134cb6841edefeff2ce948ad27d8680 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 화, 28 12월 2021 14:18:05 +0900
Subject: [PATCH] - prod 설정파일 수정 => 스케쥴러 사용으로 변경 => 첨부파일 저장 폴더명 변경 - 공지사항 알림 표시 삭제 - 이슈유형에서 워크플로우 변경시 이슈 이력 오류 수정
---
src/main/java/kr/wisestone/owl/web/controller/IssueController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
index e9e747d..28c74b5 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
@@ -5,6 +5,7 @@
import kr.wisestone.owl.service.IssueService;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.web.condition.ApiMonitorCondition;
+import kr.wisestone.owl.web.condition.DepartmentCondition;
import kr.wisestone.owl.web.condition.IssueCondition;
import kr.wisestone.owl.web.form.EmailTemplateForm;
import kr.wisestone.owl.web.form.IssueForm;
@@ -102,6 +103,19 @@
Map<String, Object> resJsonData = new HashMap<>();
this.issueService.findPartner(resJsonData, params.get(Constants.REQ_KEY_CONTENT));
+
+ return this.setSuccessMessage(resJsonData);
+ }
+
+ // �뙆�듃�꼫 紐⑸줉 議고쉶
+ @RequestMapping(value = "/issue/findReadyDepartments", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+ public
+ @ResponseBody
+ Map<String, Object> findReadyDepartments(@RequestBody Map<String, Map<String, Object>> params) {
+ Map<String, Object> resJsonData = new HashMap<>();
+ Pageable pageable = this.pageUtil.convertPageable(this.getPageVo(params));
+
+ this.issueService.findReadyDepartments(resJsonData, DepartmentCondition.make(params.get(Constants.REQ_KEY_CONTENT)), pageable);
return this.setSuccessMessage(resJsonData);
}
@@ -204,7 +218,7 @@
public @ResponseBody Map<String, Object> importExcel(MultipartHttpServletRequest request) throws Exception {
Map<String, Object> resJsonData = new HashMap<>();
- this.issueService.importExcel(request.getFile("file"));
+ this.issueService.importExcel(IssueForm.make(ConvertUtil.convertJsonToMap(request.getParameter(Constants.REQ_KEY_CONTENT))), request.getFile("file"));
return this.setSuccessMessage(resJsonData);
}
--
Gitblit v1.8.0