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/IssueHostingServiceImpl.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 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 689d42b..9437299 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
@@ -46,18 +50,35 @@
Map<String, Object> param = issueIspFields.get(0);
if (param != null) {
- IssueHosting newIssueHosting = ConvertUtil.convertMapToClass(param, IssueHosting.class);
- newIssueHosting.setIssue(issue);
HostingField hostingField = this.hostingFieldService.getHosting(MapUtil.getLong(param, "hostingId"));
- newIssueHosting.setHostingField(hostingField);
Set<IssueHosting> issueHostings = issue.getIssueHostingFields();
- if (issueHostings != null && issueHostings.size() > 0) {
- IssueHosting oldIssueHosting = issueHostings.iterator().next();
- ConvertUtil.copyProperties(newIssueHosting, oldIssueHosting);
- }
+ IssueHosting issueHosting = null;
- this.issueHostingRepository.saveAndFlush(newIssueHosting);
+ 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.setManager(MapUtil.getString(param, "manager"));
+ issueHosting.setTel(MapUtil.getString(param, "tel"));
+ issueHosting.setMemo(MapUtil.getString(param, "memo"));
+ }else{//異붽� �븷 寃쎌슦
+ issueHosting = ConvertUtil.convertMapToClass(param, IssueHosting.class);
+ issueHosting.setIssue(issue);
+ 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);
}
}
}
--
Gitblit v1.8.0