diff --git a/frontend/src/modules/channelMgt/views/TmpltList.vue b/frontend/src/modules/channelMgt/views/TmpltList.vue index 28d88ca..3ea2cba 100644 --- a/frontend/src/modules/channelMgt/views/TmpltList.vue +++ b/frontend/src/modules/channelMgt/views/TmpltList.vue @@ -115,24 +115,22 @@ export default { { header: '템플릿 유형', childNames: [] }, { header: '상태', childNames: [] }, { header: '발신프로필', childNames: [] }, - { header: '등록ID', childNames: [] }, - { header: '등록자명', childNames: [] }, + { header: '등록ID(이름)', childNames: [] }, { header: '마지막 수정일', childNames: [] }, ], ], columns: [ - { name: 'no', header: 'No', align: 'center', width: '5%' }, - { name: 'custNm', header: '고객사명', align: 'center', width: '10%' }, - { name: 'bregNo', header: '사업자번호', align: 'center', width: '9%' }, + { name: 'no', header: 'No', align: 'center', width: '4%' }, + { name: 'custNm', header: '고객사명', align: 'center', width: '13%' }, + { name: 'bregNo', header: '사업자번호', align: 'center', width: '8%' }, // { name: 'tmpltCd', header: '템플릿코드', align: 'center', width: '12%' }, - { name: 'tmpltNm', header: '템플릿명', align: 'center', width: '18%' }, - { name: 'tmpltType', header: '템플릿 유형', align: 'center', width: '8%' }, + { name: 'tmpltNm', header: '템플릿명', align: 'center', width: '16%' }, + { name: 'tmpltType', header: '템플릿 유형', align: 'center', width: '6%' }, { name: 'stat', header: '상태', align: 'center', width: '7%' }, - { name: 'sendProfile', header: '발신프로필', align: 'center', width: '14%' }, - { name: 'userId', header: '등록ID', align: 'center', width: '10%' }, - { name: 'userNm', header: '등록자명', align: 'center', width: '10%' }, - { name: 'lastChgDt', header: '마지막 수정일', width: '9%', cls: 'td_line' }, + { name: 'sendProfile', header: '발신프로필', align: 'center', width: '28%' }, + { name: 'userInfo', header: '등록ID(이름)', align: 'center', width: '10%' }, + { name: 'lastChgDt', header: '마지막 수정일', width: '7%', cls: 'td_line' }, ], noDataStr: '검색 결과가 없습니다.', params: { diff --git a/src/main/java/kr/co/uplus/ez/api/channelMgt/dto/TmpltInfo.java b/src/main/java/kr/co/uplus/ez/api/channelMgt/dto/TmpltInfo.java index 1c1948b..73c9965 100644 --- a/src/main/java/kr/co/uplus/ez/api/channelMgt/dto/TmpltInfo.java +++ b/src/main/java/kr/co/uplus/ez/api/channelMgt/dto/TmpltInfo.java @@ -13,10 +13,8 @@ public class TmpltInfo implements Serializable { private Integer no; @ApiModelProperty(example = "주식회사", name = "고객사명", dataType = "String") private String custNm; - @ApiModelProperty(example = "test", name = "아이디", dataType = "String") - private String userId; - @ApiModelProperty(example = "홍길동", name = "이름", dataType = "String") - private String userNm; + @ApiModelProperty(example = "ID(이름)", name = "ID(이름)", dataType = "String") + private String userInfo; @ApiModelProperty(example = "1234512345", name = "사업자번호", dataType = "String") private String bRegNo; @ApiModelProperty(example = "01", name = "템플릿 코드", dataType = "String") diff --git a/src/main/resources/mapper/mysql/channelMgt/channelMgt-mapper.xml b/src/main/resources/mapper/mysql/channelMgt/channelMgt-mapper.xml index 4cf7ff7..cd7c452 100644 --- a/src/main/resources/mapper/mysql/channelMgt/channelMgt-mapper.xml +++ b/src/main/resources/mapper/mysql/channelMgt/channelMgt-mapper.xml @@ -18,8 +18,7 @@ SELECT @ROWNUM := @ROWNUM + 1 AS NO, A.custNm, - A.userId, - A.userNm, + A.userInfo, A.bRegNo, A.tmpltCd, A.tmpltNm, @@ -30,7 +29,7 @@ DATE_FORMAT(A.CHG_DT, '%Y-%m-%d') As lastChgDt FROM ( SELECT eci.CUST_NM AS custNm, - esu.USER_ID AS userId, + CONCAT(esu.USER_ID,"(",esu.USER_NM,")") AS userInfo, esu.USER_NM AS userNm, eci.BIZRNO AS bRegNo, eat.TMPLT_CD AS tmpltCd, @@ -76,8 +75,7 @@ SELECT @ROWNUM := @ROWNUM + 1 AS NO, A.custNm, - A.userId, - A.userNm, + A.userInfo, A.bRegNo, A.tmpltCd, A.tmpltNm, @@ -88,8 +86,7 @@ DATE_FORMAT(A.CHG_DT, '%Y-%m-%d') As lastChgDt FROM ( SELECT eci.CUST_NM AS custNm, - esu.USER_ID AS userId, - esu.USER_NM AS userNm, + CONCAT(esu.USER_ID,"(",esu.USER_NM,")") AS userInfo, eci.BIZRNO AS bRegNo, eat.TMPLT_CD AS tmpltCd, eat.TMPLT_NM AS tmpltNm,