From 5996786ac1e76645be752a9971ad75ee2fe730d7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 15 2월 2022 10:40:00 +0900
Subject: [PATCH] - 탐지일시가 제대로 검색되지 않는 문제 해결 - 이슈 테이블 표시 설정 시 팝업 타이밍 수정
---
src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js | 2 +-
src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js | 5 ++---
src/main/resources/mybatis/query-template/issueCustomFieldValue-template.xml | 2 +-
src/main/webapp/scripts/components/utils/dateRangePicker.directive.js | 4 ++--
src/main/java/kr/wisestone/owl/util/CommonUtil.java | 2 +-
src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js | 3 +--
6 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/util/CommonUtil.java b/src/main/java/kr/wisestone/owl/util/CommonUtil.java
index 22f87bb..4901e3b 100644
--- a/src/main/java/kr/wisestone/owl/util/CommonUtil.java
+++ b/src/main/java/kr/wisestone/owl/util/CommonUtil.java
@@ -965,7 +965,7 @@
// �궇吏� �삎�떇�씤 寃쎌슦 �궇吏쒕줈 蹂��솚
if (HSSFDateUtil.isCellDateFormatted(cell)) {
Date date = cell.getDateCellValue();
- cellValue = DateUtil.convertDateToStr(date, "yyyy-MM-dd hh:mm:ss");
+ cellValue = DateUtil.convertDateToStr(date, "yyyy-MM-dd HH:mm:ss");
} else {
double doubleValue = cell.getNumericCellValue();
diff --git a/src/main/resources/mybatis/query-template/issueCustomFieldValue-template.xml b/src/main/resources/mybatis/query-template/issueCustomFieldValue-template.xml
index a7e4b16..c981cab 100644
--- a/src/main/resources/mybatis/query-template/issueCustomFieldValue-template.xml
+++ b/src/main/resources/mybatis/query-template/issueCustomFieldValue-template.xml
@@ -16,7 +16,7 @@
GROUP_CONCAT(issue_custom_field_value.issue_id SEPARATOR ',') as issueIds
FROM issue_custom_field_value issue_custom_field_value
WHERE issue_custom_field_value.custom_field_id = #{customFieldId}
- AND issue_custom_field_value.use_value BETWEEN #{useStartDateValue} AND #{useEndDateValue}
+ AND DATE_FORMAT(issue_custom_field_value.use_value,'%Y-%m-%d %H:%i:%s') BETWEEN #{useStartDateValue} AND #{useEndDateValue}
</select>
<select id="findByUseValue" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCustomFieldValueCondition">
diff --git a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
index 0c0993c..131dfbb 100644
--- a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
@@ -115,11 +115,10 @@
if (result.data.message.status === "success") {
SweetAlert.success($filter("translate")("issue.completedSavingIssueTable"), $filter("translate")("issue.saveIssueTableSettingsInformation")); // "�씠�뒋 �뀒�씠釉� �꽕�젙 ���옣 �셿猷�", "�씠�뒋 �뀒�씠釉� �꽕�젙 �젙蹂닿� ���옣�릺�뿀�뒿�땲�떎."
- swal.close();
+ //swal.close();
$scope.fn.cancel();
// 蹂�寃쎈맂 �씠�뒋 �뀒�씠釉� �젙蹂대�� �씠�뒋 紐⑸줉 �뀒�씠釉붿뿉 媛깆떊�븳�떎.
$rootScope.$broadcast("getIssueDetail", { id : $rootScope.currentDetailIssueId});
-
}
else {
SweetAlert.error($filter("translate")("issue.failedToSaveIssueTableSetting"), result.data.message.message); // �씠�뒋 �뀒�씠釉� �꽕�젙 ���옣 �떎�뙣
diff --git a/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
index 6b37351..7a75a3b 100644
--- a/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
@@ -117,7 +117,7 @@
if (result.data.message.status === "success") {
SweetAlert.success($filter("translate")("issue.completedSavingIssueTable"), $filter("translate")("issue.saveIssueTableSettingsInformation")); // "�씠�뒋 �뀒�씠釉� �꽕�젙 ���옣 �셿猷�", "�씠�뒋 �뀒�씠釉� �꽕�젙 �젙蹂닿� ���옣�릺�뿀�뒿�땲�떎."
- swal.close();
+ //swal.close();
$scope.fn.cancel();
// 蹂�寃쎈맂 �씠�뒋 �뀒�씠釉� �젙蹂대�� �씠�뒋 紐⑸줉 �뀒�씠釉붿뿉 媛깆떊�븳�떎.
$rootScope.$broadcast("getIssueDetail", { id : $rootScope.currentDetailIssueId});
diff --git a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
index 51d7929..683c1ef 100644
--- a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
@@ -123,15 +123,14 @@
if (result.data.message.status === "success") {
SweetAlert.success($filter("translate")("issue.completedSavingIssueTable"), $filter("translate")("issue.saveIssueTableSettingsInformation")); // "�씠�뒋 �뀒�씠釉� �꽕�젙 ���옣 �셿猷�", "�씠�뒋 �뀒�씠釉� �꽕�젙 �젙蹂닿� ���옣�릺�뿀�뒿�땲�떎."
- // 蹂�寃쎈맂 �씠�뒋 �뀒�씠釉� �젙蹂대�� �씠�뒋 紐⑸줉 �뀒�씠釉붿뿉 媛깆떊�븳�떎.
- swal.close();
+ //swal.close();
$scope.fn.cancel();
+ // 蹂�寃쎈맂 �씠�뒋 �뀒�씠釉� �젙蹂대�� �씠�뒋 紐⑸줉 �뀒�씠釉붿뿉 媛깆떊�븳�떎.
$rootScope.$broadcast("getIssueTableConfigs", {});
}
else {
SweetAlert.error($filter("translate")("issue.failedToSaveIssueTableSetting"), result.data.message.message); // �씠�뒋 �뀒�씠釉� �꽕�젙 ���옣 �떎�뙣
}
-
$rootScope.spinner = false;
});
}
diff --git a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
index b5f5eaf..aee27e2 100644
--- a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
+++ b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
@@ -87,7 +87,7 @@
//parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "",
locale: {
- format: 'YYYY-MM-DD H:mm:ss',
+ format: 'YYYY-MM-DD HH:mm:ss',
separator: "~",
applyLabel: options.applyLabel,
cancelLabel: options.cancelLabel,
@@ -112,7 +112,7 @@
//parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "",
locale: {
- format: 'YYYY-MM-DD H:mm:ss',
+ format: 'YYYY-MM-DD HH:mm:ss',
separator: "~",
applyLabel: options.applyLabel,
cancelLabel: options.cancelLabel,
--
Gitblit v1.8.0