mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新api

Browse Source
This commit is contained in:
mkm 2023-08-03 10:15:51 +08:00
parent fa95a753cb
commit caa504e7dd
5 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/api/controller/AccountLogController.php
View File

@ -38,7 +38,7 @@ class AccountLogController extends BaseApiController
//个人月份统计
public function year_count()
{
$data = [['month'=>date('Y').'-01'],['month'=>date('Y').'-02'],['month'=>date('Y').'-03'],['month'=>date('Y').'-04'],['month'=>date('Y').'-05'],['month'=>date('Y').'-06'],['month'=>date('Y').'-07'],['month'=>date('Y').'-08'],['month'=>date('Y').'-09'],['month'=>date('Y').'-10'],['month'=>date('Y').'-11'],['month'=>date('Y').'-12']];
$data = [['month' => date('Y') . '-01'], ['month' => date('Y') . '-02'], ['month' => date('Y') . '-03'], ['month' => date('Y') . '-04'], ['month' => date('Y') . '-05'], ['month' => date('Y') . '-06'], ['month' => date('Y') . '-07'], ['month' => date('Y') . '-08'], ['month' => date('Y') . '-09'], ['month' => date('Y') . '-10'], ['month' => date('Y') . '-11'], ['month' => date('Y') . '-12']];
$year = date('Y');
$change_amount_1 = Db::name('user_account_log')
->whereYear('create_time', $year)
@ -54,37 +54,39 @@ class AccountLogController extends BaseApiController
->group('month')
->order('month')
->select();
foreach($data as $k=>$v){
foreach($change_amount_1 as $key=>$val){
if($v['month'] == $val['month']){
foreach ($data as $k => $v) {
foreach ($change_amount_1 as $key => $val) {
if ($v['month'] == $val['month']) {
$data[$k]['income'] = $val['total'];
if(!isset($data[$k]['expenditure'])){
if (!isset($data[$k]['expenditure'])) {
$data[$k]['expenditure'] = 0;
}
$data[$k]['income'] = $val['total'];
}
}
foreach($change_amount_2 as $key=>$val){
if($v['month'] == $val['month']){
foreach ($change_amount_2 as $key => $val) {
if ($v['month'] == $val['month']) {
$data[$k]['expenditure'] = $val['total'];
if(!isset($data[$k]['income'])){
if (!isset($data[$k]['income'])) {
$data[$k]['income'] = 0;
}
}
}
if(!isset($data[$k]['income'])||!isset($data[$k]['expenditure'])){
if (!isset($data[$k]['income']) || !isset($data[$k]['expenditure'])) {
unset($data[$k]);
}
}
return $this->success('ok',array_reverse($data));
return $this->success('ok', array_reverse($data));
}
//公司日流水统计
public function company_lists(){
return $this->dataLists(new AccountLogLists(),'company_lists');
public function company_lists()
{
return $this->success('ok',(new AccountLogLists())->company_lists());
}
//公司月流水统计
public function company_year_count()
{
return $this->success('ok',(new AccountLogLists())->company_year_count());
}
//公司月流水统计
public function company_year_count(){
return $this->dataLists(new AccountLogLists(),'company_year_count');
}
}

2
app/api/controller/CompanyController.php
View File

@ -40,7 +40,7 @@ class CompanyController extends BaseApiController
public function unsigned()
{
$myCompany = Company::findOrEmpty($this->userInfo['company_id'])->toArray();
$query = Company::where(['street' => $myCompany['street'], 'company_type' => [17, 18]]);
$query = Company::where(['street' => $myCompany['street'], 'company_type' => [17, 18],'is_contract'=>0]);
$count = $query->count();
$companies = $query->select()->toArray();
return $this->success('', ['count' => $count, 'data' => $companies]);

4
app/api/lists/AccountLogLists.php
View File

@ -102,12 +102,13 @@ class AccountLogLists extends BaseApiDataLists
*/
public function company_lists(): array
{
$field = 'change_type,change_amount,action,create_time,remark';
$field = 'change_type,change_amount,action,create_time,remark,user_id';
$where=[
'company_id'=>$this->params['company_id']
];
$lists = UserAccountLog::field($field)
->where($where)
->with(['userInfo'])
->whereDay('create_time')
->order('id', 'desc')
->limit($this->limitOffset, $this->limitLength)
@ -168,6 +169,7 @@ class AccountLogLists extends BaseApiDataLists
}
}
}
$data[$k]['remark']='任务收益';
if(!isset($data[$k]['income'])||!isset($data[$k]['expenditure'])){
unset($data[$k]);
}

5
app/common/model/user/UserAccountLog.php
View File

@ -27,4 +27,9 @@ class UserAccountLog extends BaseModel
use SoftDelete;
protected $deleteTime = 'delete_time';
public function userInfo()
{
return $this->hasOne(User::class, 'id', 'user_id')->field('id,nickname');
}
}

2
vendor/ebaoquan/junziqian_sdk vendored

@ -1 +1 @@
Subproject commit 1294ea49ff9ecc4532821f8798304816cbf8dd74
Subproject commit 9acc82cd23d807280ddd29df2117e7890094d049