From d348049a4a3c9fa32c3eb566c69df6d8adf652a8 Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 월, 29 11월 2021 01:57:02 +0900 Subject: [PATCH] 이슈 상세 유형별 수정 --- src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java index 31af754..9437299 100644 --- a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java +++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.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.HostingFieldMapper; import kr.wisestone.owl.mapper.IssueHostingMapper; import kr.wisestone.owl.repository.IssueHostingRepository; @@ -30,6 +31,9 @@ private HostingFieldService hostingFieldService; @Autowired + private IssueHistoryService issueHistoryService; + + @Autowired private IssueHostingMapper issueHostingMapper; @Override @@ -49,8 +53,14 @@ HostingField hostingField = this.hostingFieldService.getHosting(MapUtil.getLong(param, "hostingId")); Set<IssueHosting> issueHostings = issue.getIssueHostingFields(); - if (issueHostings != null && issueHostings.size() >0){ - IssueHosting issueHosting = issueHostings.iterator().next(); + IssueHosting issueHosting = null; + + if (issueHostings != null && issueHostings.size() >0){//�닔�젙 �븷 寃쎌슦 + issueHosting = issueHostings.iterator().next(); + // 蹂�寃� �씠�젰 + StringBuilder sb = new StringBuilder(); + issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, issueHosting, sb); + issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString()); issueHosting.setHostingField(hostingField); issueHosting.setName(MapUtil.getString(param, "name")); @@ -59,16 +69,16 @@ issueHosting.setManager(MapUtil.getString(param, "manager")); issueHosting.setTel(MapUtil.getString(param, "tel")); issueHosting.setMemo(MapUtil.getString(param, "memo")); - - this.issueHostingRepository.saveAndFlush(issueHosting); - }else{ - IssueHosting newIssueHosting = ConvertUtil.convertMapToClass(param, IssueHosting.class); - newIssueHosting.setIssue(issue); - newIssueHosting.setHostingField(hostingField); - - this.issueHostingRepository.saveAndFlush(newIssueHosting); + }else{//異붽� �븷 寃쎌슦 + issueHosting = ConvertUtil.convertMapToClass(param, IssueHosting.class); + issueHosting.setIssue(issue); + issueHosting.setHostingField(hostingField); + // 異붽� �씠�젰 + StringBuilder sb = new StringBuilder(); + issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, issueHosting, sb); + issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString()); } - + this.issueHostingRepository.saveAndFlush(issueHosting); } } } -- Gitblit v1.8.0