|
|
@@ -935,15 +935,17 @@ class Lampcontrol extends Base_Controller {
|
|
|
exit(json_result('0401', $this->response['0401'], array()));
|
|
|
}
|
|
|
$fascal_year = $this->input->post('fascal_year',true);
|
|
|
- if (empty($fascal_year)) $fascal_year = date('Y-m-d');
|
|
|
+ // if (empty($fascal_year)) $fascal_year = date('Y-m-d');
|
|
|
+ if (empty($fascal_year)) $fascal_year = '';
|
|
|
$data['fascal_year'] = $fascal_year;
|
|
|
|
|
|
$fascal_year_phase = $this->input->post('fascal_year_phase',true);
|
|
|
if (empty($fascal_year_phase)) {
|
|
|
- $fascal_year_phase = date('Y');
|
|
|
- $data['fascal_year_phase'] = $fascal_year_phase.'-'.date('Y',strtotime($fascal_year_phase.' +1 year'));
|
|
|
+ $fascal_year_phase = '';
|
|
|
+ // $fascal_year_phase = date('Y');
|
|
|
+ // $data['fascal_year_phase'] = $fascal_year_phase.'-'.date('Y',strtotime($fascal_year_phase.' +1 year'));
|
|
|
}
|
|
|
-
|
|
|
+ $data['fascal_year_phase'] = $fascal_year_phase;
|
|
|
$lamp = $this->Lamp_model->get_one(array('address'=>$data['address']),'projectid,number');
|
|
|
if (!empty($lamp)) {
|
|
|
$projectid = $lamp['projectid'];
|
