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/IssueServiceImpl.java | 110 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 83 insertions(+), 27 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 9bb8241..54e58cf 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -87,6 +87,9 @@
private CompanyFieldService companyFieldService;
@Autowired
+ private CompanyFieldCategoryService companyFieldCategoryService;
+
+ @Autowired
private IspFieldService ispFieldService;
@Autowired
@@ -209,6 +212,9 @@
@Autowired
private IssueRelationMapper issueRelationMapper;
+ @Autowired
+ private WorkflowTransitionService workflowTransitionService;
+
@Override
protected JpaRepository<Issue, Long> getRepository() {
return this.issueRepository;
@@ -259,6 +265,9 @@
}
} else if (issueApiForm.getIssueStatusId() == null){
throw new ApiParameterException(this.messageAccessor.getMessage(MsgConstants.API_ISSUE_STATUS_NOT_EXIST));
+ } else if (!this.workflowTransitionService.contains(issueApiForm.getIssueStatusId(), workflow.getId())) {
+ //�씠�뒋 �긽�깭 �쑀�슚�꽦 �솗�씤
+ throw new ApiParameterException(this.messageAccessor.getMessage(MsgConstants.API_ISSUE_STATUS_NOT_EXIST_IN_WORKFLOW));
}
// �봽濡쒖젥�듃 �엯�젰
@@ -933,22 +942,19 @@
return Lists.newArrayList();
}
- // �뒠�떇 �쟾 - 1.3 / 1.2 / 1.1
- // �뒠�떇 �썑 (�떒�씪/�떎以� 寃��깋 議곌굔 3媛� 湲곗�) - 0.49 / 0.41 / 0.47 / 0.41
-
List<IssueVo> issueVos = Lists.newArrayList(); // �씠�뒋 紐⑸줉 �뜲�씠�꽣 ���옣 而щ젆�뀡
// �궗�슜�옄 �젙�쓽 �븘�뱶濡� 寃��깋�븳 �씠�뒋 �븘�씠�뵒 媛�
List<String> issueKeys = Lists.newArrayList(issueIds);
issueCondition.setIssueIds(issueKeys);
-
- issueCondition.setLoginUserId(this.webAppUtil.getLoginId());
- issueCondition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
User user = this.webAppUtil.getLoginUserObject();
+
+ issueCondition.setLoginUserId(user.getId());
+ issueCondition.setWorkspaceId(user.getLastWorkspaceId());
List<Map<String, Object>> results = Lists.newArrayList();
Long totalCount = 0L;
- UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
+// UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
// if (!this.userWorkspaceService.checkWorkspaceManager(user)
// && !MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE)) { //理쒓퀬愿�由ъ옄 & �봽濡쒖젥�듃,�씠�뒋 愿�由ъ옄 �씪 寃쎌슦 紐⑤뱺 �씠�뒋 蹂닿린
@@ -958,17 +964,18 @@
// results = this.issueMapper.findByDepartment(issueCondition);
// totalCount = this.issueMapper.countByDepartment(issueCondition);
// }*/
+// StopWatch serviceStart = new StopWatch();
+// serviceStart.start();
results = this.issueMapper.find(issueCondition);
+// serviceStart.stop();
+// log.error("result : " + serviceStart.toString());
+
+// serviceStart = new StopWatch();
+// serviceStart.start();
totalCount = this.issueMapper.count(issueCondition);
-
- // �뒠�떇 �쟾 - 0.8, 0.9, 0.9, 0.9, 0.9
- /*StopWatch serviceStart = new StopWatch();
- serviceStart.start();*/
- // �뒠�떇 �쟾 - 1.1, 1.1, 1.3, 1.2
-
- /*serviceStart.stop();
- log.debug("serviceENd1 : " + serviceStart.getTime());*/
+// serviceStart.stop();
+// log.error("totalCount : " + serviceStart.toString());
int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
// �씠�뒋 �븘�씠�뵒 珥덇린�솕
@@ -984,8 +991,8 @@
this.setDownIssues(user, issueVos);
this.setRelationIssues(issueVos);
}
- this.setCountDownIssues(issueVos);
+ this.setCountDownIssues(issueVos);
this.SetWorkflowDepartment(issueVos); //�썙�겕�뵆濡쒖슦�뿉 �꽕�젙�븳 �떞�떦遺��꽌 媛��졇�삤湲�
resJsonData.put(Constants.RES_KEY_CONTENTS, issueVos);
@@ -1520,7 +1527,7 @@
case "02": // �봽濡쒖젥�듃, �씠�뒋 �쑀�삎, �씠�뒋 �긽�깭, �슦�꽑�닚�쐞, 以묒슂�룄, �떞�떦�옄, 泥⑤��뙆�씪, �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂�, �뙎湲�, 湲곕줉�쓣 �뀑�똿�븳�떎.
this.setIssueDetail(issueVo, issue, user); // �씠�뒋 �긽�꽭 �젙蹂대�� �뀑�똿�븳�떎.
- this.setIssueTableConfigs(issue, issueVo);
+ this.setIssueTableConfigs(issue, issueVo, issueCondition);
issueVo.setProjectVo(ConvertUtil.copyProperties(issue.getProject(), ProjectVo.class));
break;
}
@@ -1532,8 +1539,9 @@
}
// �뀒�씠釉� �꽕�젙 �뀑�똿
- private void setIssueTableConfigs(Issue issue, IssueVo issueVo) {
- Long IssueTypeId = issue.getIssueType().getId();
+ private void setIssueTableConfigs(Issue issue, IssueVo issueVo, IssueCondition issueCondition) {
+ //Long IssueTypeId = issue.getIssueType().getId();
+ Long IssueTypeId = issueCondition.getIssueTypeId();
for (int tableConfigType : IssueTableConfig.IssueTableTypes) {
if (tableConfigType != IssueTableConfig.ISSUE_TABLE_TYPE_MAIN) {
@@ -1557,7 +1565,10 @@
List<Issue> downIssueList = this.issueRepository.findByParentIssueId(issue.getId());
if(downIssueList != null && downIssueList.size() > 0) {
- int startPage = (int) Math.floor(issueVo.getDownPage()/issueVo.getDownPageSize());
+ int startPage = 0;
+ if (issueVo.getDownPage() != 0) {
+ startPage = (int) Math.floor(issueVo.getDownPage()/issueVo.getDownPageSize());
+ }
Pageable pageable = PageRequest.of(startPage, issueVo.getDownPageSize());
downIssues = this.issueRepository.findByParentIssueId(issue.getId(), pageable);
}
@@ -1581,6 +1592,9 @@
this.setIssueCustomFields(downIssue, downIssueVo); // �궗�슜�옄�젙�쓽�븘�뱶 �젙蹂� �꽭�똿
this.setIssueHistory(downIssue, downIssueVo); // �씠�뒋 湲곕줉 �젙蹂� �뀑�똿
this.setIssueComments(downIssue, downIssueVo); // �뙎湲� �젙蹂� �뀑�똿
+ this.setIssueCompanyField(downIssue, downIssueVo); //�뾽泥� �젙蹂� �꽭�똿
+ this.setIssueIspField(downIssue, downIssueVo); //ISP �젙蹂� �꽭�똿
+ this.setIssueHostingField(downIssue, downIssueVo); //HOSTING �젙蹂� �꽭�똿
downIssueVo.setModifyPermissionCheck(issueVo.getModifyPermissionCheck());
@@ -1675,7 +1689,7 @@
issueVo.setRelTotalCount(totalCount);
for (Map<String, Object> result : results) {
IssueRelationVo issueRelationVo = ConvertUtil.convertMapToClass(result, IssueRelationVo.class);
- Issue relationIssue = this.findOne(issueRelationVo.getId());
+ Issue relationIssue = this.findOne(MapUtil.getLong(result, "relationIssueId"));
IssueVo relIssueVo = ConvertUtil.copyProperties(relationIssue, IssueVo.class);
Project project = this.projectService.getProject(relationIssue.getProject().getId());
relIssueVo.setProjectId(project.getId());
@@ -1697,6 +1711,25 @@
this.setRegister(relationIssue, relIssueVo); // �벑濡앹옄
this.setIssueDepartment(relationIssue, relIssueVo); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
this.setIssueCustomFields(relationIssue, relIssueVo); // �궗�슜�옄�젙�쓽�븘�뱶 �젙蹂� �꽭�똿
+
+ Set<IssueCompany> issueCompanies = relationIssue.getIssueCompanies();
+ Iterator<IssueCompany> itrCompany = issueCompanies.iterator();
+ while (itrCompany.hasNext()) {
+ issueRelationVo.addIssueCompanyVo(ConvertUtil.copyProperties(itrCompany.next(), IssueCompanyVo.class));
+ }
+
+ Set<IssueIsp> issueIsps = relationIssue.getIssueIspFields();
+ Iterator<IssueIsp> itrIsp = issueIsps.iterator();
+ while (itrIsp.hasNext()) {
+ issueRelationVo.addIssueIspVo(ConvertUtil.copyProperties(itrIsp.next(), IssueIspVo.class));
+ }
+
+ Set<IssueHosting> issueHostings = relationIssue.getIssueHostingFields();
+ Iterator<IssueHosting> itrHosting = issueHostings.iterator();
+ while (itrHosting.hasNext()) {
+ issueRelationVo.addIssueHostingVo(ConvertUtil.copyProperties(itrHosting.next(), IssueHostingVo.class));
+ }
+
issueVo.addIssueRelationVo(issueRelationVo);
}
} else {
@@ -1829,6 +1862,7 @@
issueCustomFieldValueCondition.setUseValue(concatUseValue);
issueCustomFieldValueCondition.setUseValues(userValues);
issueCustomFieldValueCondition.setIssueTypeId(issueApiform.getIssueTypeId());
+ issueCustomFieldValueCondition.setIssueStatusType("CLOSE");
List<Map<String, Object>> results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
if (results != null && results.size() > 0) {
for (Map<String, Object> result : results) {
@@ -2794,6 +2828,26 @@
CompanyField companyField = issueCompany.getCompanyField();
if (companyField != null) {
issueCompanyVo.setCompanyId(issueCompany.getCompanyField().getId());
+ if (issueCompany.getCompanyTypeId() != null && issueCompany.getCompanyTypeId() != -1) {
+ CompanyFieldCategory companyType = this.companyFieldCategoryService.find(issueCompany.getCompanyTypeId());
+ issueCompanyVo.setCompanyTypeName(companyType.getUseValue());
+ }
+ if (issueCompany.getParentSectorId() != null && issueCompany.getParentSectorId() != -1) {
+ CompanyFieldCategory parentSector = this.companyFieldCategoryService.find(issueCompany.getParentSectorId());
+ issueCompanyVo.setParentSectorName(parentSector.getUseValue());
+ }
+ if (issueCompany.getChildSectorId() != null && issueCompany.getChildSectorId() != -1) {
+ CompanyFieldCategory childSector = this.companyFieldCategoryService.find(issueCompany.getChildSectorId());
+ issueCompanyVo.setChildSectorName(childSector.getUseValue());
+ }
+ if (issueCompany.getRegionId() != null && issueCompany.getRegionId() != -1) {
+ CompanyFieldCategory region = this.companyFieldCategoryService.find(issueCompany.getRegionId());
+ issueCompanyVo.setRegionName(region.getUseValue());
+ }
+ if (issueCompany.getStatusId() != null && issueCompany.getStatusId() != -1) {
+ CompanyFieldCategory status = this.companyFieldCategoryService.find(issueCompany.getStatusId());
+ issueCompanyVo.setStatusName(status.getUseValue());
+ }
}
issueCompanyVos.add(issueCompanyVo);
}
@@ -3643,12 +3697,12 @@
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());
+ Issue issue = null;
+ if(emailCommonForm.getIssueId() != null) {
+ issue = this.getIssue(emailCommonForm.getIssueId());
+ }
// 諛쒖떊�옄 �몴�떆
User user = this.webAppUtil.getLoginUserObject();
@@ -3665,8 +3719,10 @@
}
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());
+ if (issue != null) {
+ this.issueHistoryService.detectSendIssueMail(IssueHistoryType.SEND, emailCommonForm.getSendEmails(), sb);
+ this.issueHistoryService.addIssueHistory(issue, IssueHistoryType.SEND, sb.toString());
+ }
}
// �삁�빟 諛쒖깮 �씠�뒋瑜� �떎�뻾�븳�떎
--
Gitblit v1.8.0