From 8d1928e733f71e00c6d8685d4f5b15031f4afa38 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 18 2월 2022 12:54:27 +0900
Subject: [PATCH] 파트너정보 상속여부 확인 알림 코드 수정
---
src/main/java/kr/wisestone/owl/web/controller/IssueController.java | 18 ++++++++----------
1 files changed, 8 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 ff92657..90fa933 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
@@ -80,6 +80,7 @@
this.issueService.addIssueVersion(issue.getId());
resJsonData.put(Constants.RES_KEY_CONTENTS, issue.getId()); //�븯�쐞�씠�뒋 ID
+ resJsonData.put(Constants.REQ_KEY_CONTENT, issue.getIssueType().getInheritPartners()); //�긽�냽 �뿬遺�
return this.setSuccessMessage(resJsonData);
}
@@ -127,10 +128,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);
}
@@ -238,27 +237,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