From 1dad4d94cc415d2f8092aff0368744289337f504 Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 화, 22 2월 2022 14:29:43 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/kr/wisestone/owl/web/controller/IssueController.java |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 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 22fa9f6..db9ca42 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
@@ -69,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);
     }
 
@@ -127,6 +126,7 @@
     @ResponseBody
     Map<String, Object> detail(@RequestBody Map<String, Map<String, Object>> params) {
         Map<String, Object> resJsonData = new HashMap<>();
+
         this.issueService.detailIssue(resJsonData, IssueCondition.make(params.get(Constants.REQ_KEY_CONTENT)));
 
         return this.setSuccessMessage(resJsonData);
@@ -235,27 +235,26 @@
     }
 
     //  �씠�뒋 硫붿씪 �뙆�듃�꼫 �떞�떦�옄�뿉寃� 諛쒖넚 (�뀥�뵆由� 異붽�)
-    @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", produces = MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(value = "/issue/sendCommonEmail", method = RequestMethod.POST)
     public
     @ResponseBody
-    Map<String, Object> sendCommonEmail(@RequestBody Map<String, Map<String, Object>> params) {
+    Map<String, Object> sendCommonEmail(MultipartHttpServletRequest request) {
         Map<String, Object> resJsonData = new HashMap<>();
-        this.issueService.sendCommonEmail(EmailCommonForm.make(params.get(Constants.REQ_KEY_CONTENT)));
+        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)

--
Gitblit v1.8.0