From a10e636ebdc765b6ebceb0e1fbc6ee2e17037f4c Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 22 12월 2021 18:00:22 +0900
Subject: [PATCH] 이슈 리스트 정렬 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
index 2b7f339..7ea2290 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.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.IssueIspMapper;
import kr.wisestone.owl.repository.IssueIspRepository;
import kr.wisestone.owl.service.*;
@@ -28,6 +29,9 @@
private IspFieldService ispFieldService;
@Autowired
+ private IssueHistoryService issueHistoryService;
+
+ @Autowired
private IssueIspMapper issueIspMapper;
@Override
@@ -43,27 +47,41 @@
if (issueIspFields != null && issueIspFields.size() > 0) {
Map<String, Object> param = issueIspFields.get(0);
- if (param != null) {
+ if (param != null && param.get("ispId") != null && param.get("ispId") != "") {
IspField ispField = this.ispFieldService.getIsp(MapUtil.getLong(param, "ispId"));
Set<IssueIsp> issueIsps = issue.getIssueIspFields();
- IssueIsp issueIsp = null;
+ IssueIsp issueIsp = new IssueIsp();
if (issueIsps != null && issueIsps.size() > 0) {//�닔�젙 �븷 寃쎌슦
issueIsp = issueIsps.iterator().next();
+ // 蹂�寃� �씠�젰
+ StringBuilder sb = new StringBuilder();
+ issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, issueIsp, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+
issueIsp.setIspField(ispField);
issueIsp.setName(MapUtil.getString(param, "name"));
issueIsp.setEmail(MapUtil.getString(param, "email"));
issueIsp.setCode(MapUtil.getString(param, "code"));
+ issueIsp.setUrl(MapUtil.getString(param, "url"));
issueIsp.setManager(MapUtil.getString(param, "manager"));
issueIsp.setTel(MapUtil.getString(param, "tel"));
issueIsp.setMemo(MapUtil.getString(param, "memo"));
} else {//異붽� �븷 寃쎌슦
issueIsp = ConvertUtil.convertMapToClass(param, IssueIsp.class);
issueIsp.setIssue(issue);
- issueIsp.setIspField(ispField);
+ if (ispField != null) {
+ issueIsp.setIspField(ispField);
+ }
+ // 異붽� �씠�젰
+ StringBuilder sb = new StringBuilder();
+ issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, issueIsp, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
}
this.issueIspRepository.saveAndFlush(issueIsp);
+ }else {
+ this.issueIspRepository.deleteById(MapUtil.getLong(param, "id"));
}
}
}
--
Gitblit v1.8.0