From 9c879ab12134cb6841edefeff2ce948ad27d8680 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 화, 28 12월 2021 14:18:05 +0900
Subject: [PATCH] - prod 설정파일 수정 => 스케쥴러 사용으로 변경 => 첨부파일 저장 폴더명 변경 - 공지사항 알림 표시 삭제 - 이슈유형에서 워크플로우 변경시 이슈 이력 오류 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 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 53cab64..80b12e2 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
@@ -312,8 +312,14 @@
// �씠�뒋 �븘�씠�뵒�뿉 �빐�떦�븯�뒗 湲곕줉 �젙蹂대�� 媛��졇�삩�떎.
@Override
@Transactional(readOnly = true)
- public List<IssueHistoryVo> findIssueHistory(Long issueId) {
- return this.issueHistoryRepository.findByIssueId(issueId);
+ public List<IssueHistoryVo> findIssueHistory(Issue issue) {
+ List<IssueHistoryVo> issueHistoryVos = this.issueHistoryRepository.findByIssueId(issue.getId());
+ if (issueHistoryVos != null && issueHistoryVos.size() > 0) {
+ for (IssueHistoryVo issueHistoryVo : issueHistoryVos) {
+ issueHistoryVo.setTitle(issue.getTitle());
+ }
+ }
+ return issueHistoryVos;
}
// �씠�뒋 蹂�寃� �궡�뿭�쓣 異붿텧�븳�떎.
@@ -444,7 +450,7 @@
public void recordRemoveWorkflowToIssueStatus(String oldIssueStatusName, String newIssueStatusName, StringBuilder description) {
description.append("<ul class=\"activity-list\">");
- String title = "<span translate=\"common.upddetectReservationIssueStatusateWorkflowNotExist\">蹂�寃쎈맂 �썙�겕�뵆濡쒖슦�뿉�꽌 �긽�깭媛� 議댁옱�븯吏� �븡�븘 �씠�뒋�쓽 �긽�깭媛� 蹂�寃쎈릺�뿀�뒿�땲�떎.</span>";
+ String title = "<span translate=\"common.updateWorkflowNotExist\">蹂�寃쎈맂 �썙�겕�뵆濡쒖슦�뿉�꽌 �긽�깭媛� 議댁옱�븯吏� �븡�븘 �씠�뒋�쓽 �긽�깭媛� 蹂�寃쎈릺�뿀�뒿�땲�떎.</span>";
// �씠�젰 �젙蹂대�� html �깭洹몃줈 留뚮뱾�뼱 以��떎.
this.makeIssueHistoryHtml(description, title, oldIssueStatusName, newIssueStatusName);
@@ -548,8 +554,13 @@
// �뾽泥� �젙蹂� 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
@Override
- public void detectIssueCompany(IssueHistoryType type, Map<String, Object> param, IssueCompany issueCompany, StringBuilder description) {
- Long id = MapUtil.getLong(param, "companyId");
+ public void detectIssueCompany(IssueHistoryType type, Map<String, Object> param, CompanyField companyField, IssueCompany issueCompany, StringBuilder description) {
+ Long id = 0L;
+ if (param != null) {
+ id = MapUtil.getLong(param, "companyId");
+ }else if(companyField != null) {
+ id = companyField.getId();
+ }
Long companyFieldId = issueCompany.getCompanyField().getId();
if (type == IssueHistoryType.ADD) { //異붽� �븷 寃쎌슦
@@ -584,8 +595,13 @@
// ISP �젙蹂� 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
@Override
- public void detectIssueIsp(IssueHistoryType type, Map<String, Object> param, IssueIsp issueIsp, StringBuilder description) {
- Long id = MapUtil.getLong(param, "companyId");
+ public void detectIssueIsp(IssueHistoryType type, Map<String, Object> param, IspField ispField, IssueIsp issueIsp, StringBuilder description) {
+ Long id = 0L;
+ if (param != null) {
+ id = MapUtil.getLong(param, "companyId");
+ } else if(ispField != null) {
+ id = ispField.getId();
+ }
Long ispFieldId = issueIsp.getIspField().getId();
if (type == IssueHistoryType.ADD) {
@@ -620,8 +636,13 @@
// �샇�뒪�똿 �젙蹂� 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
@Override
- public void detectIssueHosting(IssueHistoryType type, Map<String, Object> param, IssueHosting issueHosting, StringBuilder description) {
- Long id = MapUtil.getLong(param, "companyId");
+ public void detectIssueHosting(IssueHistoryType type, Map<String, Object> param, HostingField hostingField, IssueHosting issueHosting, StringBuilder description) {
+ Long id = 0L;
+ if (param != null) {
+ id = MapUtil.getLong(param, "companyId");
+ }else if(hostingField != null) {
+ id = hostingField.getId();
+ }
Long hostingFieldId = issueHosting.getHostingField().getId();
if (type == IssueHistoryType.ADD) {
--
Gitblit v1.8.0