From ec9c7e5582d4c20c35e7c3016d64a2213e9f6a50 Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 화, 15 3월 2022 12:12:17 +0900
Subject: [PATCH] - 파트너 엑셀 임포트 시 이메일 정규식표현 검사하는 코드 제거 - 이슈 상세페이지 setHideCompleteIssue null 체크 - api로 이슈 추가 시 이슈유형에 업체가 설정되어있지 않는경우 메시지 추가
---
src/main/java/kr/wisestone/owl/web/controller/IssueTableConfigController.java | 60 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/controller/IssueTableConfigController.java b/src/main/java/kr/wisestone/owl/web/controller/IssueTableConfigController.java
index 115e6e8..2d0f926 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/IssueTableConfigController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/IssueTableConfigController.java
@@ -1,6 +1,7 @@
package kr.wisestone.owl.web.controller;
import kr.wisestone.owl.constant.Constants;
+import kr.wisestone.owl.domain.IssueTableConfig;
import kr.wisestone.owl.service.IssueTableConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
@@ -33,17 +34,6 @@
return this.setSuccessMessage(resJsonData);
}
- // 硫붿씤 �씠�뒋 �뀒�씠釉� �꽕�젙 �긽�꽭 議고쉶
- @RequestMapping(value = "/issueTableConfig/detail", produces = MediaType.APPLICATION_JSON_VALUE)
- public
- @ResponseBody
- Map<String, Object> detail() {
- Map<String, Object> resJsonData = new HashMap<>();
- this.issueTableConfigService.detailIssueTableConfig(resJsonData);
-
- return this.setSuccessMessage(resJsonData);
- }
-
// �뿰愿� �씠�뒋 �뀒�씠釉� �꽕�젙 ���옣
@RequestMapping(value = "/issueTableConfig/relationAdd", produces = MediaType.APPLICATION_JSON_VALUE)
public
@@ -52,17 +42,6 @@
Map<String, Object> resJsonData = new HashMap<>();
this.issueTableConfigService.addRelationIssueTableConfig(params.get(Constants.REQ_KEY_CONTENT));
-
- return this.setSuccessMessage(resJsonData);
- }
-
- // �뿰愿� �씠�뒋 �뀒�씠釉� �꽕�젙 �긽�꽭 議고쉶
- @RequestMapping(value = "/issueTableConfig/relationDetail", produces = MediaType.APPLICATION_JSON_VALUE)
- public
- @ResponseBody
- Map<String, Object> relationDetail(@RequestBody Long issueId) {
- Map<String, Object> resJsonData = new HashMap<>();
- this.issueTableConfigService.detailRelationIssueTableConfig(issueId,resJsonData);
return this.setSuccessMessage(resJsonData);
}
@@ -79,13 +58,46 @@
return this.setSuccessMessage(resJsonData);
}
+ // 硫붿씤 �씠�뒋 �뀒�씠釉� �꽕�젙 �긽�꽭 議고쉶
+ @RequestMapping(value = "/issueTableConfig/detail", produces = MediaType.APPLICATION_JSON_VALUE)
+ public
+ @ResponseBody
+ Map<String, Object> detail(@RequestBody Map<String, Map<String, Object>> params) {
+ Map<String, Object> resJsonData = new HashMap<>();
+
+ Map<String, Object> param = params.get(Constants.REQ_KEY_CONTENT);
+ param.put("issueTableType", IssueTableConfig.ISSUE_TABLE_TYPE_MAIN);
+
+ this.issueTableConfigService.detailIssueTableConfig(param, resJsonData);
+
+ return this.setSuccessMessage(resJsonData);
+ }
+
+ // �뿰愿� �씠�뒋 �뀒�씠釉� �꽕�젙 �긽�꽭 議고쉶
+ @RequestMapping(value = "/issueTableConfig/relationDetail", produces = MediaType.APPLICATION_JSON_VALUE)
+ public
+ @ResponseBody
+ Map<String, Object> relationDetail(@RequestBody Map<String, Map<String, Object>> params) {
+ Map<String, Object> resJsonData = new HashMap<>();
+
+ Map<String, Object> param = params.get(Constants.REQ_KEY_CONTENT);
+ param.put("issueTableType", IssueTableConfig.ISSUE_TABLE_TYPE_REL);
+
+ this.issueTableConfigService.detailIssueTableConfig(param, resJsonData);
+
+ return this.setSuccessMessage(resJsonData);
+ }
+
// �븯�쐞 �씠�뒋 �뀒�씠釉� �꽕�젙 �긽�꽭 議고쉶
@RequestMapping(value = "/issueTableConfig/downDetail", produces = MediaType.APPLICATION_JSON_VALUE)
public
@ResponseBody
- Map<String, Object> downDetail(@RequestBody Long issueId) {
+ Map<String, Object> downDetail(@RequestBody Map<String, Map<String, Object>> params) {
Map<String, Object> resJsonData = new HashMap<>();
- this.issueTableConfigService.detailDownIssueTableConfig(issueId,resJsonData);
+ Map<String, Object> param = params.get(Constants.REQ_KEY_CONTENT);
+ param.put("issueTableType", IssueTableConfig.ISSUE_TABLE_TYPE_DOWN);
+
+ this.issueTableConfigService.detailIssueTableConfig(param, resJsonData);
return this.setSuccessMessage(resJsonData);
}
--
Gitblit v1.8.0