From f400f0322fbd2e3f4da2499546b695c14d7e4b87 Mon Sep 17 00:00:00 2001 From: eastargh Date: Tue, 14 Jul 2026 15:05:57 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9C=A0=EB=9F=89=EC=A0=9C=EC=96=B4=20?= =?UTF-8?q?=EC=9D=B4=EB=A0=A5=20=EA=B2=80=EC=83=89=EC=A1=B0=EA=B1=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/inflow/inflowControlHistoryMan.jsp | 59 +++++++++++++------ .../onl/inflow/InflowControlLogService.java | 13 +++- .../onl/inflow/InflowControlService.java | 15 ++++- .../InflowControlHistoryManUISearch.java | 25 ++++++++ 4 files changed, 90 insertions(+), 22 deletions(-) diff --git a/WebContent/jsp/onl/admin/inflow/inflowControlHistoryMan.jsp b/WebContent/jsp/onl/admin/inflow/inflowControlHistoryMan.jsp index c9a402c..494dcc7 100644 --- a/WebContent/jsp/onl/admin/inflow/inflowControlHistoryMan.jsp +++ b/WebContent/jsp/onl/admin/inflow/inflowControlHistoryMan.jsp @@ -47,27 +47,40 @@ function groupNameFormat(cellvalue, options, rowObject) { return strVal; } -$(document).ready(function() { +$(document).ready(function() { $("input[name=searchStartYYYYMMDD],input[name=searchEndYYYYMMDD]").inputmask("yyyy-mm-dd",{'autoUnmask':true}); - + $("input[name=searchStartTime],input[name=searchEndTime]").inputmask("hh:mm:ss",{'autoUnmask':true}); + $("input[name=searchStartYYYYMMDD]").each(function(){ if ($(this).val() == undefined || $(this).val() == null || $(this).val() == ""){ $(this).val(getToday()); } }); - + $("input[name=searchEndYYYYMMDD]").each(function(){ if ($(this).val() == undefined || $(this).val() == null || $(this).val() == ""){ $(this).val(getToday()); } }); - - - var gridPostData = getSearchForJqgrid("cmd","LIST"); //jqgrid에서는 object 로 - + + $("input[name=searchStartTime]").each(function(){ + if ($(this).val() == undefined || $(this).val() == null || $(this).val() == ""){ + $(this).val("000000"); + } + }); + + $("input[name=searchEndTime]").each(function(){ + if ($(this).val() == undefined || $(this).val() == null || $(this).val() == ""){ + $(this).val("235959"); + } + }); + + + var gridPostData = getSearchForJqgrid("cmd","LIST"); //jqgrid에서는 object 로 + var start = $("input[name=searchStartYYYYMMDD]").val().replace(/-/gi,""); var end = $("input[name=searchEndYYYYMMDD]").val().replace(/-/gi,""); - + gridPostData["searchStartDate"] = start; gridPostData["searchEndDate"] = end; @@ -132,18 +145,20 @@ $(document).ready(function() { resizeJqGridWidth('grid','content_middle','1000'); $("#btn_search").click(function(){ - var postData = getSearchForJqgrid("cmd","LIST"); //jqgrid에서는 object 로 - + var postData = getSearchForJqgrid("cmd","LIST"); //jqgrid에서는 object 로 + var start = $("input[name=searchStartYYYYMMDD]").val().replace(/-/gi,""); var end = $("input[name=searchEndYYYYMMDD]").val().replace(/-/gi,""); - - if(start > end){ + var startTime = $("input[name=searchStartTime]").val(); + var endTime = $("input[name=searchEndTime]").val(); + + if((start + startTime) > (end + endTime)){ alert("조회기간을 확인해주세요."); return false; } $("input[name=searchStartDate]").val(start); $("input[name=searchEndDate]").val(end); - + postData["searchStartDate"] = start; postData["searchEndDate"] = end; @@ -197,14 +212,24 @@ $(document).ready(function() { <%= localeMessage.getString("infConHstMan.date") %> - + - ~ + + ~ + - - + + + + <%= localeMessage.getString("infConHstMan.instNm") %> + + <%= localeMessage.getString("infConHstMan.eaiSvcCd") %> + + <%= localeMessage.getString("infConHstMan.adpGrpNm") %> + + diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlLogService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlLogService.java index eccb2ef..c02626f 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlLogService.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlLogService.java @@ -1,5 +1,6 @@ package com.eactive.eai.rms.data.entity.onl.inflow; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -63,11 +64,19 @@ public class InflowControlLogService public Iterable findAll(InflowControlHistoryManUISearch uiSearch) { QInflowControlLog qInflowConfrolLog = QInflowControlLog.inflowControlLog; + String startTime = StringUtils.defaultIfEmpty(uiSearch.getSearchStartTime(), "000000"); + String endTime = StringUtils.defaultIfEmpty(uiSearch.getSearchEndTime(), "235959"); BooleanBuilder booleanBuilder = new BooleanBuilder(); booleanBuilder .and(qInflowConfrolLog.id.msgdpstyms - .between(uiSearch.getSearchStartDate() + "000000000", - uiSearch.getSearchEndDate() + "235959999")); + .between(uiSearch.getSearchStartDate() + startTime + "000", + uiSearch.getSearchEndDate() + endTime + "999")); + if (!StringUtils.isEmpty(uiSearch.getSearchInstanceName())) + booleanBuilder.and(qInflowConfrolLog.eaisevrinstncname.contains(uiSearch.getSearchInstanceName())); + if (!StringUtils.isEmpty(uiSearch.getSearchApiName())) + booleanBuilder.and(qInflowConfrolLog.eaisvcname.contains(uiSearch.getSearchApiName())); + if (!StringUtils.isEmpty(uiSearch.getSearchAdapterGroupName())) + booleanBuilder.and(qInflowConfrolLog.adptrbzwkgroupname.contains(uiSearch.getSearchAdapterGroupName())); return super.repository.findAll(booleanBuilder); } } diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlService.java index a73f6aa..fb2e2de 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlService.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlService.java @@ -294,12 +294,21 @@ public class InflowControlService extends AbstractDataService