From 07f4f6ad9592628ae6e0e77fdd4492b20af098fa Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 17 1월 2022 17:18:14 +0900
Subject: [PATCH] - 버그 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java | 145 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 134 insertions(+), 11 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 aa9ff25..c7ea8ac 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
@@ -1,12 +1,16 @@
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.*;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.util.MapUtil;
import kr.wisestone.owl.web.condition.IssueCondition;
+import kr.wisestone.owl.web.form.CompanyFieldForm;
+import kr.wisestone.owl.web.form.IspFieldForm;
+import kr.wisestone.owl.web.form.IssueForm;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +32,12 @@
private CompanyFieldService companyFieldService;
@Autowired
+ private CompanyFieldCategoryService companyFieldCategoryService;
+
+ @Autowired
+ private IssueHistoryService issueHistoryService;
+
+ @Autowired
private IssueCompanyMapper issueCompanyMapper;
@Override
@@ -35,28 +45,141 @@
return this.issueCompanyRepository;
}
+ /**
+ * �깉濡쒖슫 �뾽泥� 吏곸젒 異붽�
+ * @param issueForm IssueForm
+ * @param issue Issue
+ */
+ private void CreateCompanyField(IssueForm issueForm, Issue issue) {
+
+ CompanyFieldForm companyFieldForm = new CompanyFieldForm();
+ companyFieldForm.setName(issueForm.getCompanyName());
+ companyFieldForm.setEmail(issueForm.getCompanyEmail());
+ companyFieldForm.setUrl(issueForm.getCompanyUrl());
+ companyFieldForm.setManager(issueForm.getCompanyManager());
+ companyFieldForm.setTel(issueForm.getCompanyTel());
+ companyFieldForm.setMemo(issueForm.getCompanyMemo());
+ companyFieldForm.setCompanyTypeName(issueForm.getCompanyTypeName());
+ companyFieldForm.setParentSectorName(issueForm.getParentSectorName());
+ companyFieldForm.setChildSectorName(issueForm.getChildSectorName());
+ companyFieldForm.setRegionName(issueForm.getRegionName());
+ companyFieldForm.setStatusName(issueForm.getStatusName());
+
+ IssueCompany newIssueCompany = CreateIssueCompany(companyFieldForm, issue);
+ CompanyField companyField = new CompanyField();
+ StringBuilder sb = new StringBuilder();
+
+ // �궗�슜�옄媛� 吏곸젒 �엯�젰 �떆 COMPANY 紐⑸줉�뿉 異붽�
+ if (newIssueCompany.getCompanyField() == null) {
+ IssueCompany oldIssueCompany = this.issueCompanyRepository.findByIssueId(issue.getId());
+ companyField = this.companyFieldService.addCompany(companyFieldForm);
+ companyFieldForm.setId(companyField.getId());
+ if (oldIssueCompany != null) {
+ issueHistoryService.detectIssueCompany(IssueHistoryType.MODIFY, null, companyFieldForm, oldIssueCompany, sb);
+ this.issueCompanyRepository.deleteById(oldIssueCompany.getId());
+ } else {
+ newIssueCompany.setCompanyField(companyField);
+ issueHistoryService.detectIssueCompany(IssueHistoryType.ADD, null, companyFieldForm, newIssueCompany, sb);
+ }
+ }
+ // 異붽� �씠�젰
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ this.issueCompanyRepository.saveAndFlush(newIssueCompany);
+ }
+
+ /**
+ * �씠�뒋 Company 留뚮뱾湲�
+ * @param companyFieldForm CompanyFieldForm
+ * @param issue �씠�뒋
+ * @return issueCompany
+ */
+ private IssueCompany CreateIssueCompany(CompanyFieldForm companyFieldForm, Issue issue) {
+ IssueCompany issueCompany = ConvertUtil.copyProperties(companyFieldForm, IssueCompany.class);
+ issueCompany.setIssue(issue);
+ if (companyFieldForm.getId() != null && companyFieldForm.getId() != -1) {
+ CompanyField companyField = this.companyFieldService.getCompany(companyFieldForm.getId());
+ issueCompany.setCompanyField(companyField);
+ }
+ return issueCompany;
+ }
+
// �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �뾽泥� 媛믪쓣 �뾽�뜲�씠�듃�븳�떎.
@Override
@Transactional
- public void modifyIssueCompanyField(Issue issue, List<Map<String, Object>> issueCompanyFields) {
+ public void modifyIssueCompanyField(Issue issue, IssueForm issueForm) {
if (issue != null) {
+ StringBuilder sb = new StringBuilder();
+ IssueCompany issueCompany = this.issueCompanyRepository.findByIssueId(issue.getId());
+ List<Map<String, Object>> issueCompanyFields = issueForm.getIssueCompanyFields();
+
if (issueCompanyFields != null && issueCompanyFields.size() > 0) {
Map<String, Object> param = issueCompanyFields.get(0);
- if (param != null) {
- IssueCompany newIssueCompany = ConvertUtil.convertMapToClass(param, IssueCompany.class);
- newIssueCompany.setIssue(issue);
- CompanyField companyField = this.companyFieldService.getCompany(MapUtil.getLong(param, "companyId"));
- newIssueCompany.setCompanyField(companyField);
+ if (issueCompany != null) { //�닔�젙 �떆
+ // 蹂�寃� �씠�젰 癒쇱� �궓湲곌퀬 issueCompany�뿉 set�븯湲�
+ issueHistoryService.detectIssueCompany(IssueHistoryType.MODIFY, param, null, issueCompany, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+
+ 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"));
+ issueCompany.setCompanyTypeId(MapUtil.getLong(param, "companyTypeId"));
+ issueCompany.setParentSectorId(MapUtil.getLong(param, "parentSectorId"));
+ issueCompany.setChildSectorId(MapUtil.getLong(param, "childSectorId"));
+ issueCompany.setRegionId(MapUtil.getLong(param, "regionId"));
+ issueCompany.setStatusId(MapUtil.getLong(param, "statusId"));
- Set<IssueCompany> issueCompanies = issue.getIssueCompanies();
- if (issueCompanies != null && issueCompanies.size() > 0) {
- IssueCompany oldIssueCompany = issueCompanies.iterator().next();
- ConvertUtil.copyProperties(newIssueCompany, oldIssueCompany);
+ this.issueCompanyRepository.saveAndFlush(issueCompany);
+ } else { //異붽� �떆
+ CompanyFieldForm companyFieldForm = ConvertUtil.convertMapToClass(param, CompanyFieldForm.class);
+ companyFieldForm.setId(MapUtil.getLong(param, "companyId"));
+
+ IssueCompany newIssueCompany = CreateIssueCompany(companyFieldForm, issue);
+
+ CompanyFieldCategory companyType = this.companyFieldCategoryService.find(companyFieldForm.getCompanyTypeId());
+ if (companyType != null) {
+ companyFieldForm.setCompanyTypeName(companyType.getUseValue());
}
- this.issueCompanyRepository.saveAndFlush(newIssueCompany);
+ CompanyFieldCategory parentSector = this.companyFieldCategoryService.find(companyFieldForm.getParentSectorId());
+ if (parentSector != null) {
+ companyFieldForm.setParentSectorName(parentSector.getUseValue());
+ }
+ CompanyFieldCategory childSector = this.companyFieldCategoryService.find(companyFieldForm.getChildSectorId());
+ if (childSector != null) {
+ companyFieldForm.setChildSectorName(childSector.getUseValue());
+ }
+
+ CompanyFieldCategory region = this.companyFieldCategoryService.find(companyFieldForm.getRegionId());
+ if (region != null) {
+ companyFieldForm.setRegionName(region.getUseValue());
+ }
+
+ CompanyFieldCategory status = this.companyFieldCategoryService.find(companyFieldForm.getStatusId());
+ if (status != null) {
+ companyFieldForm.setStatusName(status.getUseValue());
+ }
+
+ // 異붽� �씠�젰
+ issueHistoryService.detectIssueCompany(IssueHistoryType.ADD, param, companyFieldForm, newIssueCompany, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ this.issueCompanyRepository.saveAndFlush(newIssueCompany);
+ }
+
+ } else if(issueForm.getCompanyName() != null && !issueForm.getCompanyName().equals("")) {
+ //�뾽泥댁젙蹂� 吏곸젒 異붽�
+ CreateCompanyField(issueForm, issue);
+ } else {
+ this.issueCompanyRepository.deleteByIssueId(issue.getId());
+ this.issueCompanyRepository.flush();
+
+ if (issueCompany != null) {
+ issueHistoryService.detectIssueCompany(IssueHistoryType.DELETE, null, null, issueCompany, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
}
}
}
--
Gitblit v1.8.0