From 303d80b28240177fdb813872d00fad757cd650d4 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 13 1월 2022 17:34:24 +0900
Subject: [PATCH] 이슈 테이블 설정 오류 해결
---
src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java | 97 ++++++++++++++++++------------------------------
1 files changed, 37 insertions(+), 60 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java
index e777d90..217339f 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java
@@ -16,6 +16,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
import java.util.Map;
@Service
@@ -37,14 +38,13 @@
return this.issueTableConfigRepository;
}
- Long issueId;
+ Long issueTypeId;
int issueTableType = 0; //issueTableType 珥덇린媛� �꽕�젙
// add 以묐났肄붾뱶 �젣嫄�
- public IssueTableConfig addMultipleCode(Map<String, Object> params, Long issueId, int issueTableType) {
+ public IssueTableConfig addIssueTableConfig(Map<String, Object> params, Long issueTypeId, int issueTableType) {
String issueTableConfigs = MapUtil.getString(params, "issueTableConfigs");
- IssueTableConfig issueTableConfig = this.findByUserIdAndWorkspaceIdAndIssueIdAndIssueTableType(issueId, issueTableType);
- //IssueTableConfig saveIssueTableType = this.findByIssueIdAndIssueTableType(issueId,issueTableType);
+ IssueTableConfig issueTableConfig = this.findByUserIdAndWorkspaceIdAndIssueTypeIdAndIssueTableType(issueTypeId, issueTableType);
// �븘吏� �뀒�씠釉� 而щ읆 �꽕�젙�쓣 �븯吏� �븡�븯�쓣 寃쎌슦
if (issueTableConfig == null) {
@@ -53,18 +53,9 @@
User user = this.userService.getUser(this.webAppUtil.getLoginId());
issueTableConfig.setWorkspace(workspace);
issueTableConfig.setUser(user);
- issueTableConfig.setIssueId(issueId);
+ issueTableConfig.setIssueTypeId(issueTypeId);
issueTableConfig.setIssueTableType(issueTableType);
issueTableConfig.setIssueTableConfigs(issueTableConfigs);
- /*}else if(saveIssueTableType == null){
- issueTableConfig = new IssueTableConfig();
- Workspace workspace = this.workspaceService.getWorkspace(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
- User user = this.userService.getUser(this.webAppUtil.getLoginId());
- issueTableConfig.setWorkspace(workspace);
- issueTableConfig.setUser(user);
- issueTableConfig.setIssueId(issueId);
- issueTableConfig.setIssueTableType(issueTableType);
- issueTableConfig.setIssueTableConfigs(issueTableConfigs);*/
}else {
issueTableConfig.setIssueTableConfigs(issueTableConfigs);
}
@@ -75,76 +66,62 @@
@Override
@Transactional
public IssueTableConfig addIssueTableConfig(Map<String, Object> params) {
- issueId = (long) -1;
- issueTableType = 1;
- return this.addMultipleCode(params, issueId, issueTableType);
+ issueTypeId = MapUtil.getLong(params, "issueTypeId");
+ issueTableType = 1; //硫붿씤
+ return this.addIssueTableConfig(params, issueTypeId, issueTableType);
}
// �뿰愿� �씠�뒋 �뀒�씠釉� �꽕�젙 �젙蹂� ���옣
@Override
public IssueTableConfig addRelationIssueTableConfig(Map<String, Object> params) {
- issueId = MapUtil.getLong(params, "issueId");
- issueTableType = 2;
- return this.addMultipleCode(params, issueId, issueTableType);
+ issueTypeId = MapUtil.getLong(params, "issueTypeId");
+ issueTableType = 2; //�뿰愿�
+ return this.addIssueTableConfig(params, issueTypeId, issueTableType);
}
// �븯�쐞 �씠�뒋 �뀒�씠釉� �꽕�젙 �젙蹂� ���옣
@Override
public IssueTableConfig addDownIssueTableConfig(Map<String, Object> params) {
- issueId = MapUtil.getLong(params, "issueId");
- issueTableType = 3;
- return this.addMultipleCode(params, issueId, issueTableType);
+ issueTypeId = MapUtil.getLong(params, "issueTypeId");
+ issueTableType = 3; //�븯�쐞
+ return this.addIssueTableConfig(params, issueTypeId, issueTableType);
}
+
// �빐�떦 �뾽臾� 怨듦컙�뿉�꽌 �궗�슜�옄�쓽 �씠�뒋 �뀒�씠釉� �꽕�젙�쓣 議고쉶�븳�떎.
@Override
@Transactional(readOnly = true)
- public IssueTableConfig findByUserIdAndWorkspaceIdAndIssueIdAndIssueTableType(Long issueId, int issueTableType) {
- return this.issueTableConfigRepository.findByUserIdAndWorkspaceIdAndIssueIdAndIssueTableType(this.webAppUtil.getLoginId(),
- this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId(), issueId, issueTableType);
+ public IssueTableConfig findByUserIdAndWorkspaceIdAndIssueTypeIdAndIssueTableType(Long issueTypeId, int issueTableType) {
+ List<IssueTableConfig> issueTableConfigList = this.issueTableConfigRepository.findByUserIdAndWorkspaceIdAndIssueTypeIdAndIssueTableType(this.webAppUtil.getLoginId(),
+ this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId(), issueTypeId, issueTableType);
+
+ if (issueTableConfigList != null && issueTableConfigList.size() > 0) {
+ return issueTableConfigList.get(0);
+ }
+ return null;
}
- //�씠�뒋 Id�� IssueTableType 議고쉶
+ //�씠�뒋���엯 Id�� IssueTableType 議고쉶
@Override
@Transactional(readOnly = true)
- public IssueTableConfig findByIssueIdAndIssueTableType(Long issueId, int issueTableType) {
- return this.issueTableConfigRepository.findByIssueIdAndIssueTableType(issueId, issueTableType);
+ public IssueTableConfig findByIssueTypeIdAndIssueTableType(Long issueTypeId, int issueTableType) {
+ List<IssueTableConfig> issueTableConfigs = this.issueTableConfigRepository.findByIssueTypeIdAndIssueTableType(issueTypeId, issueTableType);
+ if (issueTableConfigs != null && issueTableConfigs.size() > 0){
+ return issueTableConfigs.get(0);
+ }
+ return null;
}
- // detail 以묐났 肄붾뱶 �젣嫄�
- private void detailMultipleCode(Map<String, Object> resJsonData, Long issueId, int issueTableType) {
- // �빐�떦 �뾽臾� 怨듦컙�뿉�꽌 �궗�슜�옄�쓽 �씠�뒋 寃��깋 議곌굔�쓣 議고쉶�븳�떎.
- IssueTableConfig issueTableConfig = this.findByUserIdAndWorkspaceIdAndIssueIdAndIssueTableType(issueId, issueTableType);
- IssueTableConfig saveIssueTableType = this.findByIssueIdAndIssueTableType(issueId,issueTableType);
+ @Override
+ public void detailIssueTableConfig(Map<String, Object> params, Map<String, Object> resJsonData) {
+ Long issueTypeId = MapUtil.getLong(params,"issueTypeId");
+ int issueTableType = MapUtil.getInteger(params,"issueTableType");
+
+ IssueTableConfig issueTableConfig = this.findByUserIdAndWorkspaceIdAndIssueTypeIdAndIssueTableType(issueTypeId, issueTableType);
if (issueTableConfig != null) {
- resJsonData.put(Constants.RES_KEY_CONTENTS, saveIssueTableType.getIssueTableConfigs());
+ resJsonData.put(Constants.RES_KEY_CONTENTS, issueTableConfig.getIssueTableConfigs());
}
else {
resJsonData.put(Constants.RES_KEY_CONTENTS, "");
}
}
-
- // ���옣�맂 �씠�뒋 �뀒�씠釉� �꽕�젙�쓣 議고쉶�븳�떎.
- @Override
- @Transactional(readOnly = true)
- public void detailIssueTableConfig(Map<String, Object> resJsonData) {
- issueId = (long) -1;
- issueTableType = 1;
- this.detailMultipleCode(resJsonData, issueId, issueTableType);
- }
- // ���옣�맂 �뿰愿� �씠�뒋 �뀒�씠釉� �꽕�젙 議고쉶
- @Override
- public void detailRelationIssueTableConfig(Map<String, Object> params, Map<String, Object> resJsonData) {
- issueTableType = 2;
- issueId = MapUtil.getLong(params, "issueId");
- this.detailMultipleCode(resJsonData, issueId, issueTableType);
- }
- // ���옣�맂 �븯�쐞 �씠�뒋 �뀒�씠釉� �꽕�젙 議고쉶
- @Override
- public void detailDownIssueTableConfig(Map<String, Object> params, Map<String, Object> resJsonData) {
- issueTableType = 3;
- issueId = MapUtil.getLong(params, "issueId");
- this.detailMultipleCode(resJsonData, issueId, issueTableType);
- }
-
-
}
--
Gitblit v1.8.0