TC 수정 반영

src/main/resources/mapper/mysql/sendNumMgt/sendNumMgt-mapper.xml

@@ -7,15 +7,12 @@
 		parameterType="kr.co.uplus.ez.api.sendNumMgt.dto.ProfileListReqDto"
 		resultType="int">
 		/* sysMgt-mapper.xml(selectAdmUserTotalCnt) */
-		SELECT
-		COUNT(*)
-		FROM hubez_common.EZ_SVC_USER esu
-		INNER JOIN hubez_common.EZ_KKO_CHNL ekc
-			ON esu.USER_SEQ = ekc.USER_SEQ
-			 AND ekc.MSGHB_STTUS_CD IN ('A','D')
-		INNER JOIN hubez_common.EZ_CUST_INFO eci
-			ON eci.CUST_SEQ = esu.CUST_SEQ
-		WHERE esu.USER_TP_CD ='01'
+		select count(*)
+		from hubez_common.EZ_KKO_CHNL ekc
+			inner join hubez_common.EZ_SVC_USER esu
+				on esu.USER_SEQ = ekc.USER_SEQ
+			inner join hubez_common.EZ_CUST_INFO eci
+				on eci.CUST_SEQ = esu.CUST_SEQ
 		<include refid="profileListCondition"></include>
 	</select>
 
@@ -24,32 +21,38 @@
 		resultType="kr.co.uplus.ez.api.sendNumMgt.dto.ProfileInfo">
 		/* sysMgt-mapper.xml(selectProfileList) */
 		SELECT
-		@ROWNUM := @ROWNUM + 1 AS NO,
-		A.*
+			  @ROWNUM := @ROWNUM + 1 AS NO
+			, A.custNm
+			, bRegNo
+			, sendProfile
+			, sendProfileKey
+			, DORM_YN
+			, case when A.MSGHB_STTUS_CD = 'D' then '삭제'
+				   when A.DORM_YN = 'Y' then '휴면'
+				   when A.BLCK_YN = 'Y' then '미사용'
+				   when A.MSGHB_STTUS_CD = 'A' then '사용'
+					else '미사용'
+				  end as stat
+			, DATE_FORMAT(A.REG_DT, '%Y-%m-%d') AS regDt
 		FROM
 		(
-		select eci.CUST_NM as custNm
-			, eci.BIZRNO as bRegNo
-			, ekc.CHNL_ID as sendProfile
-			, ekc.SNDRPROF_KEY as sendProfileKey
-			, ekc.DORM_YN
-			, case when ekc.DORM_YN = 'Y' then '휴면'
-			   when ekc.MSGHB_STTUS_CD = 'A' then '사용'
-			   when ekc.MSGHB_STTUS_CD = 'D' then '삭제'
-				else '미사용'
-			  end as stat
-			, DATE_FORMAT(ekc.REG_DT, '%Y-%m-%d') AS regDt
-		from hubez_common.EZ_SVC_USER esu
-		inner join hubez_common.EZ_KKO_CHNL ekc
-			on esu.USER_SEQ = ekc.USER_SEQ
-			 and ekc.MSGHB_STTUS_CD in ('A','D')
-		inner join hubez_common.EZ_CUST_INFO eci
-			on eci.CUST_SEQ = esu.CUST_SEQ
-		where esu.USER_TP_CD ='01'
-		<include refid="profileListCondition"></include>
-		ORDER BY ekc.REG_DT DESC
-		LIMIT #{page}, #{pagePerRows}) A,
-		( SELECT @ROWNUM := #{page} ) AS R
+			select eci.CUST_NM as custNm
+				, eci.BIZRNO as bRegNo
+				, ekc.CHNL_ID as sendProfile
+				, ekc.SNDRPROF_KEY as sendProfileKey
+				, ekc.DORM_YN
+				, ekc.MSGHB_STTUS_CD
+				, ekc.BLCK_YN
+				, ekc.REG_DT
+			from hubez_common.EZ_KKO_CHNL ekc
+				inner join hubez_common.EZ_SVC_USER esu
+					on esu.USER_SEQ = ekc.USER_SEQ
+				inner join hubez_common.EZ_CUST_INFO eci
+					on eci.CUST_SEQ = esu.CUST_SEQ
+			<include refid="profileListCondition"></include>
+			ORDER BY ekc.REG_DT DESC
+			LIMIT #{page}, #{pagePerRows}
+		) A, ( SELECT @ROWNUM := #{page} ) AS R
 	</select>
 
 	<sql id="profileListCondition">
@@ -57,19 +60,21 @@
 		<if test="searchType1 != null and searchType1 != ''">
 			<choose>
 				<when test='searchType1 == "A"'> <!-- 상태 사용-->
-					AND MSGHB_STTUS_CD = 'A'
-					AND BLCK_YN = 'N'
-					AND DORM_YN = 'N'
+					AND ekc.MSGHB_STTUS_CD = 'A'
+					AND ekc.BLCK_YN = 'N'
+					AND ekc.DORM_YN = 'N'
 				</when>
 				<when test='searchType1 == "N"'> <!-- 상태 미사용-->
-					AND MSGHB_STTUS_CD = 'A'
-					AND (BLCK_YN = 'Y' OR DORM_YN = 'Y')
+					AND ekc.BLCK_YN = 'Y'
+					AND MSGHB_STTUS_CD != 'D'
+					AND ekc.DORM_YN != 'Y'
 				</when>
 				<when test='searchType1 == "D"'> <!-- 상태 삭제-->
 					AND MSGHB_STTUS_CD = 'D'
 				</when>
 				<when test='searchType1 == "H"'> <!-- 상태 휴면-->
 					AND DORM_YN = 'Y'
+					AND MSGHB_STTUS_CD != 'D'
 				</when>
 			</choose>
 		</if>
@@ -77,13 +82,13 @@
 			<if test='searchType2 != null and searchType2 != ""'>
 				<choose>
 					<when test='searchType2 == "custNm"'><!-- 검색조건 - 고객사명 -->
-						and UPPER(eci.CUST_NM) LIKE CONCAT('%' , UPPER(#{searchText1}), '%')
+						and eci.CUST_NM LIKE CONCAT('%' , #{searchText1}, '%')
 					</when>
 					<when test='searchType2 == "bregNo"'><!-- 검색조건 - 사업자번호 -->
-						and eci.BIZRNO = #{searchText1}
+						and eci.BIZRNO like CONCAT('%', #{searchText1}, '%')
 					</when>
 					<when test='searchType2 == "sendProfile"'><!-- 검색조건 - 발신프로필 -->
-						and ekc.CHNL_ID = #{searchText1}
+						and ekc.CHNL_ID like CONCAT('%', #{searchText1}, '%')
 					</when>
 				</choose>
 			</if>
@@ -91,76 +96,58 @@
 	</sql>
 	<select id="selectSendNumberTotalCnt" parameterType="kr.co.uplus.ez.api.sendNumMgt.dto.SendNumberListReqDto" resultType="int">
 		/* sendNumMgt-mapper.xml(selectSendNumberTotalCnt) */
-		SELECT
-			COUNT(*)
-		FROM
-			hubez_common.EZ_CUST_INFO eci
-		INNER JOIN hubez_common.EZ_SVC_USER esu
-				ON
-			eci.CUST_SEQ = esu.CUST_SEQ
-		INNER JOIN hubez_common.EZ_SNDRNO_REG esr
-				ON
-			esr.USER_SEQ = esu.USER_SEQ
-		INNER JOIN hubez_common.EZ_SVC_SNDRNO ess
-				ON
-			esr.REG_REQ_NO = ess.REG_REQ_NO
-		WHERE 1=1
-		<include refid="numberListCondition"></include>
+		SELECT count(*)
+			from hubez_common.EZ_SVC_SNDRNO ess
+				inner join hubez_common.EZ_SNDRNO_REG esr
+					on esr.REG_REQ_NO = ess.REG_REQ_NO
+				inner join hubez_common.EZ_SVC_USER esu
+					on esu.USER_SEQ = esr.USER_SEQ
+				inner join hubez_common.EZ_CUST_INFO eci
+					on eci.CUST_SEQ = esu.CUST_SEQ
+			WHERE 1=1
+			<include refid="numberListCondition"></include>
 	</select>
 
 	<select id="selectSendNumberList" parameterType="kr.co.uplus.ez.api.sendNumMgt.dto.SendNumberListReqDto" resultType="kr.co.uplus.ez.api.sendNumMgt.dto.SendNumberInfo">
 		/* sendNumMgt-mapper.xml(selectSendNumberList) */
 		SELECT
-			@ROWNUM := @ROWNUM + 1 AS NO,
-			A.*
-			FROM
-			(
+			@ROWNUM := @ROWNUM + 1 AS NO
+			, A.CUST_NM
+			, REG_REQ_NO
+			, A.USER_ID as ADMIN_ID
+			, A.RQTR_ID AS register
+			, A.BIZRNO AS bRegNo
+			, (SELECT DTL_CD_NM FROM hubez_common.EZ_CD_DTL WHERE GRP_CD = 'NMINEE_DIV_CD' AND DTL_CD = A.NMINEE_DIV_CD) AS NMINEE_DIV_CD
+			, (SELECT DTL_CD_NM FROM hubez_common.EZ_CD_DTL WHERE GRP_CD = 'INCH_DIV_CD' AND DTL_CD = A.INCH_DIV_CD) AS INCH_DIV_CD
+			, (SELECT DTL_CD_NM FROM hubez_common.EZ_CD_DTL WHERE GRP_CD = 'SNDRNO_STTUS_CD' AND DTL_CD = A.STTUS_CD) AS sttusCd
+			, A.SNDRNO AS SNDRNO
+			, A.SEQ_NO
+			, DATE_FORMAT(A.REG_DT, '%Y-%m-%d') AS REG_DT
+		FROM
+		(
 			SELECT
-				eci.CUST_NM ,
-			    esr.REG_REQ_NO,
-				(SELECT esu2.USER_ID  FROM hubez_common.EZ_SVC_USER esu2 WHERE esu2.USER_SEQ = esu.PRNTS_USER_SEQ)AS ADMIN_ID,
-				esr.REG_ID AS register,
-				eci.BIZRNO AS bRegNo,
-				(SELECT
-								ecd.DTL_CD_NM
-							FROM
-								hubez_common.EZ_CD_DTL ecd
-							WHERE
-								ecd.GRP_CD = 'NMINEE_DIV_CD'
-								AND ecd.DTL_CD = ess.NMINEE_DIV_CD) AS NMINEE_DIV_CD,
-				(SELECT
-								ecd.DTL_CD_NM
-							FROM
-								hubez_common.EZ_CD_DTL ecd
-							WHERE
-								ecd.GRP_CD = 'INCH_DIV_CD'
-								AND ecd.DTL_CD = ess.INCH_DIV_CD) AS INCH_DIV_CD,
-				(SELECT
-						ecd.DTL_CD_NM
-					FROM
-						hubez_common.EZ_CD_DTL ecd
-					WHERE
-						ecd.GRP_CD = 'SNDRNO_STTUS_CD'
-						AND ecd.DTL_CD = ess.STTUS_CD) AS sttusCd,
-				ess.SNDRNO AS SNDRNO,
-				ess.SEQ_NO,
-				DATE_FORMAT(esr.REG_DT, '%Y-%m-%d') AS REG_DT
-			FROM
-				hubez_common.EZ_CUST_INFO eci
-			INNER JOIN hubez_common.EZ_SVC_USER esu
-					ON
-				eci.CUST_SEQ = esu.CUST_SEQ
-			INNER JOIN hubez_common.EZ_SNDRNO_REG esr
-					ON
-				esr.USER_SEQ = esu.USER_SEQ
-			INNER JOIN hubez_common.EZ_SVC_SNDRNO ess
-					ON
-				esr.REG_REQ_NO = ess.REG_REQ_NO
+				  eci.CUST_NM
+			    , esr.REG_REQ_NO
+			    , esu.USER_ID
+				, esr.RQTR_ID
+				, eci.BIZRNO
+				, ess.NMINEE_DIV_CD
+				, ess.INCH_DIV_CD
+				, ess.STTUS_CD
+				, ess.SNDRNO
+				, ess.SEQ_NO
+				, esr.REG_DT
+			from hubez_common.EZ_SVC_SNDRNO ess
+				inner join hubez_common.EZ_SNDRNO_REG esr
+					on esr.REG_REQ_NO = ess.REG_REQ_NO
+				inner join hubez_common.EZ_SVC_USER esu
+					on esu.USER_SEQ = esr.USER_SEQ
+				inner join hubez_common.EZ_CUST_INFO eci
+					on eci.CUST_SEQ = esu.CUST_SEQ
 			WHERE 1=1
 			<include refid="numberListCondition"></include>
-			ORDER BY eci.BIZRNO
-			LIMIT #{page}, #{pagePerRows}) A,
-			( SELECT @ROWNUM := #{page} ) AS R
+			ORDER BY ess.REG_DT , ess.REG_REQ_NO DESC
+			LIMIT #{page}, #{pagePerRows}) A, ( SELECT @ROWNUM := #{page} ) AS R
 	</select>
 
 	<sql id="numberListCondition">
@@ -180,13 +167,13 @@
 			<if test='searchType4 != null and searchType4 != ""'>
 				<choose>
 					<when test='searchType4 == "bregNo"'><!-- 검색조건 - 사업자번호 -->
-						AND eci.BIZRNO = #{searchText1}
+						AND eci.BIZRNO like CONCAT('%', #{searchText1}, '%')
 					</when>
 					<when test='searchType4 == "regNo"'><!-- 검색조건 - 발신번호 -->
-						AND ess.SNDRNO = #{searchText1}
+						AND ess.SNDRNO like CONCAT('%', #{searchText1}, '%')
 					</when>
 					<when test='searchType4 == "custNm"'><!-- 검색조건 - 고객사명 -->
-						AND UPPER(eci.CUST_NM) LIKE CONCAT('%' , UPPER(#{searchText1}), '%')
+						AND eci.CUST_NM LIKE CONCAT('%' , #{searchText1}, '%')
 					</when>
 				</choose>
 			</if>
@@ -201,7 +188,8 @@
 			hubez_common.EZ_SVC_USER esu, hubez_common.EZ_CUST_INFO eci
 		WHERE
 			esu.CUST_SEQ = eci.CUST_SEQ
-			AND esu.USER_ID = #{searchText1}
+		    AND esu.USER_TP_CD IN ('01', '03')
+			AND esu.USER_ID LIKE CONCAT('%' , #{searchText1}, '%')
 	</select>
 
 	<select id="selectAdminList" parameterType="kr.co.uplus.ez.api.sendNumMgt.dto.SendAdminListReqDto" resultType="kr.co.uplus.ez.api.sendNumMgt.dto.SendAdminInfo">
@@ -216,7 +204,8 @@
 			hubez_common.EZ_SVC_USER esu, hubez_common.EZ_CUST_INFO eci
 		WHERE
 			esu.CUST_SEQ = eci.CUST_SEQ
-			AND esu.USER_ID = #{searchText1}
+			AND esu.USER_TP_CD IN ('01', '03')
+		    AND esu.USER_ID LIKE CONCAT('%' , #{searchText1}, '%')
 	</select>
 
 	<select id="selectUserSeqByAdminId" parameterType="String" resultType="String">