From 7b037acde3695d73f77bf0e36f0409b2c91730b7 Mon Sep 17 00:00:00 2001 From: USER Date: Thu, 21 Jul 2022 14:25:49 +0900 Subject: [PATCH] =?UTF-8?q?=EC=95=8C=EB=A6=BC=ED=86=A1=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C,=20=EC=B0=A8=EB=8B=A8=EB=82=B4=EC=97=AD=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/channelMgt/views/TmpltList.vue | 29 +++++++------------ frontend/src/modules/riskMgt/views/All.vue | 5 +++- .../mapper/mysql/riskMgt/riskMgt-mapper.xml | 6 ++-- .../mapper/mysql/stats/stats-mapper.xml | 16 +++++----- .../mapper/mysql/sysMgt/sysMgt-mapper.xml | 2 +- 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/frontend/src/modules/channelMgt/views/TmpltList.vue b/frontend/src/modules/channelMgt/views/TmpltList.vue index 8766537..78cba2f 100644 --- a/frontend/src/modules/channelMgt/views/TmpltList.vue +++ b/frontend/src/modules/channelMgt/views/TmpltList.vue @@ -94,7 +94,7 @@ export default { ], grid: { url: '/api/v1/bo/channelMgt/tmpltList', - perPage: 50, + perPage: 20, pagination: true, isCheckbox: false, initialRequest: false, @@ -141,11 +141,9 @@ export default { channelMgtApi, commonModal, }, - created() { - // const getCondition = this.$store.getters['searchcondition/getSearchCondition']; + created() { this.getExcelHeader(); - this.setCodeData(); - this.grid.pagePerRows = this.perPageCnt; + this.setCodeData(); }, destroyed() { this.$store.commit('searchcondition/updateSearchCondition', { @@ -168,7 +166,7 @@ export default { // store에 저장된 페이지 정보 및 검색 조건을 불러오기 let isKeep = false; if (getCondition) { - this.grid.pagePerRows = 50; + this.grid.pagePerRows = getCondition.perPage; this.grid.params = getCondition.params; page = getCondition.page; isKeep = true; @@ -176,28 +174,22 @@ export default { this.search(isKeep); }, methods: { - search: function (isKeep) { - console.log(this.grid.params); - this.grid.params.searchType1 = this.searchType1 - this.grid.params.searchType2 = this.searchType2 - this.grid.params.pagePerRows = this.perPageCnt - this.grid.perPage = this.perPageCnt - - console.log(this.grid) + search: function (isKeep) { + this.grid.params.searchType1 = this.searchType1; + this.grid.params.searchType2 = this.searchType2; + this.grid.params.pagePerRows = this.perPageCnt; + this.grid.perPage = this.perPageCnt; + this.$refs.table.search(this.grid.params, isKeep); this.sendStoreData(); }, sendStoreData: function () { const getP = this.$refs.table.getPagination(); - console.log("==========getP : " + getP); this.$store.commit('searchcondition/updateSearchCondition', { page: getP._currentPage, perPage: this.perPageCnt, params: this.grid.params }); - - const getCondition = this.$store.getters['searchcondition/getSearchCondition']; - //console.log("getCondition : "+ getCondition.perPage); }, async getExcelDataDown() { try { @@ -254,6 +246,7 @@ export default { }, changePerPage: function () { // 페이지당 조회할 개수 this.grid.pagePerRows = this.perPageCnt; + this.search(true); }, }, diff --git a/frontend/src/modules/riskMgt/views/All.vue b/frontend/src/modules/riskMgt/views/All.vue index 1e6ef94..706d44a 100644 --- a/frontend/src/modules/riskMgt/views/All.vue +++ b/frontend/src/modules/riskMgt/views/All.vue @@ -306,7 +306,10 @@ export default { //회원 상세페이지로 이동 custDetail(props) { //this.row.custNm = props.serviceId; - this.row.serviceId = props.serviceId; + + console.log('=-==-=-=-='); + console.log(props); + this.row.serviceId = props.serviceId; this.$router.push({name: 'subsDetail', params: this.row}); }, calendarCalbackFnc(year, month, day) { diff --git a/src/main/resources/mapper/mysql/riskMgt/riskMgt-mapper.xml b/src/main/resources/mapper/mysql/riskMgt/riskMgt-mapper.xml index e36b143..dcb677d 100644 --- a/src/main/resources/mapper/mysql/riskMgt/riskMgt-mapper.xml +++ b/src/main/resources/mapper/mysql/riskMgt/riskMgt-mapper.xml @@ -391,14 +391,14 @@ ,(SELECT ecd.DTL_CD_NM FROM hubez_common.EZ_CD_DTL ecd WHERE ecd.GRP_CD = 'WEBBLCK_TP_CD' AND DTL_CD = A.BLCK_TP_CD) AS BLCK_TP_CD , A.CUST_SEQ , A.USER_SEQ - , A.USER_ID - ,(SELECT esu1.USER_ID FROM hubez_common.EZ_SVC_USER esu1 WHERE esu1.PRNTS_USER_SEQ = A.USER_SEQ LIMIT 1 ) AS SERVICE_ID + , A.USER_ID , A.SNDRNO , A.CUST_NM , A.BIZRNO , A.RCVNO ,(SELECT DTL_CD_NM FROM hubez_common.EZ_CD_DTL WHERE GRP_CD = 'SNDBLCK_RSN_CD' AND DTL_CD = A.BLCK_RSN_CD) AS BLCK_RSN_CD , DATE_FORMAT(A.BLCK_DT, '%Y-%m-%d') AS BLCK_DT + , (SELECT B.USER_ID FROM hubez_common.EZ_SVC_USER B WHERE B.USER_SEQ = (SELECT esu2.PRNTS_USER_SEQ FROM hubez_common.EZ_SVC_USER esu2 WHERE esu2.USER_SEQ = A.USER_SEQ LIMIT 1)) AS SERVICE_ID FROM ( SELECT @@ -412,7 +412,7 @@ , BIZRNO , RCVNO , ewb.BLCK_RSN_CD - , ewb.BLCK_DT + , ewb.BLCK_DT FROM hubez_common.EZ_WEBSND_BLCK ewb WHERE 1 = 1 diff --git a/src/main/resources/mapper/mysql/stats/stats-mapper.xml b/src/main/resources/mapper/mysql/stats/stats-mapper.xml index 7aaf64f..1fc43be 100644 --- a/src/main/resources/mapper/mysql/stats/stats-mapper.xml +++ b/src/main/resources/mapper/mysql/stats/stats-mapper.xml @@ -659,7 +659,7 @@ /* stats-mapper.xml(selectCustDstatExcelList) */ - select DATE_FORMAT(t1.SUM_YMD, '%Y-%m') AS SUM_YMD + select DATE_FORMAT(t1.SUM_YMD, '%Y-%m-%d') AS SUM_YMD , t1.CUST_NM AS CUST_NM , t1.BIZRNO AS BIZRNO , (t2.sndCntS + t2.sndCntL + t2.sndCntM + t2.sndCntR) AS SND_CNT @@ -845,7 +845,7 @@ AND SUM_YMD BETWEEN DATE_FORMAT(#{startDay},'%Y%m%d') AND DATE_FORMAT(#{endDay},'%Y%m%d') group by ecm.SUM_YMD , ecm.USER_SEQ - ORDER BY ecm.SUM_YMD DESC, ecm.USER_SEQ + ORDER BY ecm.SUM_YMD , ecm.USER_SEQ ) list ) t1 inner join ( select SUM_YMD @@ -921,7 +921,7 @@ AND SUM_YMD BETWEEN DATE_FORMAT(#{startDay},'%Y%m%d') AND DATE_FORMAT(#{endDay},'%Y%m%d') group by ecm.SUM_YMD , ecm.USER_SEQ - ORDER BY ecm.SUM_YMD DESC, ecm.USER_SEQ + ORDER BY ecm.SUM_YMD , ecm.USER_SEQ ) list ) list on list.SUM_YMD = ecm.SUM_YMD and list.USER_SEQ = ecm.USER_SEQ @@ -947,7 +947,7 @@ AND SUM_YMD BETWEEN DATE_FORMAT(#{startDay},'%Y%m%d') AND DATE_FORMAT(#{endDay},'%Y%m%d') group by ecm.SUM_YMD , ecm.USER_SEQ - ORDER BY ecm.SUM_YMD DESC, ecm.USER_SEQ + ORDER BY ecm.SUM_YMD , ecm.USER_SEQ ) list ) list on list.SUM_YMD = ecm.SUM_YMD and list.USER_SEQ = ecm.USER_SEQ diff --git a/src/main/resources/mapper/mysql/sysMgt/sysMgt-mapper.xml b/src/main/resources/mapper/mysql/sysMgt/sysMgt-mapper.xml index cfca1f5..67a4654 100644 --- a/src/main/resources/mapper/mysql/sysMgt/sysMgt-mapper.xml +++ b/src/main/resources/mapper/mysql/sysMgt/sysMgt-mapper.xml @@ -181,7 +181,7 @@ - /* sysMgt-mapper.xml(insertAuth) */ + /* sysMgt-mapper.xml(insertAuthMenu) */ INSERT INTO hubez_admin.EZ_ADM_AUTMENU( AUT_CD