From 8672cdbd8817957c1fb1996fb870e358c5b6022c Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 17 1월 2022 16:28:21 +0900
Subject: [PATCH] - 헤더에 일반 메일 보내기 기능 추가 - 업체 엑셀 다운로드 시 카테고리 항목들도 보여지도록 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java | 117 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 97 insertions(+), 20 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 2cd7eef..b41b0ef 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
@@ -8,6 +8,8 @@
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;
@@ -29,6 +31,9 @@
private IspFieldService ispFieldService;
@Autowired
+ private IssueService issueService;
+
+ @Autowired
private IssueHistoryService issueHistoryService;
@Autowired
@@ -39,45 +44,117 @@
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) {
+ 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);
+ }
+ }
+ // 異붽� �씠�젰
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ this.issueIspRepository.saveAndFlush(newIssueIsp);
+ }
+
+ /**
+ * �씠�뒋 ISP 留뚮뱾湲�
+ * @param ispFieldForm IspFieldForm
+ * @param issue �씠�뒋
+ * @return IssueIsp
+ */
+ private IssueIsp CreateIssueIsp(IspFieldForm ispFieldForm, Issue issue) {
+ IssueIsp issueIsp = ConvertUtil.copyProperties(ispFieldForm, IssueIsp.class);
+ issueIsp.setIssue(issue);
+ 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 IssueIsp CreateIssueIsp
+ */
+ private IssueIsp CreateIssueIsp(Map<String, Object> ispFieldMap, Issue issue) {
+ IspFieldForm ispFieldForm = ConvertUtil.convertMapToClass(ispFieldMap, IspFieldForm.class);
+ ispFieldForm.setId(MapUtil.getLong(ispFieldMap, "ispId"));
+ return CreateIssueIsp(ispFieldForm, issue);
+ }
+
+
// �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �뾽泥� 媛믪쓣 �뾽�뜲�씠�듃�븳�떎.
@Override
@Transactional
- public void modifyIssueIspField(Issue issue, List<Map<String, Object>> issueIspFields) {
+ public void modifyIssueIspField(Issue issue, IssueForm issueForm) {
if (issue != null) {
+ StringBuilder sb = new StringBuilder();
+ List<Map<String, Object>> issueIspFields = issueForm.getIssueIspFields();
if (issueIspFields != null && issueIspFields.size() > 0) {
Map<String, Object> param = issueIspFields.get(0);
- if (param != null) {
- IspField ispField = this.ispFieldService.getIsp(MapUtil.getLong(param, "ispId"));
+ IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());
- Set<IssueIsp> issueIsps = issue.getIssueIspFields();
- IssueIsp issueIsp = null;
-
- if (issueIsps != null && issueIsps.size() > 0) {//�닔�젙 �븷 寃쎌슦
- issueIsp = issueIsps.iterator().next();
- // 蹂�寃� �씠�젰
- StringBuilder sb = new StringBuilder();
- issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, issueIsp, sb);
+ if (issueIsp != null) {//�닔�젙 �떆
+ // 蹂�寃� �씠�젰 �궓湲곌퀬 issueIsp�뿉 set�빐二쇨린
+ 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"));
- } else {//異붽� �븷 寃쎌슦
- issueIsp = ConvertUtil.convertMapToClass(param, IssueIsp.class);
- issueIsp.setIssue(issue);
- issueIsp.setIspField(ispField);
+
+ this.issueIspRepository.saveAndFlush(issueIsp);
+
+ } else { //異붽� �떆
+ IssueIsp newIssueIsp = CreateIssueIsp(param, issue);
// 異붽� �씠�젰
- StringBuilder sb = new StringBuilder();
- issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, issueIsp, sb);
+ issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, newIssueIsp, sb);
issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ this.issueIspRepository.saveAndFlush(newIssueIsp);
}
- this.issueIspRepository.saveAndFlush(issueIsp);
- }
+ } // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆
+ else if (issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
+ //ISP�젙蹂� 吏곸젒 異붽�
+ CreateIspField(issueForm, issue);
+ }
+ else {
+ this.issueIspRepository.deleteByIssueId(issue.getId());
+ this.issueIspRepository.flush();
}
}
}
--
Gitblit v1.8.0