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

Merge branch 'master' into kakaoFT

Browse Source
This commit is contained in:
rosewiper 2024-02-07 11:10:42 +09:00
commit 298f2df557
5 changed files with 105 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java
View File

@ -111,6 +111,30 @@ public class KakaoSentController {
//기본 등록일자 정렬
if(kakaoSentVO.getSearchSortCnd().equals("")) kakaoSentVO.setSearchSortCnd("regdate");
String startDate = kakaoSentVO.getStartDate();
String endDate = kakaoSentVO.getEndDate();
if(startDate == null && endDate == null ) {
Calendar cal = Calendar.getInstance();
Date now = new Date();
SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
//종료일은 오늘날짜
cal.setTime(now);
endDate = format.format(cal.getTime());
//시작일은 전날로 셋팅
cal.add(Calendar.DATE, -1);
startDate = format.format(cal.getTime());
kakaoSentVO.setStartDate(startDate);
kakaoSentVO.setEndDate(endDate);
}
model.addAttribute("searchKeyword", kakaoSentVO.getSearchKeyword());
model.addAttribute("kakaoSentVO", kakaoSentVO);

29
src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java
View File

@ -225,6 +225,29 @@ private static final Logger logger = LoggerFactory.getLogger(MjonMsgSentControll
}
String startDate = mjonMsgSentVO.getStartDate();
String endDate = mjonMsgSentVO.getEndDate();
if(startDate == null && endDate == null ) {
Calendar cal = Calendar.getInstance();
Date now = new Date();
SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
//종료일은 오늘날짜
cal.setTime(now);
endDate = format.format(cal.getTime());
//시작일은 전날로 셋팅
cal.add(Calendar.DATE, -1);
startDate = format.format(cal.getTime());
mjonMsgSentVO.setStartDate(startDate);
mjonMsgSentVO.setEndDate(endDate);
}
model.addAttribute("searchKeyword", mjonMsgSentVO.getSearchKeyword());
model.addAttribute("mjonMsgSentVO", mjonMsgSentVO);
model.addAttribute("siteId", mjonMsgSentVO.getSiteId());
@ -330,7 +353,11 @@ private static final Logger logger = LoggerFactory.getLogger(MjonMsgSentControll
model.addAttribute("totalRecordCount", paginationInfo.getTotalRecordCount());
//발송 결과 성공 실패 건수 리스트 불러오기
List<MjonMsgSentVO> resultMsgSucFailList = mjonMsgSentService.selectAllMsgSentSucFailList(resultAllSentList, mjonMsgSentVO);
List<MjonMsgSentVO> resultMsgSucFailList = new ArrayList<MjonMsgSentVO>();
if(resultAllSentList.size() > 0) {
resultMsgSucFailList = mjonMsgSentService.selectAllMsgSentSucFailList(resultAllSentList, mjonMsgSentVO);
}
model.addAttribute("resultMsgSucFailList", resultMsgSucFailList);
model.addAttribute("mjonMsgSentVO", mjonMsgSentVO);

47
src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java
View File

@ -210,6 +210,30 @@ public class MjonReservMsgController {
model.addAttribute("paginationInfo", paginationInfo);
model.addAttribute("totalRecordCount", paginationInfo.getTotalRecordCount());*/
String startDate = mjonResvMsgVO.getStartDate();
String endDate = mjonResvMsgVO.getEndDate();
if(startDate == null && endDate == null ) {
Calendar cal = Calendar.getInstance();
Date now = new Date();
SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
//종료일은 오늘날짜
cal.setTime(now);
endDate = format.format(cal.getTime());
//시작일은 전날로 셋팅
cal.add(Calendar.DATE, -1);
startDate = format.format(cal.getTime());
mjonResvMsgVO.setStartDate(startDate);
mjonResvMsgVO.setEndDate(endDate);
}
model.addAttribute("searchKeyword", mjonResvMsgVO.getSearchKeyword());
model.addAttribute("mjonResvMsgVO", mjonResvMsgVO);
model.addAttribute("siteId", mjonResvMsgVO.getSiteId());
@ -1417,6 +1441,29 @@ public class MjonReservMsgController {
//기본 등록일자 정렬
if(kakaoSentVO.getSearchSortCnd().equals("")) kakaoSentVO.setSearchSortCnd("regdate");
String startDate = kakaoSentVO.getStartDate();
String endDate = kakaoSentVO.getEndDate();
if(startDate == null && endDate == null ) {
Calendar cal = Calendar.getInstance();
Date now = new Date();
SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
//종료일은 오늘날짜
cal.setTime(now);
endDate = format.format(cal.getTime());
//시작일은 전날로 셋팅
cal.add(Calendar.DATE, -1);
startDate = format.format(cal.getTime());
kakaoSentVO.setStartDate(startDate);
kakaoSentVO.setEndDate(endDate);
}
model.addAttribute("searchKeyword", kakaoSentVO.getSearchKeyword());
model.addAttribute("kakaoSentVO", kakaoSentVO);

2
src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
View File

@ -811,7 +811,7 @@
AND DATE_FORMAT(REGDATE, '%Y-%m-%d') <= DATE_FORMAT(#endDate#, '%Y-%m-%d')
]]>
</isNotEmpty>
ORDER BY 1=1, MSG_ID DESC
ORDER BY 1=1, MSG_GROUP_ID DESC, MSG_ID DESC
<isNotEmpty property="searchSortCnd">
<isEqual property="searchSortCnd" compareValue="curState">
, curState $searchSortOrd$

10
src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataSMLView.jsp
View File

@ -4538,11 +4538,6 @@ function getMjMsgSentListAll(pageNo) {
<button type="button" class="btnType btnType10" onclick="javascript:fnTestSend(); return false;">테스트발송</button>
</div>
</div>
<!-- 엔터키로 발송 체크박스 -->
<div class="use_enter">
<input type="checkbox" id="enterChk" name="enterChk">
<label for="enterChk">Enter키로 발송하기</label>
</div>
<div class="rev_selected">
<div class="rev_top">
<span>날짜 :</span>
@ -4597,6 +4592,11 @@ function getMjMsgSentListAll(pageNo) {
<label for="divideTime">간격</label>
</div> -->
</div>
<!-- 엔터키로 발송 체크박스 -->
<div class="use_enter">
<input type="checkbox" id="enterChk" name="enterChk">
<label for="enterChk">Enter키로 발송하기</label>
</div>
</div>
</div>
</div>