Commit @db1ebefc1eafd4b3f703550f045f4082a9b01789

rosewiper 2024-01-05

카카오 친구톡 템플릿 리스트 정렬 오류 수정

@db1ebefc1eafd4b3f703550f045f4082a9b01789

cbb67f3

db1ebef

src/main/resources/egovframework/sqlmap/let/mjo/kakao/Kakao_FT_SQL_Mysql.xml

--- src/main/resources/egovframework/sqlmap/let/mjo/kakao/Kakao_FT_SQL_Mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/mjo/kakao/Kakao_FT_SQL_Mysql.xml


 	
 	<select id="kakaoFriendsTalkTemplateDAO.selectKakaoFriendsTemplateList" parameterClass="kakaoVO" resultClass="kakaoVO">
 	
-		SELECT COUNT(A.FRIEND_ID) OVER() AS totCnt ,
-			   A.FRIEND_ID AS friendId,
-		       A.USER_ID AS userId,
-		       A.SENDER_KEY AS senderKey,
-		       KPI.YELLOW_ID AS yellowId,
-		       A.TEMPLATE_NAME AS templateName,
-		       A.IMAGE_FILE_NAME AS imageFileName,
-		       A.IMAGE_URL AS templateImageUrl,
-		       A.IMAGE_TYPE AS imageType,
-		       A.IMAGE_TITLE AS imgTitle,
-		       A.IMAGE_LINK AS imgLink,
-		       A.TEMPLATE_CONTENTS AS templateContent,
-		       A.AD_FLAG AS adFlag,
-		       DATE_FORMAT(A.FRST_REGIST_PNTTM, '%Y-%m-%d %T') AS frstRegistPnttm,
-		       A.FRST_REGISTER_ID AS frstRegisterId,
-		       DATE_FORMAT(A.LAST_UPDT_PNTTM, '%Y-%m-%d %T') AS lastUpdtPnttm,
-		       A.LAST_UPDUSR_ID AS lastUpdusrId
-		FROM   ( SELECT  KFT.FRIEND_ID,
-		                KFT.USER_ID,
-		                KFT.SENDER_KEY,
-		                KFT.TEMPLATE_NAME,
-		                KFT.IMAGE_FILE_NAME,
-		                KFT.IMAGE_URL,
-		                KFT.IMAGE_TYPE,
-		                KFT.IMAGE_TITLE,
-		                KFT.IMAGE_LINK,
-		                KFT.TEMPLATE_CONTENTS,
-		                KFT.AD_FLAG,
-		                KFT.FRST_REGIST_PNTTM,
-		                KFT.FRST_REGISTER_ID,
-		                KFT.LAST_UPDT_PNTTM,
-		                KFT.LAST_UPDUSR_ID
-		       FROM     MJ_KAKAO_FRIENDS_TEMPLATE KFT
-		       WHERE    DELETE_YN                                       = 'N'
-		       AND      USER_ID                                         = #userId#
-		       AND      SENDER_KEY                                      = #senderKey#
-		       <isNotEmpty property="searchKeyword">
-		       		AND      KFT.TEMPLATE_NAME                            LIKE CONCAT ('%', #searchKeyword#,'%')
-			   </isNotEmpty>
-		       <isNotEmpty property="startDate">
-				<![CDATA[ 
-		       		AND      DATE_FORMAT(KFT.FRST_REGIST_PNTTM, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d')
-			       ]]>
-			   </isNotEmpty>
-			   <isNotEmpty property="startDate">
-				<![CDATA[ 
-		       		AND      DATE_FORMAT(KFT.FRST_REGIST_PNTTM, '%Y-%m-%d') <= DATE_FORMAT(#endDate#, '%Y-%m-%d')
-		       ]]>
-			   </isNotEmpty>
-		       ORDER BY 1                                               =1
-		       <isNotEmpty property="searchSortCnd">
-					<isEqual property="searchSortCnd" compareValue="curState">
-						, curState  $searchSortOrd$
-						, orderByrsltCode
-					</isEqual>
-					<isNotEqual  property="searchSortCnd" compareValue="curState">
-						,$searchSortCnd$
-					</isNotEqual>
-				</isNotEmpty>
-				<isNotEmpty property="searchSortOrd">
-					$searchSortOrd$
-				</isNotEmpty>
-				LIMIT  #recordCountPerPage# OFFSET #firstIndex#
-		       )
-		       A
-		       LEFT JOIN MJ_KAKAO_PROFILE_INFO KPI
-		       ON     A.USER_ID    = KPI.USER_ID
-		       AND    A.SENDER_KEY = KPI.SENDER_KEY
+		SELECT COUNT(KFT.FRIEND_ID) OVER() AS totCnt, 
+				KFT.FRIEND_ID AS friendId,
+                KFT.USER_ID AS userId,
+                KFT.SENDER_KEY AS senderKey,
+                KPI.YELLOW_ID AS yellowId,
+                KFT.TEMPLATE_NAME AS templateName,
+                KFT.IMAGE_FILE_NAME AS imageFileName,
+                KFT.IMAGE_URL AS templateImageUrl,
+                KFT.IMAGE_TYPE AS imageType,
+                KFT.IMAGE_TITLE AS imgTitle,
+                KFT.IMAGE_LINK AS imgLink,
+                KFT.TEMPLATE_CONTENTS AS templateContent,
+                KFT.AD_FLAG AS adFlag,
+                DATE_FORMAT(KFT.FRST_REGIST_PNTTM, '%Y-%m-%d %T') AS frstRegistPnttm,
+                KFT.FRST_REGISTER_ID AS frstRegisterId,
+                DATE_FORMAT(KFT.LAST_UPDT_PNTTM, '%Y-%m-%d %T') AS lastUpdtPnttm,
+                KFT.LAST_UPDUSR_ID AS lastUpdusrId
+       FROM     MJ_KAKAO_FRIENDS_TEMPLATE KFT
+       LEFT JOIN MJ_KAKAO_PROFILE_INFO KPI
+       ON     KFT.USER_ID    = KPI.USER_ID
+       AND    KFT.SENDER_KEY = KPI.SENDER_KEY
+       WHERE    KFT.DELETE_YN                                       = 'N'
+       AND      KFT.USER_ID                                         = #userId#
+       AND      KFT.SENDER_KEY                                      = #senderKey#
+       <isNotEmpty property="searchKeyword">
+       		AND      KFT.TEMPLATE_NAME                            LIKE CONCAT ('%', #searchKeyword#,'%')
+	   </isNotEmpty>
+       <isNotEmpty property="startDate">
+		<![CDATA[ 
+       		AND      DATE_FORMAT(KFT.FRST_REGIST_PNTTM, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d')
+	       ]]>
+	   </isNotEmpty>
+	   <isNotEmpty property="startDate">
+		<![CDATA[ 
+       		AND      DATE_FORMAT(KFT.FRST_REGIST_PNTTM, '%Y-%m-%d') <= DATE_FORMAT(#endDate#, '%Y-%m-%d')
+       ]]>
+	   </isNotEmpty>
+       ORDER BY 1                                               =1
+       <isNotEmpty property="searchSortCnd">
+			<isEqual property="searchSortCnd" compareValue="curState">
+				, curState  $searchSortOrd$
+				, orderByrsltCode
+			</isEqual>
+			<isNotEqual  property="searchSortCnd" compareValue="curState">
+				,$searchSortCnd$
+			</isNotEqual>
+		</isNotEmpty>
+		<isNotEmpty property="searchSortOrd">
+			$searchSortOrd$
+		</isNotEmpty>
+		LIMIT  #recordCountPerPage# OFFSET #firstIndex#
+		       
 	
 	</select>
 	

cbb67f3

db1ebef

src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateDetail.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateDetail.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateDetail.jsp


 			
 		}
 		
+		if(inputTemplateImageUrl == ''){
+			
+			alert("이미지를 선택해 주세요.");
+			return false;
+			
+		}
+		
 	}
 	
 	

 						$("#templateImageUrl").val("");
 						$('.kakao_image').css("display", "none");
 						$("#kakaoImg").attr("src", "");
+						$("#imageFileName").val("");
 						return false;
 						
 					}else{

cbb67f3

db1ebef

src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateListAjax.jsp


 			                        		</c:otherwise>
 			                        	</c:choose>
 			                        </td>
-			                        <td><c:out value="${templatInfoList.lastUpdtPnttm}"/></td>
+			                        <td><c:out value="${templatInfoList.frstRegistPnttm}"/></td>
 			                    </tr>
 			                </c:forEach>	
                 		</c:when>

cbb67f3

db1ebef

src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateRegist.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateRegist.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateRegist.jsp


 			
 		}
 		
+		if(inputTemplateImageUrl == ''){
+			
+			alert("이미지를 선택해 주세요.");
+			return false;
+			
+		}
+		
 	}
 	
 	

Add a comment

Open 0
Closed 0

List

...	...	@@ -96,74 +96,58 @@
96	96
97	97	<select id="kakaoFriendsTalkTemplateDAO.selectKakaoFriendsTemplateList" parameterClass="kakaoVO" resultClass="kakaoVO">
98	98
99		- SELECT COUNT(A.FRIEND_ID) OVER() AS totCnt ,
100		- A.FRIEND_ID AS friendId,
101		- A.USER_ID AS userId,
102		- A.SENDER_KEY AS senderKey,
103		- KPI.YELLOW_ID AS yellowId,
104		- A.TEMPLATE_NAME AS templateName,
105		- A.IMAGE_FILE_NAME AS imageFileName,
106		- A.IMAGE_URL AS templateImageUrl,
107		- A.IMAGE_TYPE AS imageType,
108		- A.IMAGE_TITLE AS imgTitle,
109		- A.IMAGE_LINK AS imgLink,
110		- A.TEMPLATE_CONTENTS AS templateContent,
111		- A.AD_FLAG AS adFlag,
112		- DATE_FORMAT(A.FRST_REGIST_PNTTM, '%Y-%m-%d %T') AS frstRegistPnttm,
113		- A.FRST_REGISTER_ID AS frstRegisterId,
114		- DATE_FORMAT(A.LAST_UPDT_PNTTM, '%Y-%m-%d %T') AS lastUpdtPnttm,
115		- A.LAST_UPDUSR_ID AS lastUpdusrId
116		- FROM ( SELECT KFT.FRIEND_ID,
117		- KFT.USER_ID,
118		- KFT.SENDER_KEY,
119		- KFT.TEMPLATE_NAME,
120		- KFT.IMAGE_FILE_NAME,
121		- KFT.IMAGE_URL,
122		- KFT.IMAGE_TYPE,
123		- KFT.IMAGE_TITLE,
124		- KFT.IMAGE_LINK,
125		- KFT.TEMPLATE_CONTENTS,
126		- KFT.AD_FLAG,
127		- KFT.FRST_REGIST_PNTTM,
128		- KFT.FRST_REGISTER_ID,
129		- KFT.LAST_UPDT_PNTTM,
130		- KFT.LAST_UPDUSR_ID
131		- FROM MJ_KAKAO_FRIENDS_TEMPLATE KFT
132		- WHERE DELETE_YN = 'N'
133		- AND USER_ID = #userId#
134		- AND SENDER_KEY = #senderKey#
135		- <isNotEmpty property="searchKeyword">
136		- AND KFT.TEMPLATE_NAME LIKE CONCAT ('%', #searchKeyword#,'%')
137		- </isNotEmpty>
138		- <isNotEmpty property="startDate">
139		- <![CDATA[
140		- AND DATE_FORMAT(KFT.FRST_REGIST_PNTTM, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d')
141		- ]]>
142		- </isNotEmpty>
143		- <isNotEmpty property="startDate">
144		- <![CDATA[
145		- AND DATE_FORMAT(KFT.FRST_REGIST_PNTTM, '%Y-%m-%d') <= DATE_FORMAT(#endDate#, '%Y-%m-%d')
146		- ]]>
147		- </isNotEmpty>
148		- ORDER BY 1 =1
149		- <isNotEmpty property="searchSortCnd">
150		- <isEqual property="searchSortCnd" compareValue="curState">
151		- , curState $searchSortOrd$
152		- , orderByrsltCode
153		- </isEqual>
154		- <isNotEqual property="searchSortCnd" compareValue="curState">
155		- ,$searchSortCnd$
156		- </isNotEqual>
157		- </isNotEmpty>
158		- <isNotEmpty property="searchSortOrd">
159		- $searchSortOrd$
160		- </isNotEmpty>
161		- LIMIT #recordCountPerPage# OFFSET #firstIndex#
162		- )
163		- A
164		- LEFT JOIN MJ_KAKAO_PROFILE_INFO KPI
165		- ON A.USER_ID = KPI.USER_ID
166		- AND A.SENDER_KEY = KPI.SENDER_KEY
	99	+ SELECT COUNT(KFT.FRIEND_ID) OVER() AS totCnt,
	100	+ KFT.FRIEND_ID AS friendId,
	101	+ KFT.USER_ID AS userId,
	102	+ KFT.SENDER_KEY AS senderKey,
	103	+ KPI.YELLOW_ID AS yellowId,
	104	+ KFT.TEMPLATE_NAME AS templateName,
	105	+ KFT.IMAGE_FILE_NAME AS imageFileName,
	106	+ KFT.IMAGE_URL AS templateImageUrl,
	107	+ KFT.IMAGE_TYPE AS imageType,
	108	+ KFT.IMAGE_TITLE AS imgTitle,
	109	+ KFT.IMAGE_LINK AS imgLink,
	110	+ KFT.TEMPLATE_CONTENTS AS templateContent,
	111	+ KFT.AD_FLAG AS adFlag,
	112	+ DATE_FORMAT(KFT.FRST_REGIST_PNTTM, '%Y-%m-%d %T') AS frstRegistPnttm,
	113	+ KFT.FRST_REGISTER_ID AS frstRegisterId,
	114	+ DATE_FORMAT(KFT.LAST_UPDT_PNTTM, '%Y-%m-%d %T') AS lastUpdtPnttm,
	115	+ KFT.LAST_UPDUSR_ID AS lastUpdusrId
	116	+ FROM MJ_KAKAO_FRIENDS_TEMPLATE KFT
	117	+ LEFT JOIN MJ_KAKAO_PROFILE_INFO KPI
	118	+ ON KFT.USER_ID = KPI.USER_ID
	119	+ AND KFT.SENDER_KEY = KPI.SENDER_KEY
	120	+ WHERE KFT.DELETE_YN = 'N'
	121	+ AND KFT.USER_ID = #userId#
	122	+ AND KFT.SENDER_KEY = #senderKey#
	123	+ <isNotEmpty property="searchKeyword">
	124	+ AND KFT.TEMPLATE_NAME LIKE CONCAT ('%', #searchKeyword#,'%')
	125	+ </isNotEmpty>
	126	+ <isNotEmpty property="startDate">
	127	+ <![CDATA[
	128	+ AND DATE_FORMAT(KFT.FRST_REGIST_PNTTM, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d')
	129	+ ]]>
	130	+ </isNotEmpty>
	131	+ <isNotEmpty property="startDate">
	132	+ <![CDATA[
	133	+ AND DATE_FORMAT(KFT.FRST_REGIST_PNTTM, '%Y-%m-%d') <= DATE_FORMAT(#endDate#, '%Y-%m-%d')
	134	+ ]]>
	135	+ </isNotEmpty>
	136	+ ORDER BY 1 =1
	137	+ <isNotEmpty property="searchSortCnd">
	138	+ <isEqual property="searchSortCnd" compareValue="curState">
	139	+ , curState $searchSortOrd$
	140	+ , orderByrsltCode
	141	+ </isEqual>
	142	+ <isNotEqual property="searchSortCnd" compareValue="curState">
	143	+ ,$searchSortCnd$
	144	+ </isNotEqual>
	145	+ </isNotEmpty>
	146	+ <isNotEmpty property="searchSortOrd">
	147	+ $searchSortOrd$
	148	+ </isNotEmpty>
	149	+ LIMIT #recordCountPerPage# OFFSET #firstIndex#
	150	+
167	151
168	152	</select>
169	153

...	...	@@ -365,6 +365,13 @@
365	365
366	366	}
367	367
	368	+ if(inputTemplateImageUrl == ''){
	369	+
	370	+ alert("이미지를 선택해 주세요.");
	371	+ return false;
	372	+
	373	+ }
	374	+
368	375	}
369	376
370	377
...	...	@@ -474,6 +481,7 @@
474	481	$("#templateImageUrl").val("");
475	482	$('.kakao_image').css("display", "none");
476	483	$("#kakaoImg").attr("src", "");
	484	+ $("#imageFileName").val("");
477	485	return false;
478	486
479	487	}else{

...	...	@@ -184,7 +184,7 @@
184	184	</c:otherwise>
185	185	</c:choose>
186	186	</td>
187		- <td><c:out value="${templatInfoList.lastUpdtPnttm}"/></td>
	187	+ <td><c:out value="${templatInfoList.frstRegistPnttm}"/></td>
188	188	</tr>
189	189	</c:forEach>
190	190	</c:when>

...	...	@@ -320,6 +320,13 @@
320	320
321	321	}
322	322
	323	+ if(inputTemplateImageUrl == ''){
	324	+
	325	+ alert("이미지를 선택해 주세요.");
	326	+ return false;
	327	+
	328	+ }
	329	+
323	330	}
324	331
325	332

Delete comment