Commit 18471836 authored by hujun's avatar hujun

key修改

parent 62289f0b
...@@ -24,6 +24,25 @@ class UploadFileService ...@@ -24,6 +24,25 @@ class UploadFileService
*/ */
public function upload($_upload_file, $type, $size = 1000000, $ext = [ 'jpg' ]) public function upload($_upload_file, $type, $size = 1000000, $ext = [ 'jpg' ])
{ {
/**
*
upload($_FILE['file'])
array(2) {
[0] => array(3) {
["code"] => int(200)
["img_path"] => string(19) "201807021804140.jpg"
["img_ext"] => string(3) "jpg"
}
[1] => array(3) {
["code"] => int(200)
["img_path"] => string(20) "2018070218041401.jpg"
["img_ext"] => string(3) "jpg"
}
}
*/
$check = $this->checkUploadFile($_upload_file, $size, $ext); $check = $this->checkUploadFile($_upload_file, $size, $ext);
if ($check['code'] == 101) { if ($check['code'] == 101) {
...@@ -45,6 +64,7 @@ class UploadFileService ...@@ -45,6 +64,7 @@ class UploadFileService
break; break;
case 'house_img': case 'house_img':
$path .= 'resource/lib/Attachments/images/'; $path .= 'resource/lib/Attachments/images/';
break;
default : default :
$path .= 'static/'; $path .= 'static/';
} }
......
...@@ -1062,7 +1062,7 @@ class Finance extends Basic ...@@ -1062,7 +1062,7 @@ class Finance extends Basic
} }
if (!empty($this->params['bargain_start_date']) && !empty($this->params['bargain_end_date'])) { if (!empty($this->params['bargain_start_date']) && !empty($this->params['bargain_end_date'])) {
$where[] = ['EXP', "(a.create_time BETWEEN '{$this->params['income_start_date']}' and '{$this->params['income_end_date']}')"]; $where[] = ['EXP', "(a.create_time BETWEEN '{$this->params['bargain_start_date']}' and '{$this->params['bargain_start_date']}')"];
$operation_date = date('Y.m.d', strtotime($this->params['bargain_start_date'])) .'-'. date('Y.m.d', strtotime($this->params['bargain_end_date'])); $operation_date = date('Y.m.d', strtotime($this->params['bargain_start_date'])) .'-'. date('Y.m.d', strtotime($this->params['bargain_end_date']));
$operation_start_data = $this->params['bargain_start_date']; $operation_start_data = $this->params['bargain_start_date'];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment