From 1d25659a05d5bc4f500bd3fd63aa6d8375006d43 Mon Sep 17 00:00:00 2001 From: jhjang <jhjang@maprex.co.kr> Date: 금, 03 12월 2021 20:11:11 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/java/kr/wisestone/owl/service/impl/IssueCustomFieldValueServiceImpl.java | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueCustomFieldValueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueCustomFieldValueServiceImpl.java index c35f695..f8e1f52 100644 --- a/src/main/java/kr/wisestone/owl/service/impl/IssueCustomFieldValueServiceImpl.java +++ b/src/main/java/kr/wisestone/owl/service/impl/IssueCustomFieldValueServiceImpl.java @@ -295,6 +295,12 @@ switch (CustomFieldType.valueOf(issueCustomFieldValueCondition.getCustomFieldType())) { case INPUT: + case NUMBER: + case DATETIME: + case IP_ADDRESS: + case EMAIL: + case SITE: + case TEL: result = this.issueCustomFieldValueMapper.findLikeUseValue(issueCustomFieldValueCondition); break; case MULTI_SELECT: @@ -327,6 +333,29 @@ return customFieldSearch; } + @Override + public Map<String, Object> find(IssueCustomFieldValueCondition issueCustomFieldValueCondition) { + if (issueCustomFieldValueCondition.getUseValues().size() > 0 || !StringUtils.isEmpty(issueCustomFieldValueCondition.getUseValue())) { + issueCustomFieldValueCondition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId()); + + // �궗�슜�옄 �젙�쓽 �븘�뱶 媛� 寃��깋 �떆�옉 + Map<String, Object> result = new HashMap<>(); + + switch (CustomFieldType.valueOf(issueCustomFieldValueCondition.getCustomFieldType())) { + case INPUT: + result = this.issueCustomFieldValueMapper.findLikeUseValue(issueCustomFieldValueCondition); + break; + case MULTI_SELECT: + case SINGLE_SELECT: + result = this.issueCustomFieldValueMapper.findByUseValue(issueCustomFieldValueCondition); + break; + } + + return result; + } + return null; + } + // �씠�뒋�뿉�꽌 ���옣�븳 �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪쓣 議고쉶�븳�떎. @Override @Transactional(readOnly = true) -- Gitblit v1.8.0