diff --git a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java index 60105a6e..037f6548 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java +++ b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java @@ -841,8 +841,8 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements && result.getDiffMin() < -5 // 예약 시간이 5분 이상인 것들만 ) { returnCode = "03"; // 예약대기 코드 ( 예약취소 버튼 노출 ) - } else if (result.getMsgGroupCnt().equals(result.getResultSValue()) - || result.getMsgGroupCnt().equals(result.getResultFValue())) { + } else if (Integer.parseInt(result.getMsgGroupCnt()) == Integer.parseInt(result.getResultSValue()) + Integer.parseInt(result.getResultFValue()) + ) { returnCode = "02"; // 완료 코드 } else { returnCode = "01"; // 진행중 코드 diff --git a/src/main/resources/egovframework/egovProps/globals_dev.properties b/src/main/resources/egovframework/egovProps/globals_dev.properties index 621c1f23..9fffb6c2 100644 --- a/src/main/resources/egovframework/egovProps/globals_dev.properties +++ b/src/main/resources/egovframework/egovProps/globals_dev.properties @@ -30,7 +30,7 @@ Globals.Env = dev Globals.DriverClassName=com.mysql.jdbc.Driver Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon Globals.UserName= mjonUr -Globals.Password= itntest123 +Globals.Password= mjon!@#$ #Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon #Globals.Url=jdbc:mysql://139.150.73.12:3306/mjon #Globals.UserName= mjonUr