diff --git a/frontend/src/modules/custMgt/service/mock/subsExcelHeader.json b/frontend/src/modules/custMgt/service/mock/subsExcelHeader.json index 718fb0e..51fb44c 100644 --- a/frontend/src/modules/custMgt/service/mock/subsExcelHeader.json +++ b/frontend/src/modules/custMgt/service/mock/subsExcelHeader.json @@ -33,6 +33,10 @@ "key": "channel", "name": "유치채널" }, + { + "key": "nogrNm", + "name": "대리점" + }, { "key": "plan", "name": "요금제" diff --git a/frontend/src/modules/custMgt/views/SubsList.vue b/frontend/src/modules/custMgt/views/SubsList.vue index 5011888..f79e205 100644 --- a/frontend/src/modules/custMgt/views/SubsList.vue +++ b/frontend/src/modules/custMgt/views/SubsList.vue @@ -197,7 +197,7 @@ export default { name: 'serviceId', header: '서비스 ID\n(관리자 ID)', align: 'center', - width: '10%', + width: '9%', renderer: { type: CustomATagRenderer, options: { @@ -205,15 +205,16 @@ export default { }, }, }, - { name: 'custNm', header: '고객사명', align: 'center', width: '10%' }, - { name: 'bizrNo', header: '사업자번호', align: 'center', width: '10%' }, + { name: 'custNm', header: '고객사명', align: 'center', width: '9%' }, + { name: 'bizrNo', header: '사업자번호', align: 'center', width: '9%' }, { 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: 'regDt', header: '가입일', align: 'center', width: '9%', cls: 'td_line' }, + { name: 'stat', header: '상태', align: 'center', width: '8%' }, { name: 'channel', header: '유치채널', align: 'center', width: '8%' }, + { name: 'nogrNm', 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%' }, + { name: 'plan', header: '요금제', align: 'center', width: '9%' }, + { name: 'carryOver', header: '이월누적금액', align: 'center', width: '9%' }, ], 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 2600a2f..7231699 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 @@ -25,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 norgNm; @ApiModelProperty(example = "결합여부", name = "결합여부", dataType = "String") private String bindDcYn; @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 752467d..fc646ba 100644 --- a/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml +++ b/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml @@ -58,6 +58,9 @@ when A.EX_PROVUSERTYPE is null then '고객셀프가입' else '직접영업' end as CHANNEL + ,CASE WHEN A.NORG_NM IS NULL THEN '-' + ELSE A.NORG_NM + END AS norgNm , ( SELECT PROD_NM @@ -85,7 +88,8 @@ esi.USER_SEQ as adminSeq, esi.ATTRCTOR_ID as attrctorId, esi.BIND_DC_YN, - eiu.EX_PROVUSERTYPE + eiu.EX_PROVUSERTYPE, + eig.NORG_NM FROM hubez_common.EZ_SUBS_INFO esi INNER JOIN hubez_common.EZ_SVC_USER esu @@ -94,8 +98,10 @@ INNER JOIN hubez_common.EZ_CUST_INFO eci ON eci.CUST_SEQ = esi.CUST_SEQ AND esi.CUST_SEQ = esu.CUST_SEQ - LEFT JOIN hubez_imdb.EZ_IM_USER eiu - on eiu.LOGIN_ID = esi.ATTRCTOR_ID + LEFT OUTER JOIN hubez_imdb.EZ_IM_USER eiu + ON eiu.LOGIN_ID = esi.ATTRCTOR_ID + LEFT OUTER JOIN hubez_imdb.EZ_IM_GROUP eig + ON eiu.EX_DEPT_CD = eig.NORG_CD WHERE 1 = 1 ORDER BY esi.SUBS_DT DESC @@ -140,6 +146,9 @@ from hubez_imdb.EZ_IM_USER where LOGIN_ID = A.attrctorId ) , '고객셀프가입') as CHANNEL + ,CASE WHEN A.NORG_NM IS NULL THEN '-' + ELSE A.NORG_NM + END AS norgNm , ( SELECT PROD_NM @@ -166,7 +175,8 @@ esi.PROD_CD, esi.USER_SEQ as adminSeq, esi.BIND_DC_YN, - esi.ATTRCTOR_ID as attrctorId + esi.ATTRCTOR_ID as attrctorId, + eig.NORG_NM FROM hubez_common.EZ_SUBS_INFO esi INNER JOIN hubez_common.EZ_SVC_USER esu @@ -176,8 +186,10 @@ ON eci.CUST_SEQ = esi.CUST_SEQ AND esi.CUST_SEQ = esu.CUST_SEQ - LEFT JOIN hubez_imdb.EZ_IM_USER eiu - on eiu.LOGIN_ID = esi.ATTRCTOR_ID + LEFT OUTER JOIN hubez_imdb.EZ_IM_USER eiu + ON eiu.LOGIN_ID = esi.ATTRCTOR_ID + LEFT OUTER JOIN hubez_imdb.EZ_IM_GROUP eig + ON eiu.EX_DEPT_CD = eig.NORG_CD WHERE 1 = 1 ORDER BY esi.SUBS_DT DESC ) A, ( SELECT @ROWNUM := 0 ) AS R