From 9f30425f290c710a12b95d98a7f67ec66016b470 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 17 1월 2022 12:57:23 +0900
Subject: [PATCH] - 이슈 추가,수정 시 이력 남기는 부분 코드 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java | 182 ++++++++++++++++++++++++++++++++++----------
1 files changed, 139 insertions(+), 43 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
index 8753a2e..3e03fc3 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
@@ -16,8 +16,7 @@
import kr.wisestone.owl.vo.IssueHistoryVo;
import kr.wisestone.owl.vo.IssueVo;
import kr.wisestone.owl.web.condition.IssueHistoryCondition;
-import kr.wisestone.owl.web.form.EmailTemplateForm;
-import kr.wisestone.owl.web.form.IssueForm;
+import kr.wisestone.owl.web.form.*;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -557,14 +556,53 @@
// �뾽泥� �젙蹂� 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
@Override
- public void detectIssueCompany(IssueHistoryType type, Map<String, Object> param, CompanyField companyField, IssueCompany issueCompany, StringBuilder description) {
+ public void detectIssueCompany(IssueHistoryType type, Map<String, Object> param, CompanyFieldForm companyFieldForm, IssueCompany issueCompany, StringBuilder description) {
+ Long companyFieldId = 0L;
Long id = 0L;
+ String name = "";
+ /*String manager = "";
+ String tel = "";
+ String email = "";
+ String memo = "";
+ Long companyTypeId = 0L;
+ Long parentSectorId = 0L;
+ Long childSectorId = 0L;
+ Long regionId = 0L;
+ Long statusId = 0L;
+ String companyTypeName = "";
+ String parentSectorName = "";
+ String childSectorName = "";
+ String regionName = "";
+ String statusName = "";*/
+
if (param != null) {
id = MapUtil.getLong(param, "companyId");
- }else if(companyField != null) {
- id = companyField.getId();
+ name = MapUtil.getString(param, "name");
+ /*manager = MapUtil.getString(param, "manager");
+ tel = MapUtil.getString(param, "tel");
+ email = MapUtil.getString(param, "email");
+ memo = MapUtil.getString(param, "memo");
+ companyTypeName = MapUtil.getString(param, "companyTypeName");
+ parentSectorName = MapUtil.getString(param, "parentSectorName");
+ childSectorName = MapUtil.getString(param, "childSectorName");
+ regionName = MapUtil.getString(param, "regionName");
+ statusName = MapUtil.getString(param, "statusName");*/
+ }else if(companyFieldForm != null) {
+ id = companyFieldForm.getId();
+ name = companyFieldForm.getName();
+ /*manager = companyFieldForm.getManager();
+ tel = companyFieldForm.getTel();
+ email = companyFieldForm.getEmail();
+ memo = companyFieldForm.getMemo();
+ companyTypeName = companyFieldForm.getCompanyTypeName();
+ parentSectorName = companyFieldForm.getParentSectorName();
+ childSectorName = companyFieldForm.getChildSectorName();
+ regionName = companyFieldForm.getRegionName();
+ statusName = companyFieldForm.getStatusName();*/
}
- Long companyFieldId = issueCompany.getCompanyField().getId();
+ if (issueCompany.getCompanyField() != null && issueCompany.getCompanyField().getId() != null) {
+ companyFieldId = issueCompany.getCompanyField().getId();
+ }
if (type == IssueHistoryType.ADD) { //異붽� �븷 寃쎌슦
description.append("<span translate=\"issue.issueCompanyAddHistory\">�뾽泥� �젙蹂닿� 異붽��릺�뿀�뒿�땲�떎. </span>");
@@ -572,24 +610,44 @@
} else if (type == IssueHistoryType.MODIFY) { //�닔�젙 �븷 寃쎌슦
if (id != null && !companyFieldId.equals(id)) {
description.append("<span translate=\"issue.issueCompanyModifyHistory\">�뾽泥� �젙蹂닿� 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
- description.append("<span class=\"text-primary bold\"> > " + param.get("name") + "</span>");
+ description.append("<span class=\"text-primary bold\"> > " + name + "</span>");
}
- if (companyFieldId.equals(id) && param.get("manager") != null && (issueCompany.getManager() == null || !issueCompany.getManager().equals(param.get("manager")))) {
+ /*if (companyFieldId.equals(id) && manager != null && (issueCompany.getManager() == null || !issueCompany.getManager().equals(manager))) {
description.append("<span translate=\"issue.issueCompanyModifyManagerHistory\"> > �뾽泥� �젙蹂댁쓽 �떞�떦�옄媛� 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
- description.append("<span class=\"text-primary bold\"> > " + param.get("manager") + "</span>");
+ description.append("<span class=\"text-primary bold\"> > " + manager + "</span>");
}
- if (companyFieldId.equals(id) && param.get("tel") != null && (issueCompany.getTel() == null || !issueCompany.getTel().equals(param.get("tel")))) {
+ if (companyFieldId.equals(id) && tel != null && (issueCompany.getTel() == null || !issueCompany.getTel().equals(tel))) {
description.append("<span translate=\"issue.issueCompanyModifyTelHistory\"> > �뾽泥� �젙蹂댁쓽 �쟾�솕踰덊샇媛� 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
- description.append("<span class=\"text-primary bold\"> > " + param.get("tel") + "</span>");
+ description.append("<span class=\"text-primary bold\"> > " + tel + "</span>");
}
- if (companyFieldId.equals(id) && param.get("email") != null && (issueCompany.getEmail() == null || !issueCompany.getEmail().equals(param.get("email")))) {
+ if (companyFieldId.equals(id) && email != null && (issueCompany.getEmail() == null || !issueCompany.getEmail().equals(email))) {
description.append("<span translate=\"issue.issueCompanyModifyEmailHistory\"> > �뾽泥� �젙蹂댁쓽 �씠硫붿씪�씠 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
- description.append("<span class=\"text-primary bold\"> > " + param.get("email") + "</span>");
+ description.append("<span class=\"text-primary bold\"> > " + email + "</span>");
}
- if (companyFieldId.equals(id) && param.get("memo") != null && (issueCompany.getMemo() == null || !issueCompany.getMemo().equals(param.get("memo")))) {
+ if (companyFieldId.equals(id) && memo != null && (issueCompany.getMemo() == null || !issueCompany.getMemo().equals(memo))) {
description.append("<span translate=\"issue.issueCompanyModifyMemoHistory\"> > �뾽泥� �젙蹂댁쓽 鍮꾧퀬媛� 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
- description.append("<span class=\"text-primary bold\"> > " + param.get("memo") + "</span>");
+ description.append("<span class=\"text-primary bold\"> > " + memo + "</span>");
}
+ if (companyFieldId.equals(id) && companyTypeName != null && (issueCompany.getCompanyTypeId() == null || !issueCompany.getCompanyTypeId().equals(companyTypeId))) {
+ description.append("<span translate=\"issue.issueCompanyModifyCompanyTypeHistory\"> > �뾽泥� �젙蹂댁쓽 湲곗뾽援щ텇�씠 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
+ description.append("<span class=\"text-primary bold\"> > " + companyTypeName + "</span>");
+ }
+ if (companyFieldId.equals(id) && parentSectorName != null && (issueCompany.getParentSectorId() == null || !issueCompany.getParentSectorId().equals(parentSectorId))) {
+ description.append("<span translate=\"issue.issueCompanyModifyParentSectorHistory\"> > �뾽泥� �젙蹂댁쓽 �뾽醫�(��遺꾨쪟)�씠 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
+ description.append("<span class=\"text-primary bold\"> > " + parentSectorName + "</span>");
+ }
+ if (companyFieldId.equals(id) && childSectorName != null && (issueCompany.getChildSectorId() == null || !issueCompany.getChildSectorId().equals(childSectorId))) {
+ description.append("<span translate=\"issue.issueCompanyModifyChildSectorHistory\"> > �뾽泥� �젙蹂댁쓽 �뾽醫�(以묐텇瑜�)�씠 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
+ description.append("<span class=\"text-primary bold\"> > " + childSectorName + "</span>");
+ }
+ if (companyFieldId.equals(id) && statusName != null && (issueCompany.getStatusId() == null || !issueCompany.getStatusId().equals(statusId))) {
+ description.append("<span translate=\"issue.issueCompanyModifyStatusHistory\"> > �뾽泥� �젙蹂댁쓽 �긽�깭媛� 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
+ description.append("<span class=\"text-primary bold\"> > " + statusName + "</span>");
+ }
+ if (companyFieldId.equals(id) && regionName != null && (issueCompany.getRegionId() == null || !issueCompany.getRegionId().equals(regionId))) {
+ description.append("<span translate=\"issue.issueCompanyModifyRegionHistory\"> > �뾽泥� �젙蹂댁쓽 吏��뿭�씠 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
+ description.append("<span class=\"text-primary bold\"> > " + regionName + "</span>");
+ }*/
} else {
description.append("<span translate=\"issue.issueCompanyRemoveHistory\">�뾽泥� �젙蹂닿� �궘�젣�릺�뿀�뒿�땲�떎. " + issueCompany.getCompanyField().getName() + "</span>");
description.append("<span class=\"text-primary bold\"> > " + issueCompany.getCompanyField().getName() + "</span>");
@@ -598,14 +656,33 @@
// ISP �젙蹂� 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
@Override
- public void detectIssueIsp(IssueHistoryType type, Map<String, Object> param, IspField ispField, IssueIsp issueIsp, StringBuilder description) {
+ public void detectIssueIsp(IssueHistoryType type, Map<String, Object> param, IspFieldForm ispFieldForm, IssueIsp issueIsp, StringBuilder description) {
+ Long ispFieldId = 0L;
Long id = 0L;
+ String name = "";
+ String manager = "";
+ String tel = "";
+ String email = "";
+ String memo = "";
if (param != null) {
id = MapUtil.getLong(param, "ispId");
- } else if(ispField != null) {
- id = ispField.getId();
+ name = MapUtil.getString(param, "name");
+ /*manager = MapUtil.getString(param, "manager");
+ tel = MapUtil.getString(param, "tel");
+ email = MapUtil.getString(param, "email");
+ memo = MapUtil.getString(param, "memo");*/
+ }else if(ispFieldForm != null) {
+ id = ispFieldForm.getId();
+ name = ispFieldForm.getName();
+ /*manager = ispFieldForm.getManager();
+ tel = ispFieldForm.getTel();
+ email = ispFieldForm.getEmail();
+ memo = ispFieldForm.getMemo();*/
}
- Long ispFieldId = issueIsp.getIspField().getId();
+
+ if (issueIsp.getIspField() != null && issueIsp.getIspField().getId() != null) {
+ ispFieldId = issueIsp.getIspField().getId();
+ }
if (type == IssueHistoryType.ADD) {
description.append("<span translate=\"issue.issueIspAddHistory\">ISP �젙蹂닿� 異붽��릺�뿀�뒿�땲�떎. </span>");
@@ -613,24 +690,24 @@
} else if (type == IssueHistoryType.MODIFY) {
if (id != null && !ispFieldId.equals(id)) { //�닔�젙 �븷 寃쎌슦
description.append("<span translate=\"issue.issueIspModifyHistory\">ISP �젙蹂닿� 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
- description.append("<span class=\"text-primary bold\"> > " + param.get("name") + "</span>");
+ description.append("<span class=\"text-primary bold\"> > " + name + "</span>");
}
- if (ispFieldId.equals(id) && param.get("manager") != null && (issueIsp.getManager() == null || !issueIsp.getManager().equals(param.get("manager")))) {
+ /*if (ispFieldId.equals(id) && manager != null && (issueIsp.getManager() == null || !issueIsp.getManager().equals(manager))) {
description.append("<span translate=\"issue.issueIspModifyManagerHistory\">ISP �젙蹂댁쓽 �떞�떦�옄媛� 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
- description.append("<span class=\"text-primary bold\"> > " + param.get("manager") + "</span>");
+ description.append("<span class=\"text-primary bold\"> > " + manager + "</span>");
}
- if (ispFieldId.equals(id) && param.get("tel") != null && (issueIsp.getTel() == null || !issueIsp.getTel().equals(param.get("tel")))) {
+ if (ispFieldId.equals(id) && tel != null && (issueIsp.getTel() == null || !issueIsp.getTel().equals(tel))) {
description.append("<span translate=\"issue.issueIspModifyTelHistory\">ISP �젙蹂댁쓽 �쟾�솕踰덊샇媛� 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
- description.append("<span class=\"text-primary bold\"> > " + param.get("tel") + "</span>");
+ description.append("<span class=\"text-primary bold\"> > " + tel + "</span>");
}
- if (ispFieldId.equals(id) && param.get("email") != null && (issueIsp.getEmail() == null || !issueIsp.getEmail().equals(param.get("email")))) {
+ if (ispFieldId.equals(id) && email != null && (issueIsp.getEmail() == null || !issueIsp.getEmail().equals(email))) {
description.append("<span translate=\"issue.issueIspModifyEmailHistory\">ISP �젙蹂댁쓽 �씠硫붿씪�씠 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
- description.append("<span class=\"text-primary bold\"> > " + param.get("email") + "</span>");
+ description.append("<span class=\"text-primary bold\"> > " + email + "</span>");
}
- if (ispFieldId.equals(id) && param.get("memo") != null && (issueIsp.getMemo() == null || !issueIsp.getMemo().equals(param.get("memo")))) {
+ if (ispFieldId.equals(id) && memo != null && (issueIsp.getMemo() == null || !issueIsp.getMemo().equals(memo))) {
description.append("<span translate=\"issue.issueIspModifyMemoHistory\">ISP �젙蹂댁쓽 鍮꾧퀬媛� 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
- description.append("<span class=\"text-primary bold\"> > " + param.get("memo") + "</span>");
- }
+ description.append("<span class=\"text-primary bold\"> > " + memo + "</span>");
+ }*/
} else {
description.append("<span translate=\"issue.issueIspRemoveHistory\">ISP �젙蹂닿� �궘�젣�릺�뿀�뒿�땲�떎. " + issueIsp.getIspField().getName() + "</span>");
description.append("<span class=\"text-primary bold\"> > " + issueIsp.getIspField().getName() + "</span>");
@@ -639,14 +716,33 @@
// �샇�뒪�똿 �젙蹂� 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
@Override
- public void detectIssueHosting(IssueHistoryType type, Map<String, Object> param, HostingField hostingField, IssueHosting issueHosting, StringBuilder description) {
+ public void detectIssueHosting(IssueHistoryType type, Map<String, Object> param, HostingFieldForm hostingFieldForm, IssueHosting issueHosting, StringBuilder description) {
+ Long hostingFieldId = 0L;
Long id = 0L;
+ String name = "";
+ String manager = "";
+ String tel = "";
+ String email = "";
+ String memo = "";
if (param != null) {
id = MapUtil.getLong(param, "hostingId");
- }else if(hostingField != null) {
- id = hostingField.getId();
+ name = MapUtil.getString(param, "name");
+ /*manager = MapUtil.getString(param, "manager");
+ tel = MapUtil.getString(param, "tel");
+ email = MapUtil.getString(param, "email");
+ memo = MapUtil.getString(param, "memo");*/
+ }else if(hostingFieldForm != null) {
+ id = hostingFieldForm.getId();
+ name = hostingFieldForm.getName();
+ /*manager = hostingFieldForm.getManager();
+ tel = hostingFieldForm.getTel();
+ email = hostingFieldForm.getEmail();
+ memo = hostingFieldForm.getMemo();*/
}
- Long hostingFieldId = issueHosting.getHostingField().getId();
+
+ if (issueHosting.getHostingField() != null && issueHosting.getHostingField().getId() != null) {
+ hostingFieldId = issueHosting.getHostingField().getId();
+ }
if (type == IssueHistoryType.ADD) {
description.append("<span translate=\"issue.issueHostingAddHistory\">�샇�뒪�똿 �젙蹂닿� 異붽��릺�뿀�뒿�땲�떎. </span>");
@@ -654,24 +750,24 @@
}else if(type == IssueHistoryType.MODIFY){
if(id != null && !hostingFieldId.equals(id)){ //�닔�젙 �븷 寃쎌슦
description.append("<span translate=\"issue.issueHostingModifyHistory\">�샇�뒪�똿 �젙蹂닿� 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
- description.append("<span class=\"text-primary bold\"> > " + param.get("name") + "</span>");
+ description.append("<span class=\"text-primary bold\"> > " + name + "</span>");
}
- if(hostingFieldId.equals(id) && param.get("manager") != null && (issueHosting.getManager() == null || !issueHosting.getManager().equals(param.get("manager")))){
+ /*if(hostingFieldId.equals(id) && manager != null && (issueHosting.getManager() == null || !issueHosting.getManager().equals(manager))){
description.append("<span translate=\"issue.issueHostingModifyManagerHistory\">�샇�뒪�똿 �젙蹂댁쓽 �떞�떦�옄媛� 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
- description.append("<span class=\"text-primary bold\"> > " + param.get("manager") + "</span>");
+ description.append("<span class=\"text-primary bold\"> > " + manager + "</span>");
}
- if(hostingFieldId.equals(id) && param.get("tel") != null && (issueHosting.getTel() == null || !issueHosting.getTel().equals(param.get("tel")))){
+ if(hostingFieldId.equals(id) && tel != null && (issueHosting.getTel() == null || !issueHosting.getTel().equals(tel))){
description.append("<span translate=\"issue.issueHostingModifyTelHistory\">�샇�뒪�똿 �젙蹂댁쓽 �쟾�솕踰덊샇媛� 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
- description.append("<span class=\"text-primary bold\"> > " + param.get("tel") + "</span>");
+ description.append("<span class=\"text-primary bold\"> > " + tel + "</span>");
}
- if(hostingFieldId.equals(id) && param.get("email") != null && (issueHosting.getEmail() == null || !issueHosting.getEmail().equals(param.get("email")))){
+ if(hostingFieldId.equals(id) && email != null && (issueHosting.getEmail() == null || !issueHosting.getEmail().equals(email))){
description.append("<span translate=\"issue.issueHostingModifyEmailHistory\">�샇�뒪�똿 �젙蹂댁쓽 �씠硫붿씪�씠 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
- description.append("<span class=\"text-primary bold\"> > " + param.get("email") + "</span>");
+ description.append("<span class=\"text-primary bold\"> > " + email + "</span>");
}
- if(hostingFieldId.equals(id) && param.get("memo") != null && (issueHosting.getMemo() == null || !issueHosting.getMemo().equals(param.get("memo")))){
+ if(hostingFieldId.equals(id) && memo != null && (issueHosting.getMemo() == null || !issueHosting.getMemo().equals(memo))){
description.append("<span translate=\"issue.issueHostingModifyMemoHistory\">�샇�뒪�똿 �젙蹂댁쓽 鍮꾧퀬媛� 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
- description.append("<span class=\"text-primary bold\"> > " + param.get("memo") + "</span>");
- }
+ description.append("<span class=\"text-primary bold\"> > " + memo + "</span>");
+ }*/
} else {
description.append("<span translate=\"issue.issueHostingRemoveHistory\">�샇�뒪�똿 �젙蹂닿� �궘�젣�릺�뿀�뒿�땲�떎. " + issueHosting.getHostingField().getName() + "</span>");
description.append("<span class=\"text-primary bold\"> > " + issueHosting.getHostingField().getName() + "</span>");
--
Gitblit v1.8.0