From 1ec3490a4c03a08e2300368182168b22ad065ffa Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 목, 02 12월 2021 00:42:26 +0900 Subject: [PATCH] 사용자 정행 --- src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java index 9d2f7be..2cd7eef 100644 --- a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java +++ b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.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.IssueIspMapper; import kr.wisestone.owl.repository.IssueIspRepository; import kr.wisestone.owl.service.*; @@ -28,6 +29,9 @@ private IspFieldService ispFieldService; @Autowired + private IssueHistoryService issueHistoryService; + + @Autowired private IssueIspMapper issueIspMapper; @Override @@ -47,8 +51,14 @@ IspField ispField = this.ispFieldService.getIsp(MapUtil.getLong(param, "ispId")); Set<IssueIsp> issueIsps = issue.getIssueIspFields(); - if (issueIsps != null && issueIsps.size() > 0) { - IssueIsp issueIsp = issueIsps.iterator().next(); + IssueIsp issueIsp = null; + + if (issueIsps != null && issueIsps.size() > 0) {//�닔�젙 �븷 寃쎌슦 + issueIsp = issueIsps.iterator().next(); + // 蹂�寃� �씠�젰 + StringBuilder sb = new StringBuilder(); + issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, issueIsp, sb); + issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString()); issueIsp.setIspField(ispField); issueIsp.setName(MapUtil.getString(param, "name")); @@ -57,16 +67,16 @@ issueIsp.setManager(MapUtil.getString(param, "manager")); issueIsp.setTel(MapUtil.getString(param, "tel")); issueIsp.setMemo(MapUtil.getString(param, "memo")); - - this.issueIspRepository.saveAndFlush(issueIsp); - - } else { - IssueIsp newIssueIsp = ConvertUtil.convertMapToClass(param, IssueIsp.class); - newIssueIsp.setIssue(issue); - newIssueIsp.setIspField(ispField); - - this.issueIspRepository.saveAndFlush(newIssueIsp); + } else {//異붽� �븷 寃쎌슦 + issueIsp = ConvertUtil.convertMapToClass(param, IssueIsp.class); + issueIsp.setIssue(issue); + issueIsp.setIspField(ispField); + // 異붽� �씠�젰 + StringBuilder sb = new StringBuilder(); + issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, issueIsp, sb); + issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString()); } + this.issueIspRepository.saveAndFlush(issueIsp); } } } -- Gitblit v1.8.0