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
b8a9a6ab
Commit
b8a9a6ab
authored
Jul 22, 2019
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
d324cc71
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
4 deletions
+37
-4
StoreFee.php
application/api_broker/controller/StoreFee.php
+17
-3
AStore.php
application/model/AStore.php
+19
-1
route.php
application/route.php
+1
-0
No files found.
application/api_broker/controller/StoreFee.php
View file @
b8a9a6ab
...
...
@@ -87,13 +87,26 @@ class StoreFee extends Basic
return
$this
->
response
(
"101"
,
"save exception"
);
}
}
/**
* @return \think\Response
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public
function
getApplyForFeeStore
(){
$params
=
$this
->
params
;
$params
=
array
(
/*
$params = array(
"store_id" => 1
);
);
*/
$storeModel
=
new
AStore
();
$storeModel
->
getStore
();
$field
=
"a.id,b.office_address"
;
$office_info
=
$storeModel
->
getStoreAndOffice
(
$field
,[
"store_id"
=>
$params
[
"store_id"
]]);
if
(
$office_info
){
return
$this
->
response
(
"200"
,
"request success"
,
$office_info
);
}
else
{
return
$this
->
response
(
"101"
,
"null"
);
}
}
}
\ No newline at end of file
application/model/AStore.php
View file @
b8a9a6ab
...
...
@@ -348,8 +348,25 @@ class AStore extends BaseModel
return
Db
::
table
(
$this
->
table
)
->
update
(
$params
);
}
public
function
getStoreAndOffice
(
$params
){
/**
* @param $field
* @param $params
* @return false|\PDOStatement|string|\think\Collection
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public
function
getStoreAndOffice
(
$field
,
$params
){
$where_
=
[];
if
(
isset
(
$params
[
"store_id"
])){
$where_
[
"a.id"
]
=
$params
[
"store_id"
];
}
return
Db
::
table
(
$this
->
table
)
->
field
(
$field
)
->
alias
(
"a"
)
->
join
(
"f_office b"
,
"a.office_id = b.id"
,
"left"
)
->
where
(
$where_
)
->
select
();
}
}
\ No newline at end of file
application/route.php
View file @
b8a9a6ab
...
...
@@ -999,6 +999,7 @@ Route::group('broker', [
'checkCost'
=>
[
'api_broker/ApplyForCost/check'
,
[
'method'
=>
'POST'
]],
//费用报销审核总监
'addApplyFor'
=>
[
'api_broker/StoreFee/addApplyFor'
,
[
'method'
=>
'GET'
]],
//新增报销申请
'getApplyForFeeStore'
=>
[
'api_broker/StoreFee/getApplyForFeeStore'
,
[
'method'
=>
'GET'
]],
//新增报销申请
]);
Route
::
group
(
'search'
,
[
...
...
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