Merge branch 'hylee' into advc

Conflicts:
	src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/OprtnLctrRsrchTngrContoller.java
This commit is contained in:
hylee 2023-06-29 14:01:42 +09:00
commit 313eb04125

View File

@ -227,10 +227,6 @@ public class OprtnLctrRsrchTngrContoller {
if(nowDate.isEqual(startDate) || nowDate.isEqual(endDate)) {t.setRsrchState("02");} if(nowDate.isEqual(startDate) || nowDate.isEqual(endDate)) {t.setRsrchState("02");}
else if(nowDate.isBefore(startDate)) {t.setRsrchState("01");} else if(nowDate.isBefore(startDate)) {t.setRsrchState("01");}
else if(nowDate.isAfter(endDate)) {t.setRsrchState("03");} else if(nowDate.isAfter(endDate)) {t.setRsrchState("03");}
t.getRsrchEndDt();
t.getRsrchState();
DateUtil.getNowyyyyMMddReturnInt();
} catch (Exception e) { } catch (Exception e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block