From f9e3bfcf3f27bb1e270c3a79f7c958443e1dd13f Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 21 12월 2021 11:04:15 +0900
Subject: [PATCH] 이슈 리스트 컬럼 정렬 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
index 4b16e2c..54e03d3 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.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.IssueCompanyMapper;
import kr.wisestone.owl.repository.IssueCompanyRepository;
import kr.wisestone.owl.service.*;
@@ -28,6 +29,9 @@
private CompanyFieldService companyFieldService;
@Autowired
+ private IssueHistoryService issueHistoryService;
+
+ @Autowired
private IssueCompanyMapper issueCompanyMapper;
@Override
@@ -43,28 +47,39 @@
if (issueCompanyFields != null && issueCompanyFields.size() > 0) {
Map<String, Object> param = issueCompanyFields.get(0);
- if (param != null) {
- CompanyField companyField = this.companyFieldService.getCompany(MapUtil.getLong(param, "companyId"));
+ if (param != null && param.get("companyId") != null && param.get("companyId") != "") {
+ CompanyField companyField = this.companyFieldService.getCompany(MapUtil.getLong(param, "companyId")); //companyId 媛��졇�삤湲�
Set<IssueCompany> issueCompanies = issue.getIssueCompanies();
- if (issueCompanies != null && issueCompanies.size() > 0) {
- IssueCompany issueCompany = issueCompanies.iterator().next();
+ IssueCompany issueCompany = null;
+ if (issueCompanies != null && issueCompanies.size() > 0) { //�닔�젙 �븷 寃쎌슦
+ issueCompany = issueCompanies.iterator().next();
+ // 蹂�寃� �씠�젰
+ StringBuilder sb = new StringBuilder();
+ issueHistoryService.detectIssueCompany(IssueHistoryType.MODIFY, param, issueCompany, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+
issueCompany.setCompanyField(companyField);
issueCompany.setName(MapUtil.getString(param, "name"));
issueCompany.setEmail(MapUtil.getString(param, "email"));
+ issueCompany.setUrl(MapUtil.getString(param, "url"));
issueCompany.setManager(MapUtil.getString(param, "manager"));
issueCompany.setTel(MapUtil.getString(param, "tel"));
issueCompany.setMemo(MapUtil.getString(param, "memo"));
-
- this.issueCompanyRepository.saveAndFlush(issueCompany);
-
- } else {
- IssueCompany newIssueCompany = ConvertUtil.convertMapToClass(param, IssueCompany.class);
- newIssueCompany.setIssue(issue);
- newIssueCompany.setCompanyField(companyField);
-
- this.issueCompanyRepository.saveAndFlush(newIssueCompany);
+ } else { //異붽� �븷 寃쎌슦
+ issueCompany = ConvertUtil.convertMapToClass(param, IssueCompany.class);
+ issueCompany.setIssue(issue);
+ if (companyField != null) {
+ issueCompany.setCompanyField(companyField);
+ }
+ // 異붽� �씠�젰
+ StringBuilder sb = new StringBuilder();
+ issueHistoryService.detectIssueCompany(IssueHistoryType.ADD, param, issueCompany, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
}
+ this.issueCompanyRepository.saveAndFlush(issueCompany);
+ } else {
+ this.issueCompanyRepository.deleteById(MapUtil.getLong(param, "id"));
}
}
}
--
Gitblit v1.8.0