From 8ecffbb61c5505475cd0738032abda5efe2a1812 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 18 11월 2021 21:36:32 +0900
Subject: [PATCH] 이슈 수정 완료
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 84 +++++++++++++++++------------------------
1 files changed, 35 insertions(+), 49 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 800e2e7..de17002 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -850,6 +850,9 @@
this.setIssueHistory(issue, issueVo); // �씠�뒋 湲곕줉 �젙蹂� �뀑�똿
this.setRelationIssue(issue, issueVo); //�뿰愿� �씪媛� �뀑�똿
this.setDownIssues(issue, issueVo);
+ this.setIssueCompanyField(issue, issueVo); //�뾽泥� �젙蹂� �꽭�똿
+ this.setIssueIspField(issue, issueVo); //ISP �젙蹂� �꽭�똿
+ this.setIssueHostingField(issue, issueVo); //HOSTING �젙蹂� �꽭�똿
}
// �벑濡앹옄 �젙蹂� 異붽�
@@ -1056,9 +1059,15 @@
if (!StringUtils.isEmpty(detectIssueChange.toString())) {
this.issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, detectIssueChange.toString());
}
-
// �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_MODIFY));
+
+ // �뾽泥� �젙蹂� ���옣
+ this.issueCompanyService.modifyIssueCompanyField(issue, issueForm.getIssueCompanyFields());
+ // ISP �젙蹂� ���옣
+ this.issueIspService.modifyIssueIspField(issue, issueForm.getIssueIspFields());
+ // HOSTING �젙蹂� ���옣
+ this.issueHostingService.modifyIssueHostingField(issue, issueForm.getIssueHostingFields());
return issue;
}
@@ -1615,66 +1624,43 @@
}
// �뾽泥� �젙蹂� 異붽�
- private void setIssueCompanyField(List<IssueVo> issueVos, IssueCondition issueCondition) {
- // �씠�뒋�뿉�꽌 ���옣�븳 �뾽泥� 媛믪쓣 議고쉶�븳�떎.
- List<Map<String, Object>> issueCompanyFields = this.issueCompanyService.findInIssueIds(issueCondition);
+ private void setIssueCompanyField(Issue issue, IssueVo issueVo) {
+ List<IssueCompanyVo> issueCompanyVos = Lists.newArrayList();
- for (IssueVo issueVo : issueVos) {
- for (Map<String, Object> issueCompanyField : issueCompanyFields) {
- if (issueVo.getId().equals(MapUtil.getLong(issueCompanyField, "issueId"))) {
- IssueCompanyVo issueCompanyVo = new IssueCompanyVo();
- issueCompanyVo.setName(MapUtil.getString(issueCompanyField, "companyName"));
- issueCompanyVo.setManager(MapUtil.getString(issueCompanyField, "companyManager"));
- issueCompanyVo.setTel(MapUtil.getString(issueCompanyField, "companyTel"));
- issueCompanyVo.setEmail(MapUtil.getString(issueCompanyField, "companyEmail"));
- issueCompanyVo.setMemo(MapUtil.getString(issueCompanyField, "companyMemo"));
-
- issueVo.addIssueCompanyFieldVo(issueCompanyVo);
- }
+ for(IssueCompany issueCompany : issue.getIssueCompanies()){
+ IssueCompanyVo issueCompanyVo = ConvertUtil.copyProperties(issueCompany, IssueCompanyVo.class);
+ issueCompanyVo.setId(issueCompany.getId());
+ CompanyField companyField = issueCompany.getCompanyField();
+ if (companyField != null) {
+ issueCompanyVo.setCompanyId(issueCompany.getCompanyField().getId());
}
+ issueCompanyVos.add(issueCompanyVo);
}
+ issueVo.setIssueCompanyVos(issueCompanyVos);
}
// Isp �젙蹂� 異붽�
- private void setIssueIspField(List<IssueVo> issueVos, IssueCondition issueCondition) {
- // �씠�뒋�뿉�꽌 ���옣�븳 ISP 媛믪쓣 議고쉶�븳�떎.
- /*List<Map<String, Object>> issueIspFields = this.issueIspFieldService.findInIssueIds(issueCondition);*/
+ private void setIssueIspField(Issue issue, IssueVo issueVo) {
+ List<IssueIspVo> issueIspVos = Lists.newArrayList();
- /*for (IssueVo issueVo : issueVos) {
- for (Map<String, Object> issueIspField : issueIspFields) {
- if (issueVo.getId().equals(MapUtil.getLong(issueIspField, "issueId"))) {
- IssueIspFieldVo issueIspFieldVo = new IssueIspFieldVo();
- issueIspFieldVo.setName(MapUtil.getString(issueIspField, "name"));
- issueIspFieldVo.setManager(MapUtil.getString(issueIspField, "manager"));
- issueIspFieldVo.setTel(MapUtil.getString(issueIspField, "tel"));
- issueIspFieldVo.setEmail(MapUtil.getString(issueIspField, "email"));
- issueIspFieldVo.setMemo(MapUtil.getString(issueIspField, "memo"));
-
- issueVo.addIssueIspFieldVo(issueIspFieldVo);
- }
- }
- }*/
+ for(IssueIsp issueIsp : issue.getIssueIspFields()){
+ IssueIspVo issueIspVo = ConvertUtil.copyProperties(issueIsp, IssueIspVo.class);
+ issueIspVo.setId(issueIsp.getId());
+ issueIspVos.add(issueIspVo);
+ }
+ issueVo.setIssueIspVos(issueIspVos);
}
// Hosting �젙蹂� 異붽�
- private void setIssueHostingField(List<IssueVo> issueVos, IssueCondition issueCondition) {
- // �씠�뒋�뿉�꽌 ���옣�븳 Hosting 媛믪쓣 議고쉶�븳�떎.
- List<Map<String, Object>> issueHostingFields = this.issueHostingService.findInIssueIds(issueCondition);
+ private void setIssueHostingField(Issue issue, IssueVo issueVo) {
+ List<IssueHostingVo> issueHostingVos = Lists.newArrayList();
- for (IssueVo issueVo : issueVos) {
- for (Map<String, Object> issueHostingField : issueHostingFields) {
- if (issueVo.getId().equals(MapUtil.getLong(issueHostingField, "issueId"))) {
- IssueHostingVo issueHostingVo = new IssueHostingVo();
- issueHostingVo.setName(MapUtil.getString(issueHostingField, "name"));
- issueHostingVo.setManager(MapUtil.getString(issueHostingField, "manager"));
- issueHostingVo.setTel(MapUtil.getString(issueHostingField, "tel"));
- issueHostingVo.setEmail(MapUtil.getString(issueHostingField, "email"));
- issueHostingVo.setMemo(MapUtil.getString(issueHostingField, "memo"));
-
- issueVo.addIssueHostingFieldVo(issueHostingVo);
- }
- }
+ for(IssueHosting issueHosting : issue.getIssueHostingFields()){
+ IssueHostingVo issueHostingVo = ConvertUtil.copyProperties(issueHosting, IssueHostingVo.class);
+ issueHostingVo.setId(issueHosting.getId());
+ issueHostingVos.add(issueHostingVo);
}
+ issueVo.setIssueHostingVos(issueHostingVos);
}
// �뿰愿��씪媛� �젙蹂� 異붽�
--
Gitblit v1.8.0