正在显示
1 个修改的文件
包含
5 行增加
和
4 行删除
@@ -50,7 +50,7 @@ class SignController extends RestBaseController | @@ -50,7 +50,7 @@ class SignController extends RestBaseController | ||
50 | $user_sign=Db::name('user_sign')->where(['user_id'=>$user_id,'create_time'=>[ 'between time', [$beginToday,$endToday]]])->find(); | 50 | $user_sign=Db::name('user_sign')->where(['user_id'=>$user_id,'create_time'=>[ 'between time', [$beginToday,$endToday]]])->find(); |
51 | if ($time>$data['morning_sign_time']&&$time<$data['morning_sign_end_time']){ | 51 | if ($time>$data['morning_sign_time']&&$time<$data['morning_sign_end_time']){ |
52 | if ($user_sign['morning']!=null) { | 52 | if ($user_sign['morning']!=null) { |
53 | - $data['sign'] = 0; | 53 | + $data['sign'] = -1; |
54 | }else{ | 54 | }else{ |
55 | $data['sign'] = 1; | 55 | $data['sign'] = 1; |
56 | } | 56 | } |
@@ -58,7 +58,7 @@ class SignController extends RestBaseController | @@ -58,7 +58,7 @@ class SignController extends RestBaseController | ||
58 | $data['end_time']=$data['morning_sign_end_time']; | 58 | $data['end_time']=$data['morning_sign_end_time']; |
59 | }else if ($time>$data['noon_sign_time']&&$time<$data['noon_sign_end_time']){ | 59 | }else if ($time>$data['noon_sign_time']&&$time<$data['noon_sign_end_time']){ |
60 | if ($user_sign['noon']!=null) { | 60 | if ($user_sign['noon']!=null) { |
61 | - $data['sign'] = 0; | 61 | + $data['sign'] = -1; |
62 | }else{ | 62 | }else{ |
63 | $data['sign'] = 2; | 63 | $data['sign'] = 2; |
64 | } | 64 | } |
@@ -66,7 +66,7 @@ class SignController extends RestBaseController | @@ -66,7 +66,7 @@ class SignController extends RestBaseController | ||
66 | $data['end_time']=$data['noon_sign_end_time']; | 66 | $data['end_time']=$data['noon_sign_end_time']; |
67 | }else if ($time>$data['night_sign_time']&&$time<$data['night_sign_end_time']){ | 67 | }else if ($time>$data['night_sign_time']&&$time<$data['night_sign_end_time']){ |
68 | if ($user_sign['night']!=null) { | 68 | if ($user_sign['night']!=null) { |
69 | - $data['sign'] = 0; | 69 | + $data['sign'] = -1; |
70 | }else{ | 70 | }else{ |
71 | $data['sign'] = 3; | 71 | $data['sign'] = 3; |
72 | } | 72 | } |
@@ -74,7 +74,7 @@ class SignController extends RestBaseController | @@ -74,7 +74,7 @@ class SignController extends RestBaseController | ||
74 | $data['end_time']=$data['night_sign_end_time']; | 74 | $data['end_time']=$data['night_sign_end_time']; |
75 | }else if ($time>$data['sleep_sign_time']&&$time<$data['sleep_sign_end_time']){ | 75 | }else if ($time>$data['sleep_sign_time']&&$time<$data['sleep_sign_end_time']){ |
76 | if ($user_sign['sleep']!=null) { | 76 | if ($user_sign['sleep']!=null) { |
77 | - $data['sign'] = 0; | 77 | + $data['sign'] = -1; |
78 | }else{ | 78 | }else{ |
79 | $data['sign'] = 4; | 79 | $data['sign'] = 4; |
80 | } | 80 | } |
@@ -94,6 +94,7 @@ class SignController extends RestBaseController | @@ -94,6 +94,7 @@ class SignController extends RestBaseController | ||
94 | $data['start_time']=$data['sleep_sign_time']; | 94 | $data['start_time']=$data['sleep_sign_time']; |
95 | $data['end_time']=$data['sleep_sign_end_time']; | 95 | $data['end_time']=$data['sleep_sign_end_time']; |
96 | } | 96 | } |
97 | + | ||
97 | $data['sign']=0; | 98 | $data['sign']=0; |
98 | } | 99 | } |
99 | 100 |
-
请 注册 或 登录 后发表评论