From 41c8f3c976c0d8ec4b0a6ad3d7f4ce90a9de03c7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 25 11월 2021 21:19:22 +0900
Subject: [PATCH] 프로젝트 담당부서 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java | 48 +++++++++++++++++++++++++++++++-----------------
1 files changed, 31 insertions(+), 17 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 c4a3bc4..7712b2d 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java
@@ -32,9 +32,6 @@
@Autowired
private UserService userService;
- @Autowired
- private IssueTableConfigService issueTableConfigService;
-
@Override
protected JpaRepository<IssueTableConfig, Long> getRepository() {
return this.issueTableConfigRepository;
@@ -46,8 +43,8 @@
// add 以묐났肄붾뱶 �젣嫄�
public IssueTableConfig addMultipleCode(Map<String, Object> params, Long issueId, int issueTableType) {
String issueTableConfigs = MapUtil.getString(params, "issueTableConfigs");
- IssueTableConfig issueTableConfig = this.findByUserIdAndWorkspaceId();
- IssueTableConfig saveIssueTableType = this.findByIssueIdAndIssueTableType(issueId,issueTableType);
+ IssueTableConfig issueTableConfig = this.findByUserIdAndWorkspaceIdAndIssueIdAndIssueTableType(issueId, issueTableType);
+ //IssueTableConfig saveIssueTableType = this.findByIssueIdAndIssueTableType(issueId,issueTableType);
// �븘吏� �뀒�씠釉� 而щ읆 �꽕�젙�쓣 �븯吏� �븡�븯�쓣 寃쎌슦
if (issueTableConfig == null) {
@@ -56,12 +53,19 @@
User user = this.userService.getUser(this.webAppUtil.getLoginId());
issueTableConfig.setWorkspace(workspace);
issueTableConfig.setUser(user);
- issueTableConfig.setIssueTableConfigs(issueTableConfigs);
- }else if(saveIssueTableType == null){
issueTableConfig.setIssueId(issueId);
issueTableConfig.setIssueTableType(issueTableType);
issueTableConfig.setIssueTableConfigs(issueTableConfigs);
- }else{
+ /*}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);
}
return this.issueTableConfigRepository.saveAndFlush(issueTableConfig);
@@ -93,9 +97,9 @@
// �빐�떦 �뾽臾� 怨듦컙�뿉�꽌 �궗�슜�옄�쓽 �씠�뒋 �뀒�씠釉� �꽕�젙�쓣 議고쉶�븳�떎.
@Override
@Transactional(readOnly = true)
- public IssueTableConfig findByUserIdAndWorkspaceId() {
- return this.issueTableConfigRepository.findByUserIdAndWorkspaceId(this.webAppUtil.getLoginId(),
- this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+ public IssueTableConfig findByUserIdAndWorkspaceIdAndIssueIdAndIssueTableType(Long issueId, int issueTableType) {
+ return this.issueTableConfigRepository.findByUserIdAndWorkspaceIdAndIssueIdAndIssueTableType(this.webAppUtil.getLoginId(),
+ this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId(), issueId, issueTableType);
}
//�씠�뒋 Id�� IssueTableType 議고쉶
@@ -108,10 +112,9 @@
// detail 以묐났 肄붾뱶 �젣嫄�
private void detailMultipleCode(Map<String, Object> resJsonData, Long issueId, int issueTableType) {
// �빐�떦 �뾽臾� 怨듦컙�뿉�꽌 �궗�슜�옄�쓽 �씠�뒋 寃��깋 議곌굔�쓣 議고쉶�븳�떎.
- IssueTableConfig issueTableConfig = this.findByUserIdAndWorkspaceId();
- IssueTableConfig saveIssueTableType = this.findByIssueIdAndIssueTableType(issueId,issueTableType);
+ IssueTableConfig issueTableConfig = this.findByUserIdAndWorkspaceIdAndIssueIdAndIssueTableType(issueId, issueTableType);
- if (issueTableConfig != null && saveIssueTableType != null) {
+ if (issueTableConfig != null) {
resJsonData.put(Constants.RES_KEY_CONTENTS, issueTableConfig.getIssueTableConfigs());
}
else {
@@ -125,20 +128,31 @@
public void detailIssueTableConfig(Map<String, Object> resJsonData) {
issueId = (long) -1;
issueTableType = 1;
- this.detailMultipleCode(resJsonData, issueId, issueTableType);
+ // �빐�떦 �뾽臾� 怨듦컙�뿉�꽌 �궗�슜�옄�쓽 �씠�뒋 寃��깋 議곌굔�쓣 議고쉶�븳�떎.
+ IssueTableConfig issueTableConfig = this.findByUserIdAndWorkspaceIdAndIssueIdAndIssueTableType(issueId, issueTableType);
+
+ if (issueTableConfig != null) {
+ resJsonData.put(Constants.RES_KEY_CONTENTS, issueTableConfig.getIssueTableConfigs());
+ }
+ else {
+ resJsonData.put(Constants.RES_KEY_CONTENTS, "");
+ }
}
// ���옣�맂 �뿰愿� �씠�뒋 �뀒�씠釉� �꽕�젙 議고쉶
@Override
- public void detailRelationIssueTableConfig(Long issueId, Map<String, Object> resJsonData) {
+ 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(Long issueId, Map<String, Object> resJsonData) {
+ 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