From a678bb5a9987757f9e7b13dc65c4194e444b4947 Mon Sep 17 00:00:00 2001 From: kubo8 Date: Mon, 21 Nov 2022 10:19:10 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B2=AD=EC=95=BD=20=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=ED=99=94=EB=A9=B4=20=3D>=20=EC=82=AC?= =?UTF-8?q?=EC=97=85=EC=9E=90=20=EB=B2=88=ED=98=B8,=20=EA=B2=B0=ED=95=A9?= =?UTF-8?q?=EC=97=AC=EB=B6=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/custMgt/views/SubsList.vue | 18 ++++++++++-------- .../co/uplus/ez/api/custMgt/dto/SubsList.java | 4 ++++ .../mapper/mysql/custMgt/custMgt-mapper.xml | 10 +++++++++- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/frontend/src/modules/custMgt/views/SubsList.vue b/frontend/src/modules/custMgt/views/SubsList.vue index 7050703..6a52e0b 100644 --- a/frontend/src/modules/custMgt/views/SubsList.vue +++ b/frontend/src/modules/custMgt/views/SubsList.vue @@ -195,7 +195,7 @@ export default { name: 'serviceId', header: '서비스 ID\n(관리자 ID)', align: 'center', - width: '12%', + width: '10%', renderer: { type: CustomATagRenderer, options: { @@ -203,13 +203,15 @@ export default { }, }, }, - { name: 'custNm', header: '고객사명', align: 'center', width: '12%' }, - { name: 'regNo', header: '가입번호', align: 'center', width: '12%' }, - { name: 'regDt', header: '가입일', align: 'center', width: '12%', cls: 'td_line' }, - { name: 'stat', header: '상태', align: 'center', width: '12%' }, - { name: 'channel', header: '유치채널', align: 'center', width: '12%' }, - { name: 'plan', header: '요금제', align: 'center', width: '12%' }, - { name: 'carryOver', header: '이월누적금액', align: 'center', width: '12%' }, + { name: 'custNm', header: '고객사명', align: 'center', width: '10%' }, + { name: 'bizrNo', header: '사업자번호', align: 'center', width: '10%' }, + { name: 'regNo', header: '가입번호', align: 'center', width: '10%' }, + { name: 'regDt', header: '가입일', align: 'center', width: '10%', cls: 'td_line' }, + { name: 'stat', header: '상태', align: 'center', width: '10%' }, + { name: 'channel', header: '유치채널', align: 'center', width: '8%' }, + { name: 'bindDcYn', header: '결합여부', align: 'center', width: '8%' }, + { name: 'plan', header: '요금제', align: 'center', width: '10%' }, + { name: 'carryOver', header: '이월누적금액', align: 'center', width: '10%' }, ], noDataStr: '검색 결과가 없습니다.', params: { diff --git a/src/main/java/kr/co/uplus/ez/api/custMgt/dto/SubsList.java b/src/main/java/kr/co/uplus/ez/api/custMgt/dto/SubsList.java index 89e2c03..2600a2f 100644 --- a/src/main/java/kr/co/uplus/ez/api/custMgt/dto/SubsList.java +++ b/src/main/java/kr/co/uplus/ez/api/custMgt/dto/SubsList.java @@ -15,6 +15,8 @@ public class SubsList implements Serializable { private String serviceId; @ApiModelProperty(example = "고객사명", name = "고객사명", dataType = "String") private String custNm; + @ApiModelProperty(example = "사업자번호", name = "사업자번호", dataType = "String") + private String bizrNo; @ApiModelProperty(example = "가입번호", name = "가입번호", dataType = "String") private String regNo; @ApiModelProperty(example = "가입일", name = "가입일", dataType = "String") @@ -23,6 +25,8 @@ public class SubsList implements Serializable { private String stat; @ApiModelProperty(example = "유치채널", name = "유치채널", dataType = "String") private String channel; + @ApiModelProperty(example = "결합여부", name = "결합여부", dataType = "String") + private String bindDcYn; @ApiModelProperty(example = "요금제", name = "요금제", dataType = "String") private String plan; @ApiModelProperty(example = "이월누적금액", name = "이월누적금액", dataType = "String") diff --git a/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml b/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml index 7cbe8d8..1ffeefe 100644 --- a/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml +++ b/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml @@ -29,6 +29,7 @@ @ROWNUM := @ROWNUM + 1 AS NO , A.SERVICE_ID , A.CUST_NM + , A.BIZR_NO , A.REG_NO , A.REG_DT , ( @@ -65,6 +66,7 @@ WHERE PROD_CD = A.PROD_CD ) AS PLAN + , A.BIND_DC_YN , IFNULL((SELECT CFWD_AMT FROM hubez_admin.EZ_USER_LMT WHERE USER_SEQ = A.adminSeq AND LMT_YM = DATE_FORMAT(NOW(), '%Y%m')), 0) AS CARRY_OVER -- 년월까지만 비교 해야 함. FROM ( @@ -75,12 +77,14 @@ ELSE eci.CUST_NM END AS CUST_NM, + eci.BIZRNO AS BIZR_NO, esi.ENTR_NO as REG_NO, DATE_FORMAT(esi.SUBS_DT, '%Y-%m-%d') AS REG_DT, esi.SUBS_STTUS_CD , esi.PROD_CD, esi.USER_SEQ as adminSeq, - esi.ATTRCTOR_ID as attrctorId , + esi.ATTRCTOR_ID as attrctorId, + esi.BIND_DC_YN, eiu.EX_PROVUSERTYPE FROM hubez_common.EZ_SUBS_INFO esi @@ -104,6 +108,7 @@ @ROWNUM := @ROWNUM + 1 AS NO , A.SERVICE_ID , A.CUST_NM + , A.BIZR_NO , A.REG_NO , A.REG_DT , ( @@ -143,6 +148,7 @@ WHERE PROD_CD = A.PROD_CD ) AS PLAN + , A.BIND_DC_YN , IFNULL((SELECT CFWD_AMT FROM hubez_admin.EZ_USER_LMT WHERE USER_SEQ = A.adminSeq AND LMT_YM = DATE_FORMAT(NOW(), '%Y%m')), 0) AS CARRY_OVER -- 년월까지만 비교 해야 함. FROM ( @@ -153,11 +159,13 @@ ELSE eci.CUST_NM END AS CUST_NM, + eci.BIZRNO AS BIZR_NO, esi.ENTR_NO as REG_NO, DATE_FORMAT(esi.SUBS_DT, '%Y-%m-%d') AS REG_DT, esi.SUBS_STTUS_CD , esi.PROD_CD, esi.USER_SEQ as adminSeq, + esi.BIND_DC_YN, esi.ATTRCTOR_ID as attrctorId FROM hubez_common.EZ_SUBS_INFO esi