tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wyh'

Browse Source
This commit is contained in:
wyh 2023-07-11 12:03:24 +09:00
commit 2b0f567531
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
View File

@ -1377,6 +1377,7 @@ public class EgovUserManageController {
sendKakaoVO.setSearchSortCnd("reqDate");
sendKakaoVO.setSearchSortOrd("desc");
sendKakaoVO.setFirstIndex(0);
sendKakaoVO.setPageType("sand");
List<KakaoVO> kakaoResultList = new ArrayList<KakaoVO>();
kakaoResultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList(sendKakaoVO);
@ -1395,6 +1396,7 @@ public class EgovUserManageController {
reserveKakaoVO.setSearchSortCnd("reqDate");
reserveKakaoVO.setSearchSortOrd("desc");
reserveKakaoVO.setFirstIndex(0);
reserveKakaoVO.setPageType("sand");
List<KakaoVO> kakaoReserveList = new ArrayList<KakaoVO>();
kakaoReserveList = mjonKakaoATService.selectReserveMjonKakaoATGroupList(reserveKakaoVO);

12
src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml
View File

@ -602,6 +602,11 @@
</isNotEmpty>
</isEmpty>
<isNotEmpty property="pageType">
<isEqual property="pageType" compareValue="sand">
AND M.CUR_STATE = '3'
</isEqual>
</isNotEmpty>
<isNotEmpty property="msgType">
<isEqual property="msgType" compareValue="8">
@ -1241,6 +1246,7 @@
, MD.BIZ_KAKAO_RESEND_YN
, MG.AT_DELAY_COMPLETE_YN
, MG.AT_DELAY_YN
, MD.REFUND_YN
FROM MJ_MSG_DATA MD ,
MJ_MSG_GROUP_DATA MG
WHERE MD.MSG_GROUP_ID = MG.MSG_GROUP_ID
@ -1323,6 +1329,12 @@
</isNotEmpty>
</isEmpty>
<isNotEmpty property="pageType">
<isEqual property="pageType" compareValue="sand">
AND M.AT_DELAY_COMPLETE_YN ='Y'
AND M.REFUND_YN = 'N'
</isEqual>
</isNotEmpty>
<isNotEmpty property="msgType">
<isEqual property="msgType" compareValue="8">