From 393f8029159a919f855b667c965a2d6a01917131 Mon Sep 17 00:00:00 2001 From: won503 Date: Tue, 28 Mar 2023 16:52:44 +0900 Subject: [PATCH] =?UTF-8?q?admin=5Fchrg=20=ED=8E=98=EC=9D=B4=EC=A7=95/=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custMgt/components/ChrgDetailPop.vue | 8 ++- .../src/modules/custMgt/views/ChrgList.vue | 9 ++- .../uplus/ez/api/custMgt/CustMgtMapper.java | 2 + .../uplus/ez/api/custMgt/CustMgtService.java | 42 ++++++++----- .../mapper/mysql/custMgt/custMgt-mapper.xml | 62 +++++++++++++++---- 5 files changed, 91 insertions(+), 32 deletions(-) diff --git a/frontend/src/modules/custMgt/components/ChrgDetailPop.vue b/frontend/src/modules/custMgt/components/ChrgDetailPop.vue index 5eaf404..7d5360d 100644 --- a/frontend/src/modules/custMgt/components/ChrgDetailPop.vue +++ b/frontend/src/modules/custMgt/components/ChrgDetailPop.vue @@ -188,8 +188,14 @@ export default { }, //삭제버튼 async ChrgDeleteModal(){ + try { - const response = await custMgtApi.deleteChrg(this.row); + var parammap = {chrgSeq : this.chrgSeq} + var list = []; + list.push(parammap); + var param = {list : list} + // "list":[{"chrgSeq":"66"}] + const response = await custMgtApi.deleteChrg(param); const result = response.data; if (result != null && result.retCode == "0000") { this.row.title = '충전금'; diff --git a/frontend/src/modules/custMgt/views/ChrgList.vue b/frontend/src/modules/custMgt/views/ChrgList.vue index 64c7ee2..632b7c1 100644 --- a/frontend/src/modules/custMgt/views/ChrgList.vue +++ b/frontend/src/modules/custMgt/views/ChrgList.vue @@ -174,7 +174,6 @@ export default { addCls: 'box_OFvis', columns:[ - {name: 'chrgSeq', header: 'chrgSeq', align: 'center', width: 60}, {name: 'no', header: 'No', align: 'center', width: 60}, { name: 'custNm', header: '고객사명', align: 'center', width: 130, @@ -355,14 +354,14 @@ export default { if (this.doValidate()) { this.row.title = '충전금 관리'; this.row.msg1 = '삭제 하시겠습니까?'; - console.log("row.list", this.row.list) + // console.log("row.list", this.row.list) this.$refs.commonModal.confirmModalOpen2(this.row); } }, async chrgdelete() { try { - console.log("this.row",this.row) + // console.log("this.row",this.row) let respose = await custMgtApi.deleteChrg(this.row); const result = respose.data; @@ -403,9 +402,9 @@ export default { this.$refs.commonModal.alertModalOpen(this.row); return false; } - console.log("row.chrgSeq",this.row.chrgSeq) + // console.log("row.chrgSeq",this.row.chrgSeq) const param = chkList.map((row) => ({ chrgSeq: row.chrgSeq })); - console.log("param",param) + // console.log("param",param) // console.log("chrgSeq",chrgSeq) this.row.list = param; return true; diff --git a/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtMapper.java b/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtMapper.java index 92dbaee..daeade1 100644 --- a/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtMapper.java +++ b/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtMapper.java @@ -111,6 +111,8 @@ public interface CustMgtMapper { /** 청구정보 카운트 조회.*/ int selectUserLmtListTotalCnt(UserLmtListReqDto userLmtListReqDto); + /** 충전관리 카운트 조회.*/ + int cntChrgList(ChrgListReqDto chrgListReqDto); /**충전관리 목록 조회*/ List selectChrgList(ChrgListReqDto chrgListReqDto); /** 충전관리 상세 조회 */ diff --git a/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java b/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java index 6308846..7e9663c 100644 --- a/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java +++ b/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java @@ -1010,32 +1010,46 @@ public class CustMgtService { public ChrgListResDto chrgList(ChrgListReqDto chrgListReqDto) { CustMgtMapper custMgtMapper = sqlSessionMaster.getMapper(CustMgtMapper.class); + String nowPage = String.valueOf(chrgListReqDto.getPage()); + int totalCnt = custMgtMapper.cntChrgList(chrgListReqDto); + + if (totalCnt == 0) { + + ChrgListRes chrgListRes = new ChrgListRes(); + chrgListRes.setList(new ArrayList<>()); + + Paging paging = new Paging(); + paging.setPage(nowPage); + paging.setTotalCnt(String.valueOf(totalCnt)); + chrgListRes.setPaging(paging); + + return new ChrgListResDto(ApiResponseCode.CM_NOT_FOUND, chrgListRes); + } + + int page = chrgListReqDto.getPage(); + int pagePerRows = chrgListReqDto.getPagePerRows(); + page = (page - 1) * pagePerRows; + chrgListReqDto.setPage(page); + List chrgList= custMgtMapper.selectChrgList(chrgListReqDto); - //for문 - //1. 시작일을 가져온다 - //2. 종료일을 가져온다 - //3. 기간이라는 변수에 담아준다(형태를 잡아야함)"시작일"add String "~" add"종료일"(리스트, + for (int i = 0; i < chrgList.size(); i++) { - - String startDt = chrgList.get(i).getStrtYm(); String endDt = chrgList.get(i).getEndYm(); - logger.debug("startDt={} ", startDt); - logger.debug("endDt={} ", endDt); - - -// String chrgDate = startDt + "~" +endDt ; chrgList.get(i).setChrgDate(startDt + "~" +endDt); -// logger.debug("chrgDate={} ", chrgDate); - } ChrgListRes chrgListRes = new ChrgListRes(); chrgListRes.setList(chrgList); - logger.debug("chrgList={}",chrgList); + + Paging paging = new Paging(); + paging.setPage(nowPage); + paging.setTotalCnt(String.valueOf(totalCnt)); + chrgListRes.setPaging(paging); + return new ChrgListResDto(ApiResponseCode.SUCCESS, chrgListRes); } diff --git a/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml b/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml index 9b0394c..b971517 100644 --- a/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml +++ b/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml @@ -1144,25 +1144,18 @@ ENTR_NO = #{entrNo} - - SELECT - @ROWNUM := @ROWNUM + 1 AS NO - , eci.CUST_NM - , esu.USER_ID - , ecm.CHRG_DIV - , ecm.STRT_YM - , ecm.END_YM - , ecm.CHRG_AMT - , ecm.USE_YN - , eci.BIZRNO - , ecm.CHRG_SEQ + + COUNT(*) AS TOTALCNT FROM hubez_admin.EZ_CHARGE_MNG ecm INNER JOIN hubez_common.EZ_SVC_USER esu ON esu.USER_SEQ = ecm.USER_SEQ INNER JOIN hubez_common.EZ_CUST_INFO eci ON eci.CUST_SEQ = esu.CUST_SEQ + INNER JOIN hubez_common.EZ_SUBS_INFO esi ON esi.USER_SEQ = ecm.USER_SEQ WHERE 1 = 1 AND ecm.USE_YN ='Y' + AND esi.SUBS_STTUS_CD ='02' AND (ecm.STRT_YM = ]]> STR_TO_DATE(concat(REPLACE(#{startDt}, '-', '' ),'000000') , '%Y%m') @@ -1183,6 +1176,51 @@ ORDER BY ecm.CHRG_SEQ DESC + + +