Commit @298f2df557db4e406af1dd92fcc5c474994cd85a

rosewiper 2024-02-07

Merge branch 'master' into kakaoFT

@298f2df557db4e406af1dd92fcc5c474994cd85a

2b4bd24

298f2df

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

--- src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java

+++ src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java


 			
 		//기본 등록일자 정렬
 		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);

2b4bd24

298f2df

src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java

--- src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java

+++ src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java


     	
     	}
     	
+    	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());

     	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);

2b4bd24

298f2df

src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java

--- src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java

+++ src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java


     	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());

 			
 		//기본 등록일자 정렬
 		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);

2b4bd24

298f2df

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml


 					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$

2b4bd24

298f2df

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

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

+++ src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataSMLView.jsp


 		                        <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>

              		            <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>

Add a comment

Open 0
Closed 0

List

...	...	@@ -111,6 +111,30 @@
111	111
112	112	//기본 등록일자 정렬
113	113	if(kakaoSentVO.getSearchSortCnd().equals("")) kakaoSentVO.setSearchSortCnd("regdate");
	114	+
	115	+
	116	+ String startDate = kakaoSentVO.getStartDate();
	117	+ String endDate = kakaoSentVO.getEndDate();
	118	+
	119	+ if(startDate == null && endDate == null ) {
	120	+
	121	+ Calendar cal = Calendar.getInstance();
	122	+ Date now = new Date();
	123	+
	124	+ SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
	125	+
	126	+ //종료일은 오늘날짜
	127	+ cal.setTime(now);
	128	+ endDate = format.format(cal.getTime());
	129	+
	130	+ //시작일은 전날로 셋팅
	131	+ cal.add(Calendar.DATE, -1);
	132	+ startDate = format.format(cal.getTime());
	133	+
	134	+ kakaoSentVO.setStartDate(startDate);
	135	+ kakaoSentVO.setEndDate(endDate);
	136	+
	137	+ }
114	138
115	139	model.addAttribute("searchKeyword", kakaoSentVO.getSearchKeyword());
116	140	model.addAttribute("kakaoSentVO", kakaoSentVO);

...	...	@@ -225,6 +225,29 @@
225	225
226	226	}
227	227
	228	+ String startDate = mjonMsgSentVO.getStartDate();
	229	+ String endDate = mjonMsgSentVO.getEndDate();
	230	+
	231	+ if(startDate == null && endDate == null ) {
	232	+
	233	+ Calendar cal = Calendar.getInstance();
	234	+ Date now = new Date();
	235	+
	236	+ SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
	237	+
	238	+ //종료일은 오늘날짜
	239	+ cal.setTime(now);
	240	+ endDate = format.format(cal.getTime());
	241	+
	242	+ //시작일은 전날로 셋팅
	243	+ cal.add(Calendar.DATE, -1);
	244	+ startDate = format.format(cal.getTime());
	245	+
	246	+ mjonMsgSentVO.setStartDate(startDate);
	247	+ mjonMsgSentVO.setEndDate(endDate);
	248	+
	249	+ }
	250	+
228	251	model.addAttribute("searchKeyword", mjonMsgSentVO.getSearchKeyword());
229	252	model.addAttribute("mjonMsgSentVO", mjonMsgSentVO);
230	253	model.addAttribute("siteId", mjonMsgSentVO.getSiteId());
...	...	@@ -330,7 +353,11 @@
330	353	model.addAttribute("totalRecordCount", paginationInfo.getTotalRecordCount());
331	354
332	355	//발송 결과 성공 실패 건수 리스트 불러오기
333		- List<MjonMsgSentVO> resultMsgSucFailList = mjonMsgSentService.selectAllMsgSentSucFailList(resultAllSentList, mjonMsgSentVO);
	356	+ List<MjonMsgSentVO> resultMsgSucFailList = new ArrayList<MjonMsgSentVO>();
	357	+
	358	+ if(resultAllSentList.size() > 0) {
	359	+ resultMsgSucFailList = mjonMsgSentService.selectAllMsgSentSucFailList(resultAllSentList, mjonMsgSentVO);
	360	+ }
334	361	model.addAttribute("resultMsgSucFailList", resultMsgSucFailList);
335	362
336	363	model.addAttribute("mjonMsgSentVO", mjonMsgSentVO);

...	...	@@ -210,6 +210,30 @@
210	210	model.addAttribute("paginationInfo", paginationInfo);
211	211	model.addAttribute("totalRecordCount", paginationInfo.getTotalRecordCount());*/
212	212
	213	+
	214	+ String startDate = mjonResvMsgVO.getStartDate();
	215	+ String endDate = mjonResvMsgVO.getEndDate();
	216	+
	217	+ if(startDate == null && endDate == null ) {
	218	+
	219	+ Calendar cal = Calendar.getInstance();
	220	+ Date now = new Date();
	221	+
	222	+ SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
	223	+
	224	+ //종료일은 오늘날짜
	225	+ cal.setTime(now);
	226	+ endDate = format.format(cal.getTime());
	227	+
	228	+ //시작일은 전날로 셋팅
	229	+ cal.add(Calendar.DATE, -1);
	230	+ startDate = format.format(cal.getTime());
	231	+
	232	+ mjonResvMsgVO.setStartDate(startDate);
	233	+ mjonResvMsgVO.setEndDate(endDate);
	234	+
	235	+ }
	236	+
213	237	model.addAttribute("searchKeyword", mjonResvMsgVO.getSearchKeyword());
214	238	model.addAttribute("mjonResvMsgVO", mjonResvMsgVO);
215	239	model.addAttribute("siteId", mjonResvMsgVO.getSiteId());
...	...	@@ -1417,6 +1441,29 @@
1417	1441
1418	1442	//기본 등록일자 정렬
1419	1443	if(kakaoSentVO.getSearchSortCnd().equals("")) kakaoSentVO.setSearchSortCnd("regdate");
	1444	+
	1445	+ String startDate = kakaoSentVO.getStartDate();
	1446	+ String endDate = kakaoSentVO.getEndDate();
	1447	+
	1448	+ if(startDate == null && endDate == null ) {
	1449	+
	1450	+ Calendar cal = Calendar.getInstance();
	1451	+ Date now = new Date();
	1452	+
	1453	+ SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
	1454	+
	1455	+ //종료일은 오늘날짜
	1456	+ cal.setTime(now);
	1457	+ endDate = format.format(cal.getTime());
	1458	+
	1459	+ //시작일은 전날로 셋팅
	1460	+ cal.add(Calendar.DATE, -1);
	1461	+ startDate = format.format(cal.getTime());
	1462	+
	1463	+ kakaoSentVO.setStartDate(startDate);
	1464	+ kakaoSentVO.setEndDate(endDate);
	1465	+
	1466	+ }
1420	1467
1421	1468	model.addAttribute("searchKeyword", kakaoSentVO.getSearchKeyword());
1422	1469	model.addAttribute("kakaoSentVO", kakaoSentVO);

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

...	...	@@ -4538,11 +4538,6 @@
4538	4538	<button type="button" class="btnType btnType10" onclick="javascript:fnTestSend(); return false;">테스트발송</button>
4539	4539	</div>
4540	4540	</div>
4541		- <!-- 엔터키로 발송 체크박스 -->
4542		- <div class="use_enter">
4543		- <input type="checkbox" id="enterChk" name="enterChk">
4544		- <label for="enterChk">Enter키로 발송하기</label>
4545		- </div>
4546	4541	<div class="rev_selected">
4547	4542	<div class="rev_top">
4548	4543	<span>날짜 :</span>
...	...	@@ -4597,6 +4592,11 @@
4597	4592	<label for="divideTime">간격</label>
4598	4593	</div> -->
4599	4594	</div>
	4595	+ <!-- 엔터키로 발송 체크박스 -->
	4596	+ <div class="use_enter">
	4597	+ <input type="checkbox" id="enterChk" name="enterChk">
	4598	+ <label for="enterChk">Enter키로 발송하기</label>
	4599	+ </div>
4600	4600	</div>
4601	4601	</div>
4602	4602	</div>

Delete comment