|
|
@@ -708,17 +708,19 @@ class HolidayController extends DooController {
|
|
|
$holiday = new Holiday();
|
|
|
$hstaff = new HStaff();
|
|
|
$hstaffmsg = $hstaff->getOne(array('where' => 'uid='.$_POST['uid'], 'asArray' => TRUE));
|
|
|
- if($_POST['type'] == 4 || $_POST['type'] == 5){
|
|
|
+ if(($_POST['type'] == 4 || $_POST['type'] == 5) && isset($_POST['daytype']) && is_numeric($_POST['daytype'])){
|
|
|
$day = $_POST['day'];
|
|
|
$hstaff->uid = $_POST['uid'];
|
|
|
- $hstaff->addnum = floatval($hstaffmsg['addnum'])+1;
|
|
|
+ $daytype = $_POST['daytype'];
|
|
|
+ $adddaynum = $daytype != 1 ? 0.5 : 1.0;
|
|
|
+ $hstaff->addnum = floatval($hstaffmsg['addnum'])+$adddaynum;
|
|
|
$result = $hstaff->update();
|
|
|
if($result){
|
|
|
- $dayjson = array('holiday' => [$day.'_1']);
|
|
|
+ $dayjson = array('holiday' => [$day.'_'.$daytype]);
|
|
|
$holiday->uid = $_POST['uid'];
|
|
|
$holiday->type = $_POST['type'];
|
|
|
$holiday->dayjson = json_encode($dayjson);
|
|
|
- $holiday->daynum = 1.0;
|
|
|
+ $holiday->daynum = $adddaynum;
|
|
|
$holiday->status = 3;
|
|
|
$holiday->addtime = time();
|
|
|
$holiday->approvetime = time();
|
|
|
@@ -731,7 +733,7 @@ class HolidayController extends DooController {
|
|
|
$hday->uid = $_POST['uid'];
|
|
|
$hday->type = $_POST['type'];
|
|
|
$hday->daytime = $day;
|
|
|
- $hday->daymsg = 1.0;
|
|
|
+ $hday->daymsg = $adddaynum;
|
|
|
$hday->insert();
|
|
|
|
|
|
return '/holidayovertime';
|
