From 86ee923282de2423ae858ea8485752fe5564fc40 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 19 1월 2022 15:56:39 +0900
Subject: [PATCH] 검색후에 10 -> 100 변경하면 목록이 달라지는 문제 해결
---
src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java | 113 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 65 insertions(+), 48 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 66c19f9..4bf324b 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,40 @@
return this.issueIspRepository;
}
+ /**
+ * �깉濡쒖슫 ISP 吏곸젒 異붽�
+ * @param issueForm IssueForm
+ * @param issue Issue
+ */
+ private void CreateIspField(IssueForm issueForm, Issue issue, StringBuilder sb) {
+ // 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) {
+ IssueIsp oldIssueIsp = this.issueIspRepository.findByIssueId(issue.getId());
+ ispField = this.ispFieldService.add(ispFieldForm);
+ ispFieldForm.setId(ispField.getId());
+ if (oldIssueIsp != null) {
+ issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, null, ispFieldForm, oldIssueIsp, sb);
+ this.issueIspRepository.deleteById(oldIssueIsp.getId());
+ } else {
+ newIssueIsp.setIspField(ispField);
+ issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, null, ispFieldForm, newIssueIsp, sb);
+ }
+ }
+ this.issueIspRepository.saveAndFlush(newIssueIsp);
+ }
/**
* �씠�뒋 ISP 留뚮뱾湲�
@@ -54,8 +88,8 @@
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);
}
@@ -67,7 +101,7 @@
* �씠�뒋 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);
@@ -79,64 +113,47 @@
// �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �뾽泥� 媛믪쓣 �뾽�뜲�씠�듃�븳�떎.
@Override
@Transactional
- public void modifyIssueIspField(Issue issue, IssueForm issueForm) {
+ public void modifyIssueIspField(Issue issue, IssueForm issueForm, StringBuilder sb) {
if (issue != null) {
+ IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());
List<Map<String, Object>> issueIspFields = issueForm.getIssueIspFields();
+
if (issueIspFields != null && issueIspFields.size() > 0) {
Map<String, Object> param = issueIspFields.get(0);
- if (issueIspFields != null && issueIspFields.size() > 0) {
- IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());
+ if (issueIsp != null) {//�닔�젙 �떆
+ // 蹂�寃� �씠�젰 �궓湲곌퀬 issueIsp�뿉 set�빐二쇨린
+ issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);
- if (issueIsp != null) {//�닔�젙 �떆
- issueIsp.setName(MapUtil.getString(param, "name"));
- issueIsp.setEmail(MapUtil.getString(param, "email"));
- issueIsp.setCode(MapUtil.getString(param, "code"));
- issueIsp.setUrl(MapUtil.getString(param, "url"));
- 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);
+ issueIsp.setName(MapUtil.getString(param, "name"));
+ issueIsp.setEmail(MapUtil.getString(param, "email"));
+ issueIsp.setCode(MapUtil.getString(param, "code"));
+ issueIsp.setUrl(MapUtil.getString(param, "url"));
+ issueIsp.setManager(MapUtil.getString(param, "manager"));
+ issueIsp.setTel(MapUtil.getString(param, "tel"));
+ issueIsp.setMemo(MapUtil.getString(param, "memo"));
- } 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);
- }
- }
- // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆
- 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());
+ this.issueIspRepository.saveAndFlush(issueIsp);
- IssueIsp newIssueIsp = CreateIssueIsp(ispFieldForm, issue);
- IspField ispField = new IspField();
- // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆�뿉 ISP 紐⑸줉�뿉 異붽�
- if (newIssueIsp.getIspField() == null) {
- ispField = this.ispFieldService.add(ispFieldForm);
- newIssueIsp.setIspField(ispField);
- }
+ } 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);
}
+
+ } else if (issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
+ //ISP�젙蹂� 吏곸젒 異붽�
+ CreateIspField(issueForm, issue, sb);
+ } else {
+ this.issueIspRepository.deleteByIssueId(issue.getId());
+ this.issueIspRepository.flush();
+
+ if (issueIsp != null) {
+ issueHistoryService.detectIssueIsp(IssueHistoryType.DELETE, null, null, issueIsp, sb);
+ }
}
+ //issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
}
}
--
Gitblit v1.8.0