Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
18471836
Commit
18471836
authored
Jul 02, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
key修改
parent
62289f0b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
1 deletion
+21
-1
UploadFileService.php
application/api_broker/service/UploadFileService.php
+20
-0
Finance.php
application/index/controller/Finance.php
+1
-1
No files found.
application/api_broker/service/UploadFileService.php
View file @
18471836
...
@@ -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/'
;
}
}
...
...
application/index/controller/Finance.php
View file @
18471836
...
@@ -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'
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment