|
|
@ -524,10 +524,10 @@ class StatementMangementController extends ThinkController
|
|
|
|
|
|
|
|
|
|
|
|
if ($id) {
|
|
|
|
if ($id) {
|
|
|
|
|
|
|
|
|
|
|
|
$checkReward = $this->checkRewardDetail($settlmentSet);
|
|
|
|
// $checkReward = $this->checkRewardDetail($settlmentSet);
|
|
|
|
if ($checkReward) {
|
|
|
|
// if ($checkReward) {
|
|
|
|
return $this->error("奖惩确认时间需在结算时间以后,请重新选择");
|
|
|
|
// return $this->error("奖惩确认时间需在结算时间以后,请重新选择");
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
$upt = M('reward_record', 'tab_')->where(['id'=>$id])->save($data);
|
|
|
|
$upt = M('reward_record', 'tab_')->where(['id'=>$id])->save($data);
|
|
|
|
if ($upt === false) {
|
|
|
|
if ($upt === false) {
|
|
|
@ -543,10 +543,10 @@ class StatementMangementController extends ThinkController
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
|
|
|
|
|
|
|
|
$checkReward = $this->checkRewardDetail($settlmentSet);
|
|
|
|
// $checkReward = $this->checkRewardDetail($settlmentSet);
|
|
|
|
if ($checkReward) {
|
|
|
|
// if ($checkReward) {
|
|
|
|
return $this->error("奖惩确认时间需在结算时间以后,请重新选择");
|
|
|
|
// return $this->error("奖惩确认时间需在结算时间以后,请重新选择");
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
$data['create_time'] = time();
|
|
|
|
$data['create_time'] = time();
|
|
|
|
$data['creater_id'] = is_login();
|
|
|
|
$data['creater_id'] = is_login();
|
|
|
|