From 5661395c94fc8b3c3882a549845073a40b29e4c4 Mon Sep 17 00:00:00 2001 From: won503 Date: Mon, 15 May 2023 14:34:13 +0900 Subject: [PATCH] =?UTF-8?q?workstate=EB=A6=AC=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/sysMgt/service/sysMgtApi.js | 6 +++++ .../src/modules/sysMgt/views/WorkState.vue | 16 ++++++++----- .../co/uplus/ez/api/sysMgt/SysMgtService.java | 23 +++++++++++-------- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/frontend/src/modules/sysMgt/service/sysMgtApi.js b/frontend/src/modules/sysMgt/service/sysMgtApi.js index cb89df5..2bec0a3 100644 --- a/frontend/src/modules/sysMgt/service/sysMgtApi.js +++ b/frontend/src/modules/sysMgt/service/sysMgtApi.js @@ -90,6 +90,11 @@ const setWorkState = (params) => { return httpClient.post('/api/v1/bo/sysMgt/setWorkState', params, { withCredentials: false }) } +const svcCheckList = (params) => { + console.log("api호출",params) + return httpClient.post('/api/v1/bo/sysMgt/svcCheckList', params, { withCredentials: false }) +} + export default { insertAdmin, @@ -111,4 +116,5 @@ export default { batchExecuteJob, notiList, setWorkState, + svcCheckList, } diff --git a/frontend/src/modules/sysMgt/views/WorkState.vue b/frontend/src/modules/sysMgt/views/WorkState.vue index ae0708b..334d1da 100644 --- a/frontend/src/modules/sysMgt/views/WorkState.vue +++ b/frontend/src/modules/sysMgt/views/WorkState.vue @@ -81,19 +81,23 @@ export default { startDate: new Date(), totalItems: 0, grid: { - url: '/api/v1/bo/sysMgt/notiList', + url: '/api/v1/bo/sysMgt/svcCheckList', pagePerRows: 50, pagination: true, addCls: 'box_OFvis', initialRequest: false, columns: [ - { name: 'day', header: '날짜', align: 'center', width: '15%' }, - { name: 'userId', header: '시작 시간', align: 'center', width: '15%' }, - { name: 'notiDiv', header: '종료 시간', align: 'center', width: '15%' }, - { name: 'webReqId', header: '상태 변경', align: 'center', width: '20%' }, + { name: 'ymd', header: '날짜', align: 'center', width: '15%' }, + { name: 'strHd', header: '시작시간', align: 'center', width: '15%' }, + { name: 'endHd', header: '종료시간', align: 'center', width: '15%' }, + { name: 'workState', header: '상태 변경', align: 'center', width: '20%' }, ], noDataStr: '발송 내역이 없습니다.', params: { + ymd: '', + strHd: '', + endHd: '', + workState: '', }, startTime : '', endTime : '', @@ -123,7 +127,7 @@ export default { isKeep = true; } */ - this.grid.pagePerRows = 30; + this.grid.pagePerRows = 50; page = 1; this.search(isKeep); }, diff --git a/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtService.java b/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtService.java index 0b44513..6c15a05 100644 --- a/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtService.java +++ b/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtService.java @@ -571,7 +571,7 @@ public class SysMgtService { setWorkState += setWorkParam.getStartTimeT() + "@"; setWorkState += setWorkParam.getStartTimeM() + "@"; setWorkState += setWorkParam.getEndTimeT() + "@"; - setWorkState += setWorkParam.getEndTimeM(); + setWorkState += setWorkParam.getEndTimeM()+ ","; try { @@ -617,7 +617,7 @@ public class SysMgtService { //CheckList >= svcCheckList SvcCheckListRes svcCheckListRes = new SvcCheckListRes(); - List CheckList = new ArrayList<>(); + List CheckList = new ArrayList(); SvcCheckList svcCheckList = new SvcCheckList(); String nowPage = String.valueOf(svcCheckListReqDto.getPage()); @@ -641,6 +641,7 @@ public class SysMgtService { //항목 객체에 값 셋팅 for (int i = 0; i < Data.length; i++) { + svcCheckList = new SvcCheckList(); workStateDataArr = Data[i].split("@"); svcCheckList.setWorkState(workStateDataArr[0]); svcCheckList.setYear(workStateDataArr[1]); @@ -659,16 +660,22 @@ public class SysMgtService { svcCheckList.setEndHd(EndHd); log.debug("2번 ={}",svcCheckList); // 리스트에 항목 추가 - CheckList.add(svcCheckList); + CheckList.add(svcCheckList); + log.debug("3번 ={}",CheckList.get(i)); } + + log.debug("CheckList0={}",CheckList.get(0)); + log.debug("CheckList1={}",CheckList.get(1)); + log.debug("CheckList2={}",CheckList.get(2)); + log.debug("CheckList3={}",CheckList.get(3)); - log.debug("4번 ={}",CheckList); - totalCnt = Data.length; + svcCheckListRes.setList(CheckList); + log.debug("4번 ={}",svcCheckListRes.getList()); + totalCnt = CheckList.size(); int page = svcCheckListReqDto.getPage(); int pagePerRows = svcCheckListReqDto.getPagePerRows(); page = (page - 1) * pagePerRows; svcCheckListReqDto.setPage(page); - log.debug("22번 ={}",svcCheckList); } } catch (Exception e) { // 파일 읽기 실패 시 "USE"로 설정하고 결과 반환 @@ -677,8 +684,7 @@ public class SysMgtService { log.debug("5번 ={}",svcCheckList.getWorkState()); String[] Data = workStateData.split(","); - log.debug("222번 ={}",svcCheckList); - totalCnt = Data.length; + totalCnt = CheckList.size(); int page = svcCheckListReqDto.getPage(); int pagePerRows = svcCheckListReqDto.getPagePerRows(); page = (page - 1) * pagePerRows; @@ -697,7 +703,6 @@ public class SysMgtService { } - log.debug("2222번 ={}",svcCheckList); // CheckList = sysmgtmapper.svcCheckListSelect(svcCheckListReqDto); svcCheckListRes.setList(CheckList); Paging paging = new Paging();