From b1d7844cb525a36b1e0e193e9e96a2531d4badeb Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 22 2월 2022 14:23:26 +0900
Subject: [PATCH] - 이슈유형 설정에 상위 이슈 업체/ISP/호스팅 상속 기능 - 워크플로우에 속해있는 부서 삭제 시 팝업 메시지 수정

---
 src/main/java/kr/wisestone/owl/web/controller/IssueController.java |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 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 dd0da5f..db9ca42 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
@@ -7,6 +7,7 @@
 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.EmailCommonForm;
 import kr.wisestone.owl.web.form.EmailTemplateForm;
 import kr.wisestone.owl.web.form.IssueForm;
 import org.slf4j.Logger;
@@ -68,17 +69,16 @@
     }
 
     //  �븯�쐞�씠�뒋 �깮�꽦
-    @RequestMapping(value = "/issue/downIssueAdd", method = RequestMethod.POST)
+    @RequestMapping(value = "/issue/downIssueAdd", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
     public
     @ResponseBody
     Map<String, Object> downIssueAdd(MultipartHttpServletRequest request) {
         Map<String, Object> resJsonData = new HashMap<>();
         //  �씠�뒋 �깮�꽦
-        Issue issue = this.issueService.addDownIssue(IssueForm.make(ConvertUtil.convertJsonToMap(request.getParameter(Constants.REQ_KEY_CONTENT))), request.getFiles("file"));
+        Issue issue = this.issueService.addDownIssue(resJsonData, IssueForm.make(ConvertUtil.convertJsonToMap(request.getParameter(Constants.REQ_KEY_CONTENT))), request.getFiles("file"));
         //  踰꾩쟾 �깮�꽦
         this.issueService.addIssueVersion(issue.getId());
 
-        resJsonData.put(Constants.RES_KEY_CONTENTS, issue.getId()); //�븯�쐞�씠�뒋 ID
         return this.setSuccessMessage(resJsonData);
     }
 
@@ -126,10 +126,8 @@
     @ResponseBody
     Map<String, Object> detail(@RequestBody Map<String, Map<String, Object>> params) {
         Map<String, Object> resJsonData = new HashMap<>();
-        Pageable relPageable = this.pageUtil.convertRelPageable(this.getPageVo(params));
-        Pageable downPageable = this.pageUtil.convertDownPageable(this.getPageVo(params));
 
-        this.issueService.detailIssue(resJsonData, IssueCondition.make(params.get(Constants.REQ_KEY_CONTENT)), relPageable, downPageable);
+        this.issueService.detailIssue(resJsonData, IssueCondition.make(params.get(Constants.REQ_KEY_CONTENT)));
 
         return this.setSuccessMessage(resJsonData);
     }
@@ -237,17 +235,27 @@
     }
 
     //  �씠�뒋 硫붿씪 �뙆�듃�꼫 �떞�떦�옄�뿉寃� 諛쒖넚 (�뀥�뵆由� 異붽�)
-    @RequestMapping(value = "/issue/sendEmailPartners", produces = MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(value = "/issue/sendEmailPartners", method = RequestMethod.POST)
     public
     @ResponseBody
-    Map<String, Object> sendEmailPartners(@RequestBody Map<String, Map<String, Object>> params) {
+    Map<String, Object> sendEmailPartners(MultipartHttpServletRequest request) {
         Map<String, Object> resJsonData = new HashMap<>();
-        this.issueService.sendIssueEmailPartners(EmailTemplateForm.make(params.get(Constants.REQ_KEY_CONTENT)));
+        this.issueService.sendIssueEmailPartners(EmailTemplateForm.make(ConvertUtil.convertJsonToMap(request.getParameter(Constants.REQ_KEY_CONTENT))), request.getFiles("file"));
 //        this.issueService.sendIssueEmailPartners(IssueForm.make(params.get(Constants.REQ_KEY_CONTENT)));
         return this.setSuccessMessage(resJsonData);
     }
 
 
+    // �씪諛� 硫붿씪 諛쒖넚 (�궗�슜�옄 吏곸젒 �옉�꽦)
+    @RequestMapping(value = "/issue/sendCommonEmail", method = RequestMethod.POST)
+    public
+    @ResponseBody
+    Map<String, Object> sendCommonEmail(MultipartHttpServletRequest request) {
+        Map<String, Object> resJsonData = new HashMap<>();
+        this.issueService.sendCommonEmail(EmailCommonForm.make(ConvertUtil.convertJsonToMap(request.getParameter(Constants.REQ_KEY_CONTENT))), request.getFiles("file"));
+        return this.setSuccessMessage(resJsonData);
+    }
+
     //  api 湲곕줉 議고쉶
     @RequestMapping(value = "/api/findHistory", produces = MediaType.APPLICATION_JSON_VALUE)
     public

--
Gitblit v1.8.0