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:
name 2023-07-24 17:39:45 +09:00
commit b657c8639c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1760,8 +1760,8 @@ public class MjonReservMsgController {
}else { }else {
if("0".equals(resultAllSentList.get(i).getCurState())) cell.setCellValue("발송대기"); if("0".equals(resultAllSentList.get(i).getCurState())) cell.setCellValue("발송대기");
if("1".equals(resultAllSentList.get(i).getCurState())) cell.setCellValue("발송중"); if("1".equals(resultAllSentList.get(i).getCurState())) cell.setCellValue("발송중");
if("3".equals(resultAllSentList.get(i).getCurState())) cell.setCellValue("결과대기"); if("2".equals(resultAllSentList.get(i).getCurState())) cell.setCellValue("결과대기");
if("4".equals(resultAllSentList.get(i).getCurState())) cell.setCellValue("발송완료"); if("3".equals(resultAllSentList.get(i).getCurState())) cell.setCellValue("발송완료");
} }
} }
if(j==2) cell.setCellValue(sdf.format((resultAllSentList.get(i)).getRegdate())); //접수일자 if(j==2) cell.setCellValue(sdf.format((resultAllSentList.get(i)).getRegdate())); //접수일자

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

@ -238,7 +238,7 @@
MGD.USER_ID, MGD.USER_ID,
MGD.MSG_GROUP_ID, MGD.MSG_GROUP_ID,
MGD.MSG_GROUP_CNT, MGD.MSG_GROUP_CNT,
MGD.SMS_TXT, MD.SMS_TXT,
MGD.SUBJECT, MGD.SUBJECT,
MGD.REGDATE, MGD.REGDATE,
MGD.REQ_DATE, MGD.REQ_DATE,