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

update

Browse Source
This commit is contained in:
weiz 2024-03-16 17:16:40 +08:00
parent 9c1789c8b7
commit cfcce13191
5 changed files with 246 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
app/adminapi/controller/CostConsultationReportController.php
View File

@ -8,6 +8,7 @@ use app\common\model\cost_project\CostProject;
use app\common\model\cost_project\CostProjectPerson; use app\common\model\cost_project\CostProjectPerson;
use app\common\model\DataReception; use app\common\model\DataReception;
use app\common\model\dept\Dept; use app\common\model\dept\Dept;
use app\common\model\ProjectCommission;
use app\common\model\task\TaskAllocation; use app\common\model\task\TaskAllocation;
use app\common\model\TaskHandlingThreeLevelReview; use app\common\model\TaskHandlingThreeLevelReview;
use app\common\model\zjzx_finance\ZjzxInvoice; use app\common\model\zjzx_finance\ZjzxInvoice;
@ -89,7 +90,7 @@ class CostConsultationReportController extends BaseAdminController
//到账金额 //到账金额
$data['total_refund_amount'] = ZjzxRefund::where('project_id',$data['id'])->sum('amount'); $data['total_refund_amount'] = ZjzxRefund::where('project_id',$data['id'])->sum('amount');
//提成金额 //提成金额
$data['total_commission_amount'] = 0; $data['total_commission_amount'] = ProjectCommission::where('project_id',$data['id'])->sum('bczfze');
})->toArray(); })->toArray();
$count = CostProject::where($where)->count(); $count = CostProject::where($where)->count();
return $this->success('成功', compact('count', 'lists', 'page_no', 'page_size')); return $this->success('成功', compact('count', 'lists', 'page_no', 'page_size'));
@ -98,35 +99,42 @@ class CostConsultationReportController extends BaseAdminController
// 项目全过程跟踪表 // 项目全过程跟踪表
public function project_trace() public function project_trace()
{ {
$page_no = $this->request->param('page_no', 1); $params = $this->request->get();
$page_size = $this->request->param('page_size', 15); $page_no = !empty($params['page_no']) ? $params['page_no'] : 1;
$params = $this->request->param(); $page_size = !empty($params['page_size']) ? $params['page_size'] : 15;
$project_name = $params['project_name'] ?? ''; $where = [];
$contract_name = $params['contract_name'] ?? ''; if(!empty($params['contract_name'])){
$contract_ids1 = CostApprovedProject::where('contract_name','like','%'.$params['contract_name'].'%')->column('id');
$query = Db::name('cost_project')->alias('p')->leftJoin('cost_approved_project c', 'p.contract_id=c.id')->where(function ($query) use ($project_name, $contract_name) { $where[] = ['contract_id','in',$contract_ids1];
if ($contract_name) { }
$query->where('c.contract_name', 'like', '%' . $contract_name . '%'); if(!empty($params['project_name'])){
} $where[] = ['project_name','like','%'.$params['project_name'].'%'];
if ($project_name) { }
$query->where('p.project_name', 'like', '%' . $project_name . '%'); $lists = CostProject::field('id,contract_id,project_num,project_name,depar')
} ->where($where)->page($page_no, $page_size)->order('id desc')->select()->each(function($data){
})->append(['task_allocation_status', 'task_handling_three_level_review_status', 'data_reception_status']) $contract = CostApprovedProject::field('contract_name,project_director')->where('id',$data['contract_id'])->findOrEmpty();
->withAttr('task_allocation_status', function ($data, $value) { $dept = Dept::field('name')->where('id', $data['depar'])->findOrEmpty();
$count = TaskAllocation::where('cost_project_id', $value['id'])->count(); $data['contract_name'] = $contract['contract_name'];
return $count > 0 ? 1 : 0; $data['project_director'] = $contract['project_director'];
})->withAttr('task_handling_three_level_review_status', function ($data, $value) { $data['dept_name'] = $dept['name'];
$count = TaskHandlingThreeLevelReview::where('project_id', $value['id'])->count(); //任务分配状态
return $count > 0 ? 1 : 0; $task_allocation_status = TaskAllocation::where('cost_project_id', $data['id'])->count();
})->withAttr('data_reception_status', function ($data, $value) { $data['task_allocation_status'] = $task_allocation_status > 0 ? 1 : 0;
$count = DataReception::where('project_id', $value['id'])->count(); //任务办理状态
return $count > 0 ? 1 : 0; $task_handling_three_level_review_status = TaskHandlingThreeLevelReview::where('project_id', $data['id'])->count();
}); $data['task_handling_three_level_review_status'] = $task_handling_three_level_review_status > 0 ? 1 : 0;
$count = $query->count(); //资料归档状态
$lists = $query->append(['dept'])->withAttr('dept', function ($value, $data) { $data_reception_status = DataReception::where('project_id', $data['id'])->count();
return Dept::where('id', $data['depar'])->findOrEmpty()->toArray(); $data['data_reception_status'] = $data_reception_status > 0 ? 1 : 0;
})->page($page_no, $page_size)->select(); //开票金额
return $this->success('成功', compact('count', 'lists', 'page_no', 'page_size')); $data['total_invoice_amount'] = ZjzxInvoice::where('project_id',$data['id'])->sum('apply_amount');
//到账金额
$data['total_refund_amount'] = ZjzxRefund::where('project_id',$data['id'])->sum('amount');
//提成金额
$data['total_commission_amount'] = ProjectCommission::where('project_id',$data['id'])->sum('bczfze');
})->toArray();
$count = CostProject::where($where)->count();
return $this->success('成功', compact('count', 'lists', 'page_no', 'page_size'));
} }
/** /**
@ -134,34 +142,31 @@ class CostConsultationReportController extends BaseAdminController
*/ */
public function project_invoice_receipt() public function project_invoice_receipt()
{ {
$page_no = $this->request->param('page_no', 1); $params = $this->request->get();
$page_size = $this->request->param('page_size', 15); $page_no = !empty($params['page_no']) ? $params['page_no'] : 1;
$project_name = $params['project_name'] ?? ''; $page_size = !empty($params['page_size']) ? $params['page_size'] : 15;
$depar_id = $params['depar_id'] ?? 0; $where = [];
$query = (new CostProject)->with(['cost_project_contract']); if(!empty($params['contract_name'])){
$field = 'id,project_num,project_name,depar,principal,contract_id'; $contract_ids1 = CostApprovedProject::where('contract_name','like','%'.$params['contract_name'].'%')->column('id');
if ($project_name) { $where[] = ['contract_id','in',$contract_ids1];
$query->where('project_name', 'like', '%' . $project_name . '%'); }
} if(!empty($params['project_name'])){
if ($depar_id) { $where[] = ['project_name','like','%'.$params['project_name'].'%'];
$query->where('depar', $depar_id); }
} $lists = CostProject::field('id,contract_id,project_num,project_name,depar')
->where($where)->page($page_no, $page_size)->order('id desc')->select()->each(function($data){
$count = $query->count(); $contract = CostApprovedProject::field('contract_name,project_director')->where('id',$data['contract_id'])->findOrEmpty();
$lists = $query->field($field)->page($page_no, $page_size)->select()->each(function ($item) { $dept = Dept::field('name')->where('id', $data['depar'])->findOrEmpty();
$item['start_date'] = date('Y-m-d', $item['start_date']); $data['contract_name'] = $contract['contract_name'];
$item['end_date'] = date('Y-m-d', $item['end_date']); $data['project_director'] = $contract['project_director'];
if ($item['depar'] > 0) { $data['dept_name'] = $dept['name'];
$item['depar'] = Dept::where('id', $item['depar'])->value('name'); //开票金额
} $data['total_invoice_amount'] = ZjzxInvoice::where('project_id',$data['id'])->sum('apply_amount');
if ($item['principal'] > 0) { //到账金额
$item['principal'] = Dept::where('id', $item['principal'])->value('name'); $data['total_refund_amount'] = ZjzxRefund::where('project_id',$data['id'])->sum('amount');
} })->toArray();
$item['has_invoice_amount'] = 0; $count = CostProject::where($where)->count();
$item['amount_Collected'] = 0; return $this->success('成功', compact('count', 'lists', 'page_no', 'page_size'));
return $item;
});
return $this->success('成功', compact('count', 'lists', 'page_no', 'page_size'));
} }
/** /**
@ -207,4 +212,18 @@ class CostConsultationReportController extends BaseAdminController
}); });
return $this->success('成功', compact('count', 'lists', 'page_no', 'page_size')); return $this->success('成功', compact('count', 'lists', 'page_no', 'page_size'));
} }
//项目提成统计
public function project_commission_statistics(){
$params = $this->request->get();
$page_no = !empty($params['page_no']) ? $params['page_no'] : 1;
$page_size = !empty($params['page_size']) ? $params['page_size'] : 15;
$where = [];
if(!empty($params['project_name'])){
$where[] = ['project_name','like','%'.$params['project_name'].'%'];
}
// if(!empty($params['date'])){
//
// }
}
} }

28
app/adminapi/lists/ProjectCommissionLists.php
View File

@ -17,9 +17,12 @@ namespace app\adminapi\lists;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsExcelInterface; use app\common\lists\ListsExcelInterface;
use app\common\model\cost_project\CostApprovedProject;
use app\common\model\cost_project\CostProject;
use app\common\model\ProjectCommission; use app\common\model\ProjectCommission;
use app\common\lists\ListsSearchInterface; use app\common\lists\ListsSearchInterface;
use app\common\model\ProjectCommissionDetail; use app\common\model\ProjectCommissionDetail;
use app\common\model\zjzx_finance\ZjzxRefund;
/** /**
@ -57,16 +60,25 @@ class ProjectCommissionLists extends BaseAdminDataLists implements ListsSearchIn
*/ */
public function lists(): array public function lists(): array
{ {
return ProjectCommission::with(['projectInfo', 'contract']) return ProjectCommission::withoutField('create_time,update_time,delete_time')->where($this->searchWhere)
->append(['children'])
->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->withAttr('children', function ($value, $data){ ->select()->each(function($data){
$details = ProjectCommissionDetail::where('project_commission_id', $data['id'])->select(); $project = CostProject::field('project_name,project_num,contract_id')->where('id',$data['project_id'])->findOrEmpty();
return $details; $contract = CostApprovedProject::field('contract_name,project_director,industry_nature')->where('id',$project['contract_id'])->findOrEmpty();
}) $data['project_name'] = $project['project_name'];
->select() $data['project_num'] = $project['project_num'];
$data['contract_name'] = $contract['contract_name'];
$data['project_director'] = $contract['project_director'];
$data['industry_nature'] = $contract->industry_nature_text;
//到账金额
$data['total_refund_amount'] = ZjzxRefund::where('project_id',$data['project_id'])->sum('amount');
//已支付总额
$data['total_pay_amount'] = ProjectCommission::where('project_id',$data['project_id'])->sum('bczfze');
//应提成总金额
$data['total_commission_amount'] = $data['total_refund_amount'] * ($data['rate'] / 100);
$data['children'] = ProjectCommissionDetail::field('id,engineer,task_name,task_type,professional_type,zj_amount,sk_amount,tc_rate,tc_amount,pay_amount,other_fee')->where('project_commission_id', $data['id'])->select()->toArray();
})
->toArray(); ->toArray();
} }

48
app/adminapi/logic/ProjectCommissionLogic.php
View File

@ -15,9 +15,12 @@
namespace app\adminapi\logic; namespace app\adminapi\logic;
use app\common\model\cost_project\CostApprovedProject;
use app\common\model\cost_project\CostProject;
use app\common\model\ProjectCommission; use app\common\model\ProjectCommission;
use app\common\logic\BaseLogic; use app\common\logic\BaseLogic;
use app\common\model\ProjectCommissionDetail; use app\common\model\ProjectCommissionDetail;
use app\common\model\zjzx_finance\ZjzxRefund;
use think\facade\Db; use think\facade\Db;
@ -45,18 +48,12 @@ class ProjectCommissionLogic extends BaseLogic
'dataid' => generate_sn(ProjectCommission::class,'dataid'), 'dataid' => generate_sn(ProjectCommission::class,'dataid'),
'num' => generate_sn(ProjectCommission::class,'num'), 'num' => generate_sn(ProjectCommission::class,'num'),
'project_id' => $params['project_id'], 'project_id' => $params['project_id'],
'affcontract' => $params['affcontract'],
'industry' => $params['industry'],
'hk' => $params['hk'],
'rate' => $params['rate'], 'rate' => $params['rate'],
'ticheng' => $params['ticheng'],
'paid_amount' => $params['paid_amount'],
'bczfze' => $params['bczfze'], 'bczfze' => $params['bczfze'],
'djr' => $params['djr'], 'djr' => $params['djr'],
'apptime' => $params['apptime'], 'apptime' => !empty($params['apptime']) ? strtotime($params['apptime']) : 0,
'remark' => $params['remark'], 'remark' => $params['remark'] ?? '',
]); ]);
foreach ($params['project_commission_detail'] as $item) { foreach ($params['project_commission_detail'] as $item) {
$item['project_commission_id'] = $projectCommission->id; $item['project_commission_id'] = $projectCommission->id;
ProjectCommissionDetailLogic::add($item); ProjectCommissionDetailLogic::add($item);
@ -83,17 +80,13 @@ class ProjectCommissionLogic extends BaseLogic
Db::startTrans(); Db::startTrans();
try { try {
ProjectCommission::where('id', $params['id'])->update([ ProjectCommission::where('id', $params['id'])->update([
'project_id' => $params['project_id'], 'project_id' => $params['project_id'],
'affcontract' => $params['affcontract'], 'rate' => $params['rate'],
'industry' => $params['industry'], 'bczfze' => $params['bczfze'],
'hk' => $params['hk'], 'djr' => $params['djr'],
'rate' => $params['rate'], 'apptime' => !empty($params['apptime']) ? strtotime($params['apptime']) : 0,
'ticheng' => $params['ticheng'], 'remark' => $params['remark'] ?? '',
'paid_amount' => $params['paid_amount'], 'update_time' => time(),
'bczfze' => $params['bczfze'],
'djr' => $params['djr'],
'apptime' => $params['apptime'],
'remark' => $params['remark'],
]); ]);
Db::commit(); Db::commit();
@ -133,8 +126,21 @@ class ProjectCommissionLogic extends BaseLogic
*/ */
public static function detail($params): array public static function detail($params): array
{ {
$data = ProjectCommission::with(['projectInfo', 'contract'])->findOrEmpty($params['id'])->toArray(); $data = ProjectCommission::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id'])->toArray();
$data['project_commission_detail'] = ProjectCommissionDetail::where('project_commission_id', $params['id'])->select()->toArray(); $project = CostProject::field('project_name,project_num,contract_id')->where('id',$data['project_id'])->findOrEmpty();
$contract = CostApprovedProject::field('contract_name,project_director,industry_nature')->where('id',$project['contract_id'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['project_num'] = $project['project_num'];
$data['contract_name'] = $contract['contract_name'];
$data['project_director'] = $contract['project_director'];
$data['industry_nature'] = $contract->industry_nature_text;
//到账金额
$data['total_refund_amount'] = ZjzxRefund::where('project_id',$data['project_id'])->sum('amount');
//已支付总额
$data['total_pay_amount'] = ProjectCommission::where('project_id',$data['project_id'])->sum('bczfze');
//应提成总金额
$data['total_commission_amount'] = $data['total_refund_amount'] * ($data['rate'] / 100);
$data['project_commission_detail'] = ProjectCommissionDetail::field('id,engineer,task_name,task_type,professional_type,zj_amount,sk_amount,tc_rate,tc_amount,pay_amount,other_fee,remark')->where('project_commission_id', $data['id'])->select()->toArray();
return $data; return $data;
} }
} }

26
app/adminapi/validate/ProjectCommissionValidate.php
View File

@ -15,6 +15,8 @@
namespace app\adminapi\validate; namespace app\adminapi\validate;
use app\common\model\cost_project\CostProject;
use app\common\model\ProjectCommission;
use app\common\validate\BaseValidate; use app\common\validate\BaseValidate;
@ -31,7 +33,12 @@ class ProjectCommissionValidate extends BaseValidate
* @var string[] * @var string[]
*/ */
protected $rule = [ protected $rule = [
'id' => 'require', 'id' => 'require|checkData',
'project_id' => 'require|checkProject',
'rate' => 'require|float|gt:0',
'bczfze' => 'require|float|egt:0',
'djr' => 'require',
'apptime' => 'require|dateFormat:YH-m-d',
]; ];
@ -41,6 +48,11 @@ class ProjectCommissionValidate extends BaseValidate
*/ */
protected $field = [ protected $field = [
'id' => 'id', 'id' => 'id',
'project_id' => '项目id',
'rate' => '提成比例',
'bczfze' => '本次支付总额',
'djr' => '登记人',
'apptime' => '登记日期',
]; ];
@ -91,4 +103,16 @@ class ProjectCommissionValidate extends BaseValidate
return $this->only(['id']); return $this->only(['id']);
} }
public function checkData($value): bool|string
{
$data = ProjectCommission::where('id',$value)->findOrEmpty();
return $data->isEmpty() ? '数据不存在' : true;
}
public function checkProject($value): bool|string
{
$data = CostProject::where('id',$value)->findOrEmpty();
return $data->isEmpty() ? '项目信息不存在' : true;
}
} }

5
app/common/model/ProjectCommission.php
View File

@ -40,4 +40,9 @@ class ProjectCommission extends BaseModel
{ {
return $this->hasOne(CostApprovedProject::class, 'id','affcontract'); return $this->hasOne(CostApprovedProject::class, 'id','affcontract');
} }
public function getAppTimeAttr($value): string
{
return !empty($value) ? date('Y-m-d',$value) : '';
}
} }