From 7b3861cb48507674af980e5579f61a853d093ed8 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 06 1월 2022 10:07:26 +0900
Subject: [PATCH] 하위이슈목록/연관이슈목록 모든 컬럼 정렬 (기간 제외) 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 98 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 78 insertions(+), 20 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 d909d9e..415eaef 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -313,7 +313,7 @@
}
}
- private void findCompanyField(IssueForm issueForm) {
+ private IssueForm findCompanyField(IssueForm issueForm) {
if(issueForm.getIssueCustomFields() != null && issueForm.getIssueCustomFields().size() > 0) {
CompanyFieldCondition condition = new CompanyFieldCondition();
List<Map<String, Object>> companyFields = this.companyFieldService.find(condition);
@@ -356,6 +356,7 @@
issueForm.setIssueHostingFields(issueHostingFields);
}
}
+ return issueForm;
}
private User convertToUser(String token) {
@@ -381,7 +382,14 @@
} else {
// 媛��긽 �긽�쐞 �씠�뒋 異붽�
IssueForm parentIssueForm = issueForm.clone();
+ // 媛��긽 �긽�쐞 �씠�뒋 異붽�
parentIssueForm.setUseIssueCustomFields(issueApiForm.getUseIssueCustomFieldIds());
+ // 媛숈� �룄硫붿씤 �뾽泥� 李얘린
+ IssueForm partners = this.findCompanyField(parentIssueForm);
+ parentIssueForm.setIssueCompanyFields(partners.getIssueCompanyFields());
+ parentIssueForm.setIssueIspFields(partners.getIssueIspFields());
+ parentIssueForm.setIssueHostingFields(partners.getIssueHostingFields());
+
Issue issue = addIssue(user, parentIssueForm, null);
issues.add(issue);
// �븯�쐞 �씠�뒋 異붽�
@@ -414,7 +422,9 @@
IssueCustomFieldValueFormComparator comp = new IssueCustomFieldValueFormComparator();
Collections.sort(issueCustomFieldValueForms, comp);
+ List<String> userValues = Lists.newArrayList();
for (IssueCustomFieldValueForm issueCustomFieldValueForm : issueCustomFieldValueForms) {
+ userValues.add(issueCustomFieldValueForm.getUseValue());
for(CustomFieldApiOverlap customFieldApiOverlap : customFieldApiOverlaps) {
if (customFieldApiOverlap.getCustomField().getId().equals(issueCustomFieldValueForm.getCustomFieldId())) {
if (useIdx > 0) {
@@ -428,6 +438,7 @@
IssueCustomFieldValueCondition issueCustomFieldValueCondition = new IssueCustomFieldValueCondition();
issueCustomFieldValueCondition.setUseValue(concatUseValue);
+ issueCustomFieldValueCondition.setUseValues(userValues);
issueCustomFieldValueCondition.setIssueTypeId(issueApiform.getIssueTypeId());
List<Map<String, Object>> results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
if (results != null && results.size() > 0) {
@@ -498,7 +509,6 @@
this.issueIspService.modifyIssueIspField(issue, issueForm);
// HOSTING �젙蹂� ���옣
this.issueHostingService.modifyIssueHostingField(issue, issueForm);
-
// 泥⑤� �뙆�씪 ���옣
// multipartFile �쓣 file Map List 媛앹껜濡� 蹂�寃쏀븳�떎.
@@ -716,7 +726,7 @@
}
// �씠�뒋 �젙蹂대�� �씠硫붿씪 �쟾�넚�뿉 �궗�슜�븯湲� �쐞�빐 Map �삎�깭濡� 蹂��솚�븳�떎.
- private void makeIssueMapToIssue(Issue issue, Map<String, Object> issueMap) {
+ public void makeIssueMapToIssue(Issue issue, Map<String, Object> issueMap) {
issueMap.put("title", issue.getTitle());
issueMap.put("issueNumber", issue.getIssueNumber());
issueMap.put("issueTypeName", issue.getIssueType().getName());
@@ -1536,6 +1546,8 @@
this.setIssueHistory(downIssue, downIssueVo); // �씠�뒋 湲곕줉 �젙蹂� �뀑�똿
this.setIssueComments(downIssue, downIssueVo); // �뙎湲� �젙蹂� �뀑�똿
+ downIssueVo.setModifyPermissionCheck(issueVo.getModifyPermissionCheck());
+
resultList.add(downIssueVo);
}
issueVo.setIssueDownVos(resultList);
@@ -1638,6 +1650,8 @@
IssueStatusVo issueStatusVo = ConvertUtil.copyProperties(relationIssue.getIssueStatus(), IssueStatusVo.class, "issueStatusType");
issueStatusVo.setIssueStatusType(relationIssue.getIssueStatus().getIssueStatusType().toString());
issueRelationVo.setIssueStatusVo(issueStatusVo);
+
+ issueRelationVo.setModifyPermissionCheck(issueVo.getModifyPermissionCheck());
this.setRegister(relationIssue, relIssueVo); // �벑濡앹옄
this.setIssueDepartment(relationIssue, relIssueVo); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
@@ -1755,6 +1769,7 @@
List<Issue> resultIssueVos = Lists.newArrayList();
String comma = ",";
+ List<String> userValues = Lists.newArrayList();
if (issueCustomFieldValueForms.size() > 0) {
IssueCustomFieldValueFormComparator comp = new IssueCustomFieldValueFormComparator();
Collections.sort(issueCustomFieldValueForms, comp);
@@ -1762,6 +1777,7 @@
String concatUseValue = "";
for (int i = 0; i < issueCustomFieldValueForms.size(); i++) {
IssueCustomFieldValueForm issueCustomFieldValueForm = issueCustomFieldValueForms.get(i);
+ userValues.add(issueCustomFieldValueForm.getUseValue());
if (i > 0) {
concatUseValue = concatUseValue.concat(comma);
}
@@ -1770,6 +1786,7 @@
IssueCustomFieldValueCondition issueCustomFieldValueCondition = new IssueCustomFieldValueCondition();
issueCustomFieldValueCondition.setUseValue(concatUseValue);
+ issueCustomFieldValueCondition.setUseValues(userValues);
issueCustomFieldValueCondition.setIssueTypeId(issueApiform.getIssueTypeId());
List<Map<String, Object>> results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
if (results != null && results.size() > 0) {
@@ -1893,6 +1910,13 @@
// �씠�뒋 �닔�젙(API�슜)
private Issue modifyIssueForApi(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
CheckIssueData checkIssueData = this.checkIssue(user, issueForm);
+
+ if (issueForm.getComment() != null && !issueForm.getComment().equals("")) { //�뙎湲� 異붽�
+ IssueCommentForm issueCommentForm = new IssueCommentForm();
+ issueCommentForm.setDescription(issueForm.getComment());
+ issueCommentForm.setIssueId(issueForm.getId());
+ this.issueCommentService.addIssueComment(issueCommentForm, user);
+ }
// �씠�뒋 �씠�젰 �궓湲곌린
this.addIssueHistoryModify(user, issueForm, checkIssueData, multipartFiles);
@@ -3540,6 +3564,37 @@
this.issueHistoryService.addIssueHistory(issue, IssueHistoryType.SEND, sb.toString());
}
+ @Override
+ public void sendCommonEmail(EmailCommonForm emailCommonForm) {
+ if (emailCommonForm.getSendEmails().size() < 1) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.ISSUE_NOT_SEND_USER));
+ } else if (emailCommonForm.getIssueId() == null) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.ISSUE_NOT_EXIST));
+ }
+
+ Issue issue = this.getIssue(emailCommonForm.getIssueId());
+
+ // 諛쒖떊�옄 �몴�떆
+ User user = this.webAppUtil.getLoginUserObject();
+ UserVo toUser = this.webAppUtil.getLoginUser();
+
+ // �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
+ log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_ANOTHER_USER_SEND_EMAIL));
+ StringBuilder sb = new StringBuilder();
+
+ Locale locale = CommonUtil.getUserLanguage(user.getLanguage());
+ String[] sendMails = ConvertUtil.ToArray(emailCommonForm.getSendEmails());
+ for(int i=0; i < sendMails.length; i++) {
+ sendMails[i] = CommonUtil.decryptAES128(sendMails[i]);
+ }
+ this.systemEmailService.sendEmail(emailCommonForm.getTitle(), emailCommonForm.getDescription(), sendMails, null);
+
+ this.issueHistoryService.detectSendIssueMail(IssueHistoryType.SEND, emailCommonForm.getSendEmails(), sb);
+ this.issueHistoryService.addIssueHistory(issue, IssueHistoryType.SEND, sb.toString());
+ }
+
// �삁�빟 諛쒖깮 �씠�뒋瑜� �떎�뻾�븳�떎
@Override
@Transactional
@@ -3708,28 +3763,31 @@
@Transactional
@Override
public void modifyParentIssue(IssueForm issueDownForm) {
- Issue issue = this.getIssue(issueDownForm.getId()); //�븯�쐞 �씠�뒋
+ //Issue issue = this.getIssue(issueDownForm.getId()); //�븯�쐞 �씠�뒋
Long newParentIssueId = issueDownForm.getParentIssueId(); //蹂�寃쏀븷 �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋
-
StringBuilder sb = new StringBuilder();
- Issue parentIssue = issue.getParentIssue(); //蹂�寃� �쟾 �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋
- if(parentIssue != null && parentIssue.getId().equals(newParentIssueId)){ //蹂�寃� �쟾 �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋媛� 議댁옱 �븷 寃쎌슦
- this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);
- this.issueHistoryService.addIssueHistory(parentIssue, IssueHistoryType.MODIFY, sb.toString());
- }
+ for (Long downId : issueDownForm.getIds()) {
+ Issue issue = this.getIssue(downId);
- if (newParentIssueId != null) { // 異붽� �븷 寃쎌슦
- parentIssue = this.getIssue(newParentIssueId); //�긽�쐞�씠�뒋(myIssue)
- issue.setParentIssue(parentIssue); //myIssue瑜� �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋濡� set
- this.issueHistoryService.detectDownIssues(IssueHistoryType.ADD, issue, sb); //issue = �븯�쐞�씠�뒋
- } else{
- // �궘�젣 �븷 寃쎌슦
- this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);
- issue.setParentIssue(null);
+ Issue parentIssue = issue.getParentIssue(); //蹂�寃� �쟾 �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋
+ if(parentIssue != null && parentIssue.getId().equals(newParentIssueId)){ //蹂�寃� �쟾 �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋媛� 議댁옱 �븷 寃쎌슦
+ this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);
+ this.issueHistoryService.addIssueHistory(parentIssue, IssueHistoryType.MODIFY, sb.toString());
+ }
+
+ if (newParentIssueId != null) { // 異붽� �븷 寃쎌슦
+ parentIssue = this.getIssue(newParentIssueId); //�긽�쐞�씠�뒋(myIssue)
+ issue.setParentIssue(parentIssue); //myIssue瑜� �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋濡� set
+ this.issueHistoryService.detectDownIssues(IssueHistoryType.ADD, issue, sb); //issue = �븯�쐞�씠�뒋
+ } else{
+ // �궘�젣 �븷 寃쎌슦
+ this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);
+ issue.setParentIssue(null);
+ }
+ this.issueHistoryService.addIssueHistory(parentIssue, IssueHistoryType.MODIFY, sb.toString()); //parentIssue = myIssue(湲곕줉�� �쁽�옱 �긽�꽭�럹�씠吏��뿉 �빐�빞�븯�땲源�)
+ this.issueRepository.saveAndFlush(issue);
}
- this.issueHistoryService.addIssueHistory(parentIssue, IssueHistoryType.MODIFY, sb.toString()); //parentIssue = myIssue(湲곕줉�� �쁽�옱 �긽�꽭�럹�씠吏��뿉 �빐�빞�븯�땲源�)
- this.issueRepository.saveAndFlush(issue);
}
@Override
--
Gitblit v1.8.0