Merge branch 'hylee' into advc
Conflicts: src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/OprtnLctrRsrchTngrContoller.java
This commit is contained in:
commit
313eb04125
@ -228,10 +228,6 @@ public class OprtnLctrRsrchTngrContoller {
|
||||
else if(nowDate.isBefore(startDate)) {t.setRsrchState("01");}
|
||||
else if(nowDate.isAfter(endDate)) {t.setRsrchState("03");}
|
||||
|
||||
t.getRsrchEndDt();
|
||||
t.getRsrchState();
|
||||
DateUtil.getNowyyyyMMddReturnInt();
|
||||
|
||||
} catch (Exception e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user