From 1d25659a05d5bc4f500bd3fd63aa6d8375006d43 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 금, 03 12월 2021 20:11:11 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 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 84c62c8..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,12 +1,14 @@
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;
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.util.MapUtil;
+import kr.wisestone.owl.vo.IssueHostingVo;
import kr.wisestone.owl.web.condition.IssueCondition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -29,6 +31,9 @@
private HostingFieldService hostingFieldService;
@Autowired
+ private IssueHistoryService issueHistoryService;
+
+ @Autowired
private IssueHostingMapper issueHostingMapper;
@Override
@@ -45,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);
}
}
}
@@ -67,6 +89,4 @@
public List<Map<String, Object>> findInIssueIds(IssueCondition issueCondition) {
return issueHostingMapper.findInIssueIds(issueCondition);
}
-
-
}
--
Gitblit v1.8.0