From 12e19e0b8bc5e728169dad54c132e7ccd41973a4 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 14 3월 2022 12:55:35 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.28:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 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 11bdddd..6d8152f 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -528,6 +528,7 @@
}
if(customFieldApiOverlap.getCustomField().getCustomFieldType().equals(SITE)) {
+ customFieldType = SITE.toString();
String[] urlArr = null;
List<String> urls = Lists.newArrayList();
if (useValue.contains(",")) {
@@ -566,10 +567,21 @@
// issueCustomFieldValueCondition.setIssueStatusType("CLOSE");
List<Map<String, Object>> results = Lists.newArrayList();
if (customFieldType.equals(IP_ADDRESS.toString()) && issueForm.getIssueCompanyFields() != null && issueForm.getIssueCompanyFields().size() > 0) {
- long ipValue = ConvertUtil.ipToLong(concatUseValue);
+ long ipValue = 0;
+ if (concatUseValue.contains(",")) {
+ String[] arr = concatUseValue.split(",");
+ for (String str : arr) {
+ ipValue = ConvertUtil.ipToLong(str);
+ }
+ } else {
+ ipValue = ConvertUtil.ipToLong(concatUseValue);
+ }
issueCustomFieldValueCondition.setUseValue(String.valueOf(ipValue));
- // �븯�쐞�씠�뒋議곌굔�쓽 ���엯�씠 IP�씪 寃쎌슦 媛숈� �뾽泥댁젙蹂댁씤 �씠�뒋 李얘린
- results = this.issueMapper.findByCustomFieldValueOfIp(issueCustomFieldValueCondition);
+ }
+
+ if (issueCustomFieldValueCondition.getCustomFieldType() != null && !issueCustomFieldValueCondition.getCustomFieldType().equals("")) {
+ // �궗�슜�옄�젙�쓽�븘�뱶 ���엯�씠 IP_ADDRESS �삉�뒗 SITE �씪 寃쎌슦
+ results = this.issueMapper.findByCustomFieldValueByCompany(issueCustomFieldValueCondition);
} else {
results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
}
@@ -1684,11 +1696,11 @@
this.setAttachedFiles(issue, issueVo); // 泥⑤� �뙆�씪 �젙蹂� �뀑�똿
this.setIssueCustomFields(issue, issueVo); // �궗�슜�옄 �젙�쓽 �븘�뱶 媛� �젙蹂� �뀑�똿
this.setRelationIssue(issue, issueVo); //�뿰愿� �씪媛� �뀑�똿
- this.setDownIssues(issue, issueVo); //�븯�쐞 �씠�뒋 �꽭�똿
+ this.setDownIssues(issue, issueVo, issueCondition.getHideCompleteIssue()); //�븯�쐞 �씠�뒋 �꽭�똿
break;
case "02": // �봽濡쒖젥�듃, �씠�뒋 �쑀�삎, �씠�뒋 �긽�깭, �슦�꽑�닚�쐞, 以묒슂�룄, �떞�떦�옄, 泥⑤��뙆�씪, �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂�, �뙎湲�, 湲곕줉�쓣 �뀑�똿�븳�떎.
- this.setIssueDetail(issueVo, issue, user); // �씠�뒋 �긽�꽭 �젙蹂대�� �뀑�똿�븳�떎.
+ this.setIssueDetail(issueVo, issue, user, issueCondition.getHideCompleteIssue()); // �씠�뒋 �긽�꽭 �젙蹂대�� �뀑�똿�븳�떎.
this.setIssueTableConfigs(issue, issueVo, issueCondition);
issueVo.setProjectVo(ConvertUtil.copyProperties(issue.getProject(), ProjectVo.class));
break;
@@ -1722,7 +1734,7 @@
// �븯�쐞 �씠�뒋 �젙蹂대�� �뀑�똿�븳�떎
- private void setDownIssues(Issue issue, IssueVo issueVo) {
+ private void setDownIssues(Issue issue, IssueVo issueVo, boolean hideCompleteIssue) {
Page<Issue> downIssues = null;
List<Issue> downIssueList = this.issueRepository.findByParentIssueId(issue.getId());
@@ -1732,7 +1744,13 @@
startPage = (int) Math.floor(issueVo.getDownPage()/issueVo.getDownPageSize());
}
Pageable pageable = PageRequest.of(startPage, issueVo.getDownPageSize());
- downIssues = this.issueRepository.findByParentIssueId(issue.getId(), pageable);
+
+ if(hideCompleteIssue){
+ downIssues = this.issueRepository.findByParentIssueId(issue.getId(), IssueStatusType.CLOSE, pageable);
+ }else {
+ downIssues = this.issueRepository.findByParentIssueId(issue.getId(), pageable);
+ }
+
}
if(downIssues != null){
issueVo.setDownTotalPage(downIssues.getTotalPages());
@@ -1770,6 +1788,12 @@
@Override
@Transactional(readOnly = true)
public void setIssueDetail(IssueVo issueVo, Issue issue, User user) {
+ setIssueDetail(issueVo, issue, user, false);
+ }
+
+ @Override
+ @Transactional(readOnly = true)
+ public void setIssueDetail(IssueVo issueVo, Issue issue, User user, boolean hideCompleteIssue) {
// �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
if (this.checkHasPermission(issueVo, issueVo.getUserVos(), user, issueVo.getDepartmentVos())) {
issueVo.setModifyPermissionCheck(Boolean.TRUE);
@@ -1788,7 +1812,7 @@
this.setAttachedFiles(issue, issueVo); // 泥⑤� �뙆�씪 �젙蹂� �뀑�똿
this.setIssueCustomFields(issue, issueVo); // �궗�슜�옄 �젙�쓽 �븘�뱶 媛� �젙蹂� �뀑�똿
this.setRelationIssue(issue, issueVo); //�뿰愿� �씪媛� �뀑�똿
- this.setDownIssues(issue, issueVo); //�븯�쐞 �씪媛� �꽭�똿
+ this.setDownIssues(issue, issueVo, hideCompleteIssue); //�븯�쐞 �씪媛� �꽭�똿
this.setIssueComments(issue, issueVo); // �뙎湲� �젙蹂� �뀑�똿
this.setIssueHistory(issue, issueVo); // �씠�뒋 湲곕줉 �젙蹂� �뀑�똿
--
Gitblit v1.8.0