From 1951e84f213859fb4486b2f19dc827ff3406060d Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 금, 11 2월 2022 19:30:32 +0900
Subject: [PATCH] - 업체의 카테고리 대분류가 공백인데 중분류 조회되는 문제 해결 - 업체 상태 직접입력 일 경우 사용자가 직접입력한 상태명을 보여주도록 수정
---
src/main/java/kr/wisestone/owl/web/controller/IssueController.java | 17 +++++++----------
1 files changed, 7 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..a9fec9d 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
@@ -127,10 +127,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 +236,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