|
@@ -100,14 +100,31 @@ public class YtiotTAdminStateEntityServicesImpl implements YtiotTAdminStateEntit
|
|
|
List list = ytiotTAdminStateEntityDao.query(" where u."+fieldname("V_LOGINNAME")+" ='"+V_LOGINNAME+"' ", null, null, null, null);
|
|
|
if(list.size()>0) {
|
|
|
YtiotTAdminStateEntity o = (YtiotTAdminStateEntity) list.get(0);
|
|
|
- if(o.getState().equals("1")&&STATE.equals("2")) {
|
|
|
- o.setState("3");
|
|
|
- }else if(o.getState().equals("2")&&STATE.equals("1")){
|
|
|
- o.setState("3");
|
|
|
- }else if(o.getState().equals("3")&&!STATE.equals("0")){
|
|
|
- o.setState("3");
|
|
|
- }else if(STATE.equals("0")){
|
|
|
- o.setState("0");
|
|
|
+ int startDay1=0;
|
|
|
+ int endDay=0;
|
|
|
+ String datEnd=formatter.format(new Date());
|
|
|
+ try {
|
|
|
+ Date dateStart1 = formatter.parse(o.getTime());
|
|
|
+ Date datEnd1 = formatter.parse(datEnd);
|
|
|
+ startDay1 = (int) (dateStart1.getTime() / 1000);
|
|
|
+ endDay = (int) (datEnd1.getTime() / 1000);
|
|
|
+
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+
|
|
|
+ if(startDay1==endDay) {
|
|
|
+ if(o.getState().equals("1")&&STATE.equals("2")) {
|
|
|
+ o.setState("3");
|
|
|
+ }else if(o.getState().equals("2")&&STATE.equals("1")){
|
|
|
+ o.setState("3");
|
|
|
+ }else if(o.getState().equals("3")&&!STATE.equals("0")){
|
|
|
+ o.setState("3");
|
|
|
+ }else if(STATE.equals("0")){
|
|
|
+ o.setState("0");
|
|
|
+ }else {
|
|
|
+ o.setState(STATE);
|
|
|
+ }
|
|
|
}else {
|
|
|
o.setState(STATE);
|
|
|
}
|