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/IssueIspServiceImpl.java | 85 +++++++++++++++++++++++++----------------- 1 files changed, 51 insertions(+), 34 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 a87e858..af71f52 100644 --- a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java +++ b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java @@ -44,6 +44,42 @@ return this.issueIspRepository; } + /** + * �깉濡쒖슫 ISP 吏곸젒 異붽� + * @param issueForm IssueForm + * @param issue Issue + */ + private void CreateIspField(IssueForm issueForm, Issue issue) { + // issueIsp �븘�뱶 �뤌 留뚮뱾湲� + IspFieldForm ispFieldForm = new IspFieldForm(); + ispFieldForm.setName(issueForm.getIspName()); + ispFieldForm.setCode(issueForm.getIspCode()); + ispFieldForm.setEmail(issueForm.getIspEmail()); + ispFieldForm.setUrl(issueForm.getIspUrl()); + ispFieldForm.setManager(issueForm.getIspManager()); + ispFieldForm.setTel(issueForm.getIspTel()); + ispFieldForm.setMemo(issueForm.getIspMemo()); + + IssueIsp newIssueIsp = CreateIssueIsp(ispFieldForm, issue); + IspField ispField = new IspField(); + StringBuilder sb = new StringBuilder(); + + // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆�뿉 ISP 紐⑸줉�뿉 異붽� + if (newIssueIsp.getIspField() == null) { + ispField = this.ispFieldService.add(ispFieldForm); + newIssueIsp.setIspField(ispField); + IssueIsp oldIssueIsp = this.issueIspRepository.findByIssueId(issue.getId()); + if (oldIssueIsp != null) { + issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, null, ispFieldForm, oldIssueIsp, sb); + this.issueIspRepository.deleteById(oldIssueIsp.getId()); + } else { + issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, null, ispFieldForm, newIssueIsp, sb); + } + } + // 異붽� �씠�젰 + issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString()); + this.issueIspRepository.saveAndFlush(newIssueIsp); + } /** * �씠�뒋 ISP 留뚮뱾湲� @@ -54,20 +90,18 @@ private IssueIsp CreateIssueIsp(IspFieldForm ispFieldForm, Issue issue) { IssueIsp issueIsp = ConvertUtil.copyProperties(ispFieldForm, IssueIsp.class); issueIsp.setIssue(issue); - IspField ispField = this.ispFieldService.getIsp(ispFieldForm.getId()); - if (ispField != null) { + if (ispFieldForm.getId() != null && ispFieldForm.getId() != -1) { + IspField ispField = this.ispFieldService.getIsp(ispFieldForm.getId()); issueIsp.setIspField(ispField); } - return issueIsp; } - /** * �씠�뒋 ISP 留뚮뱾湲� * @param ispFieldMap Map<String, Object> IspFieldForm map * @param issue �씠�뒋 - * @return ISPIssue + * @return IssueIsp CreateIssueIsp */ private IssueIsp CreateIssueIsp(Map<String, Object> ispFieldMap, Issue issue) { IspFieldForm ispFieldForm = ConvertUtil.convertMapToClass(ispFieldMap, IspFieldForm.class); @@ -75,19 +109,23 @@ return CreateIssueIsp(ispFieldForm, issue); } - // �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �뾽泥� 媛믪쓣 �뾽�뜲�씠�듃�븳�떎. @Override @Transactional public void modifyIssueIspField(Issue issue, IssueForm issueForm) { if (issue != null) { + StringBuilder sb = new StringBuilder(); List<Map<String, Object>> issueIspFields = issueForm.getIssueIspFields(); - Map<String, Object> param = issueIspFields.get(0); if (issueIspFields != null && issueIspFields.size() > 0) { + Map<String, Object> param = issueIspFields.get(0); IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId()); if (issueIsp != null) {//�닔�젙 �떆 + // 蹂�寃� �씠�젰 �궓湲곌퀬 issueIsp�뿉 set�빐二쇨린 + issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb); + issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString()); + issueIsp.setName(MapUtil.getString(param, "name")); issueIsp.setEmail(MapUtil.getString(param, "email")); issueIsp.setCode(MapUtil.getString(param, "code")); @@ -95,16 +133,12 @@ issueIsp.setManager(MapUtil.getString(param, "manager")); issueIsp.setTel(MapUtil.getString(param, "tel")); issueIsp.setMemo(MapUtil.getString(param, "memo")); - // 蹂�寃� �씠�젰 - StringBuilder sb = new StringBuilder(); - issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb); - issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString()); + this.issueIspRepository.saveAndFlush(issueIsp); } else { //異붽� �떆 IssueIsp newIssueIsp = CreateIssueIsp(param, issue); // 異붽� �씠�젰 - StringBuilder sb = new StringBuilder(); issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, newIssueIsp, sb); issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString()); this.issueIspRepository.saveAndFlush(newIssueIsp); @@ -112,28 +146,11 @@ } // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆 else if(issueForm.getIspName() != null && !issueForm.getIspName().equals("")) { - // issueIsp �븘�뱶 �뤌 留뚮뱾湲� - IspFieldForm ispFieldForm = new IspFieldForm(); - ispFieldForm.setName(issueForm.getIspName()); - ispFieldForm.setCode(issueForm.getIspCode()); - ispFieldForm.setEmail(issueForm.getIspEmail()); - ispFieldForm.setUrl(issueForm.getIspUrl()); - ispFieldForm.setManager(issueForm.getIspManager()); - ispFieldForm.setTel(issueForm.getIspTel()); - ispFieldForm.setMemo(issueForm.getIspMemo()); - - IssueIsp newIssueIsp = CreateIssueIsp(ispFieldForm, issue); - IspField ispField = new IspField(); - // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆�뿉 ISP 紐⑸줉�뿉 異붽� - if (newIssueIsp.getIspField() == null) { - ispField = this.ispFieldService.add(ispFieldForm); - newIssueIsp.setIspField(ispField); - } - // 異붽� �씠�젰 - StringBuilder sb = new StringBuilder(); - issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, newIssueIsp, sb); - issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString()); - this.issueIspRepository.saveAndFlush(newIssueIsp); + //ISP�젙蹂� 吏곸젒 異붽� + CreateIspField(issueForm, issue); + } else { + this.issueIspRepository.deleteByIssueId(issue.getId()); + this.issueIspRepository.flush(); } } } -- Gitblit v1.8.0