From 43e894fc3c8d5c9b80883985a125705a59aaf00e Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 22 12월 2021 17:01:35 +0900
Subject: [PATCH] - 사용자정의필드 '필수데이터' UI 변경 - 이슈 목록에서 컬럼명 마우스 오버시 툴팁 나오도록 수정(tableConfig에 툴팁 설정)
---
src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
index 31af754..8bd2b6c 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
@@ -1,6 +1,7 @@
package kr.wisestone.owl.service.impl;
import kr.wisestone.owl.domain.*;
+import kr.wisestone.owl.domain.enumType.IssueHistoryType;
import kr.wisestone.owl.mapper.HostingFieldMapper;
import kr.wisestone.owl.mapper.IssueHostingMapper;
import kr.wisestone.owl.repository.IssueHostingRepository;
@@ -30,6 +31,9 @@
private HostingFieldService hostingFieldService;
@Autowired
+ private IssueHistoryService issueHistoryService;
+
+ @Autowired
private IssueHostingMapper issueHostingMapper;
@Override
@@ -45,30 +49,41 @@
if (issueIspFields != null && issueIspFields.size() > 0) {
Map<String, Object> param = issueIspFields.get(0);
- if (param != null) {
+ if (param != null && param.get("hostingId") != null && param.get("hostingId") != "") {
HostingField hostingField = this.hostingFieldService.getHosting(MapUtil.getLong(param, "hostingId"));
Set<IssueHosting> issueHostings = issue.getIssueHostingFields();
- if (issueHostings != null && issueHostings.size() >0){
- IssueHosting issueHosting = issueHostings.iterator().next();
+ IssueHosting issueHosting = new IssueHosting();
+
+ if (issueHostings != null && issueHostings.size() >0){//�닔�젙 �븷 寃쎌슦
+ issueHosting = issueHostings.iterator().next();
+ // 蹂�寃� �씠�젰
+ StringBuilder sb = new StringBuilder();
+ issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, issueHosting, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
issueHosting.setHostingField(hostingField);
issueHosting.setName(MapUtil.getString(param, "name"));
issueHosting.setEmail(MapUtil.getString(param, "email"));
issueHosting.setCode(MapUtil.getString(param, "code"));
+ issueHosting.setUrl(MapUtil.getString(param, "url"));
issueHosting.setManager(MapUtil.getString(param, "manager"));
issueHosting.setTel(MapUtil.getString(param, "tel"));
issueHosting.setMemo(MapUtil.getString(param, "memo"));
-
- this.issueHostingRepository.saveAndFlush(issueHosting);
- }else{
- IssueHosting newIssueHosting = ConvertUtil.convertMapToClass(param, IssueHosting.class);
- newIssueHosting.setIssue(issue);
- newIssueHosting.setHostingField(hostingField);
-
- this.issueHostingRepository.saveAndFlush(newIssueHosting);
+ }else{//異붽� �븷 寃쎌슦
+ issueHosting = ConvertUtil.convertMapToClass(param, IssueHosting.class);
+ issueHosting.setIssue(issue);
+ if (hostingField != null) {
+ issueHosting.setHostingField(hostingField);
+ }
+ // 異붽� �씠�젰
+ StringBuilder sb = new StringBuilder();
+ issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, issueHosting, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
}
-
+ this.issueHostingRepository.saveAndFlush(issueHosting);
+ }else {
+ this.issueHostingRepository.deleteById(MapUtil.getLong(param, "id"));
}
}
}
--
Gitblit v1.8.0