From b2b8a75a8f5a35717bb89a07c2fe35ea16b6a99c Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 19 1월 2022 09:55:16 +0900
Subject: [PATCH] 이슈 히스토리 - 중복되어서 나오는 문제 해결 및 업체에 추가된 항목들도 변경 시 이력 남기도록 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java | 184 +++++++++++++++++++++++++--------------------
1 files changed, 102 insertions(+), 82 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 3e03fc3..08c1f04 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
@@ -560,7 +560,7 @@
Long companyFieldId = 0L;
Long id = 0L;
String name = "";
- /*String manager = "";
+ String manager = "";
String tel = "";
String email = "";
String memo = "";
@@ -573,32 +573,42 @@
String parentSectorName = "";
String childSectorName = "";
String regionName = "";
- String statusName = "";*/
+ String statusName = "";
if (param != null) {
id = MapUtil.getLong(param, "companyId");
name = MapUtil.getString(param, "name");
- /*manager = MapUtil.getString(param, "manager");
+ manager = MapUtil.getString(param, "manager");
tel = MapUtil.getString(param, "tel");
email = MapUtil.getString(param, "email");
memo = MapUtil.getString(param, "memo");
+ companyTypeId = MapUtil.getLong(param, "companyTypeId");
+ parentSectorId = MapUtil.getLong(param, "parentSectorId");
+ childSectorId = MapUtil.getLong(param, "childSectorId");
+ regionId = MapUtil.getLong(param, "regionId");
+ statusId = MapUtil.getLong(param, "statusId");
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");*/
+ statusName = MapUtil.getString(param, "statusName");
}else if(companyFieldForm != null) {
id = companyFieldForm.getId();
name = companyFieldForm.getName();
- /*manager = companyFieldForm.getManager();
+ manager = companyFieldForm.getManager();
tel = companyFieldForm.getTel();
email = companyFieldForm.getEmail();
memo = companyFieldForm.getMemo();
+ companyTypeId = companyFieldForm.getCompanyTypeId();
+ parentSectorId = companyFieldForm.getParentSectorId();
+ childSectorId = companyFieldForm.getChildSectorId();
+ regionId = companyFieldForm.getRegionId();
+ statusId = companyFieldForm.getStatusId();
companyTypeName = companyFieldForm.getCompanyTypeName();
parentSectorName = companyFieldForm.getParentSectorName();
childSectorName = companyFieldForm.getChildSectorName();
regionName = companyFieldForm.getRegionName();
- statusName = companyFieldForm.getStatusName();*/
+ statusName = companyFieldForm.getStatusName();
}
if (issueCompany.getCompanyField() != null && issueCompany.getCompanyField().getId() != null) {
companyFieldId = issueCompany.getCompanyField().getId();
@@ -611,43 +621,45 @@
if (id != null && !companyFieldId.equals(id)) {
description.append("<span translate=\"issue.issueCompanyModifyHistory\">�뾽泥� �젙蹂닿� 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
description.append("<span class=\"text-primary bold\"> > " + name + "</span>");
+ } else {
+ 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\"> > " + manager + "</span>");
+ }
+ 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\"> > " + tel + "</span>");
+ }
+ 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\"> > " + email + "</span>");
+ }
+ 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\"> > " + 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>");
+ }
}
- /*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\"> > " + manager + "</span>");
- }
- 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\"> > " + tel + "</span>");
- }
- 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\"> > " + email + "</span>");
- }
- 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\"> > " + 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>");
@@ -667,17 +679,17 @@
if (param != null) {
id = MapUtil.getLong(param, "ispId");
name = MapUtil.getString(param, "name");
- /*manager = MapUtil.getString(param, "manager");
+ manager = MapUtil.getString(param, "manager");
tel = MapUtil.getString(param, "tel");
email = MapUtil.getString(param, "email");
- memo = MapUtil.getString(param, "memo");*/
+ memo = MapUtil.getString(param, "memo");
}else if(ispFieldForm != null) {
id = ispFieldForm.getId();
name = ispFieldForm.getName();
- /*manager = ispFieldForm.getManager();
+ manager = ispFieldForm.getManager();
tel = ispFieldForm.getTel();
email = ispFieldForm.getEmail();
- memo = ispFieldForm.getMemo();*/
+ memo = ispFieldForm.getMemo();
}
if (issueIsp.getIspField() != null && issueIsp.getIspField().getId() != null) {
@@ -691,23 +703,24 @@
if (id != null && !ispFieldId.equals(id)) { //�닔�젙 �븷 寃쎌슦
description.append("<span translate=\"issue.issueIspModifyHistory\">ISP �젙蹂닿� 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
description.append("<span class=\"text-primary bold\"> > " + name + "</span>");
+ } else {
+ 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\"> > " + manager + "</span>");
+ }
+ 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\"> > " + tel + "</span>");
+ }
+ 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\"> > " + email + "</span>");
+ }
+ 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\"> > " + memo + "</span>");
+ }
}
- /*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\"> > " + manager + "</span>");
- }
- 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\"> > " + tel + "</span>");
- }
- 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\"> > " + email + "</span>");
- }
- 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\"> > " + 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>");
@@ -727,17 +740,17 @@
if (param != null) {
id = MapUtil.getLong(param, "hostingId");
name = MapUtil.getString(param, "name");
- /*manager = MapUtil.getString(param, "manager");
+ manager = MapUtil.getString(param, "manager");
tel = MapUtil.getString(param, "tel");
email = MapUtil.getString(param, "email");
- memo = MapUtil.getString(param, "memo");*/
+ memo = MapUtil.getString(param, "memo");
}else if(hostingFieldForm != null) {
id = hostingFieldForm.getId();
name = hostingFieldForm.getName();
- /*manager = hostingFieldForm.getManager();
+ manager = hostingFieldForm.getManager();
tel = hostingFieldForm.getTel();
email = hostingFieldForm.getEmail();
- memo = hostingFieldForm.getMemo();*/
+ memo = hostingFieldForm.getMemo();
}
if (issueHosting.getHostingField() != null && issueHosting.getHostingField().getId() != null) {
@@ -751,23 +764,24 @@
if(id != null && !hostingFieldId.equals(id)){ //�닔�젙 �븷 寃쎌슦
description.append("<span translate=\"issue.issueHostingModifyHistory\">�샇�뒪�똿 �젙蹂닿� 蹂�寃쎈릺�뿀�뒿�땲�떎. </span>");
description.append("<span class=\"text-primary bold\"> > " + name + "</span>");
+ } else {
+ 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\"> > " + manager + "</span>");
+ }
+ 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\"> > " + tel + "</span>");
+ }
+ 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\"> > " + email + "</span>");
+ }
+ 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\"> > " + memo + "</span>");
+ }
}
- /*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\"> > " + manager + "</span>");
- }
- 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\"> > " + tel + "</span>");
- }
- 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\"> > " + email + "</span>");
- }
- 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\"> > " + memo + "</span>");
- }*/
} else {
description.append("<span translate=\"issue.issueHostingRemoveHistory\">�샇�뒪�똿 �젙蹂닿� �궘�젣�릺�뿀�뒿�땲�떎. " + issueHosting.getHostingField().getName() + "</span>");
description.append("<span class=\"text-primary bold\"> > " + issueHosting.getHostingField().getName() + "</span>");
@@ -948,6 +962,12 @@
switch (customField.getCustomFieldType()) {
case INPUT :
case SINGLE_SELECT :
+ case NUMBER :
+ case DATETIME :
+ case IP_ADDRESS :
+ case EMAIL :
+ case SITE :
+ case TEL :
boolean existIssueCustomFieldValue = false;
for (IssueCustomFieldValue savedIssueCustomFieldValue : issue.getIssueCustomFieldValues()) {
--
Gitblit v1.8.0