From ebfd37816a332308519b30af5bfb017c5052be69 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 13 1월 2022 17:34:35 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java | 64 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 13 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..c5203db 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
@@ -1,12 +1,15 @@
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.*;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.util.MapUtil;
import kr.wisestone.owl.web.condition.IssueCondition;
+import kr.wisestone.owl.web.form.IspFieldForm;
+import kr.wisestone.owl.web.form.IssueForm;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +31,9 @@
private IspFieldService ispFieldService;
@Autowired
+ private IssueHistoryService issueHistoryService;
+
+ @Autowired
private IssueIspMapper issueIspMapper;
@Override
@@ -38,36 +44,68 @@
// �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �뾽泥� 媛믪쓣 �뾽�뜲�씠�듃�븳�떎.
@Override
@Transactional
- public void modifyIssueIspField(Issue issue, List<Map<String, Object>> issueIspFields) {
+ public void modifyIssueIspField(Issue issue, IssueForm issueForm) {
if (issue != null) {
+ List<Map<String, Object>> issueIspFields = issueForm.getIssueIspFields();
if (issueIspFields != null && issueIspFields.size() > 0) {
Map<String, Object> param = issueIspFields.get(0);
- if (param != null) {
+ if (param != null && param.get("ispId") != null && param.get("ispId") != "") {
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 = new IssueIsp();
+ if (issueIsps != null && issueIsps.size() > 0) {//�닔�젙 �븷 寃쎌슦
+ issueIsp = issueIsps.iterator().next();
+ // 蹂�寃� �씠�젰
+ StringBuilder sb = new StringBuilder();
+ issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
issueIsp.setIspField(ispField);
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"));
-
- 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);
+ if (ispField != null) {
+ issueIsp.setIspField(ispField);
+ }
+ // 異붽� �씠�젰
+ StringBuilder sb = new StringBuilder();
+ issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, issueIsp, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
}
+ this.issueIspRepository.saveAndFlush(issueIsp);
+ }else {
+ this.issueIspRepository.deleteById(MapUtil.getLong(param, "id"));
}
+ } else if(issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
+ 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());
+
+ IspField ispField = this.ispFieldService.add(ispFieldForm);
+ IssueIsp issueIsp = ConvertUtil.copyProperties(ispFieldForm, IssueIsp.class);
+ issueIsp.setIssue(issue);
+ if (ispField != null) {
+ issueIsp.setIspField(ispField);
+ }
+ // 異붽� �씠�젰
+ StringBuilder sb = new StringBuilder();
+ issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, null, ispField, issueIsp, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ this.issueIspRepository.saveAndFlush(issueIsp);
}
}
}
--
Gitblit v1.8.0