update
This commit is contained in:
weiz
parent
b7971872f2
commit
ff8fc093da
@ -20,7 +20,16 @@ use app\adminapi\controller\BaseAdminController;
|
||||
use app\adminapi\lists\project\ProjectPersonnelLists;
|
||||
use app\adminapi\logic\project\ProjectPersonnelLogic;
|
||||
use app\adminapi\validate\project\ProjectPersonnelValidate;
|
||||
use app\common\model\build\BuildDivision;
|
||||
use app\common\model\build\BuildPlan;
|
||||
use app\common\model\build\BuildProcessSettings;
|
||||
use app\common\model\build\BuildReport;
|
||||
use app\common\model\build\BuildReportDetail;
|
||||
use app\common\model\project\Project;
|
||||
use app\common\model\project\ProjectAttendanceDetail;
|
||||
use app\common\model\project\ProjectAttendanceRecord;
|
||||
use app\common\model\project\ProjectInsuranceManagement;
|
||||
use app\common\model\project\ProjectLaborContract;
|
||||
use app\common\model\project\ProjectPersonnel;
|
||||
|
||||
|
||||
@ -106,7 +115,7 @@ class ProjectPersonnelController extends BaseAdminController
|
||||
return $this->data($result);
|
||||
}
|
||||
|
||||
|
||||
//某个项目下的人员列表
|
||||
public function listToProject(): \think\response\Json
|
||||
{
|
||||
$params = $this->request->get(['project_id','page_size','page_no']);
|
||||
@ -137,5 +146,150 @@ class ProjectPersonnelController extends BaseAdminController
|
||||
];
|
||||
return $this->success('请求成功',$result);
|
||||
}
|
||||
|
||||
//某个人员下的劳动合同列表
|
||||
public function laborContracts(): \think\response\Json
|
||||
{
|
||||
$params = $this->request->get(['person_id','page_no','page_size']);
|
||||
if(empty($params['person_id'])){
|
||||
return $this->fail('缺少必要参数');
|
||||
}
|
||||
$pageNo = empty($params['page_no']) ? 1 : $params['page_no'];
|
||||
$pageSize = empty($params['page_size']) ? 15 : $params['page_size'];
|
||||
$person = ProjectPersonnel::field('id,name,idcard')->where('id',$params['person_id'])->findOrEmpty();
|
||||
if($person->isEmpty()){
|
||||
return $this->fail('项目人员信息不存在');
|
||||
}
|
||||
$data = ProjectLaborContract::field('id,contract_status,contract_type,contract_title,signing_date,start_date,end_date,remark,annex')
|
||||
->where('project_person_id',$params['person_id'])
|
||||
->page($pageNo,$pageSize)->order('id desc')
|
||||
->select()->each(function($item)use($person){
|
||||
$item['person_name'] = $person['name'];
|
||||
$item['person_idcard'] = $person['idcard'];
|
||||
$item['contract_status_text'] = $item->contract_status_text;
|
||||
$item['contract_type_text'] = $item->contract_type_text;
|
||||
$item['contract_title_text'] = $item->contract_title_text;
|
||||
return $item;
|
||||
})
|
||||
->toArray();
|
||||
$count = ProjectLaborContract::field('id')->where('project_person_id',$params['person_id'])->count();
|
||||
$result = [
|
||||
'count' => $count,
|
||||
'page_no' => $pageNo,
|
||||
'page_size' => $pageSize,
|
||||
'lists' => $data
|
||||
];
|
||||
return $this->success('请求成功',$result);
|
||||
}
|
||||
|
||||
//某个人员下的保险列表
|
||||
public function insurances(): \think\response\Json
|
||||
{
|
||||
$params = $this->request->get(['person_id','page_no','page_size']);
|
||||
if(empty($params['person_id'])){
|
||||
return $this->fail('缺少必要参数');
|
||||
}
|
||||
$pageNo = empty($params['page_no']) ? 1 : $params['page_no'];
|
||||
$pageSize = empty($params['page_size']) ? 15 : $params['page_size'];
|
||||
$person = ProjectPersonnel::field('id,name,idcard')->where('id',$params['person_id'])->findOrEmpty();
|
||||
if($person->isEmpty()){
|
||||
return $this->fail('项目人员信息不存在');
|
||||
}
|
||||
$data = ProjectInsuranceManagement::field('id,insurance_date,due_date,type,insurance_no,insurance,insured_amount,insurance_company')
|
||||
->where('project_person_id',$params['person_id'])
|
||||
->page($pageNo,$pageSize)->order('id desc')
|
||||
->select()->each(function($item)use($person){
|
||||
$item['person_name'] = $person['name'];
|
||||
$item['person_idcard'] = $person['idcard'];
|
||||
return $item;
|
||||
})
|
||||
->toArray();
|
||||
$count = ProjectInsuranceManagement::field('id')->where('project_person_id',$params['person_id'])->count();
|
||||
$result = [
|
||||
'count' => $count,
|
||||
'page_no' => $pageNo,
|
||||
'page_size' => $pageSize,
|
||||
'lists' => $data
|
||||
];
|
||||
return $this->success('请求成功',$result);
|
||||
}
|
||||
|
||||
//某个人员下的考勤明细列表
|
||||
public function attendances(): \think\response\Json
|
||||
{
|
||||
$params = $this->request->get(['person_id','page_no','page_size']);
|
||||
if(empty($params['person_id'])){
|
||||
return $this->fail('缺少必要参数');
|
||||
}
|
||||
$pageNo = empty($params['page_no']) ? 1 : $params['page_no'];
|
||||
$pageSize = empty($params['page_size']) ? 15 : $params['page_size'];
|
||||
$person = ProjectPersonnel::field('id,name,idcard,work_type')->where('id',$params['person_id'])->findOrEmpty();
|
||||
if($person->isEmpty()){
|
||||
return $this->fail('项目人员信息不存在');
|
||||
}
|
||||
$data = ProjectAttendanceDetail::field('id,attendance_code,attendance_date,work_start_time,work_end_time,work_record_num,daily_salary,daily_living,daily_subsidy,daily_other,daily_income,remark')
|
||||
->where('person_id',$params['person_id'])
|
||||
->page($pageNo,$pageSize)->order('id desc')
|
||||
->select()->each(function($item)use($person){
|
||||
$item['person_name'] = $person['name'];
|
||||
$item['person_idcard'] = $person['idcard'];
|
||||
$item['work_type_text'] = $person->work_type_text;
|
||||
return $item;
|
||||
})
|
||||
->toArray();
|
||||
$count = ProjectAttendanceDetail::field('id')->where('person_id',$params['person_id'])->count();
|
||||
$result = [
|
||||
'count' => $count,
|
||||
'page_no' => $pageNo,
|
||||
'page_size' => $pageSize,
|
||||
'lists' => $data
|
||||
];
|
||||
return $this->success('请求成功',$result);
|
||||
}
|
||||
|
||||
//某个员工下的施工记录列表
|
||||
public function buildworks() {
|
||||
$params = $this->request->get(['person_id','page_no','page_size']);
|
||||
if(empty($params['person_id'])){
|
||||
return $this->fail('缺少必要参数');
|
||||
}
|
||||
$pageNo = empty($params['page_no']) ? 1 : $params['page_no'];
|
||||
$pageSize = empty($params['page_size']) ? 15 : $params['page_size'];
|
||||
$person = ProjectPersonnel::field('id,name,idcard,work_type')->where('id',$params['person_id'])->findOrEmpty();
|
||||
if($person->isEmpty()){
|
||||
return $this->fail('项目人员信息不存在');
|
||||
}
|
||||
$data = BuildReportDetail::field('id,report_id,work_num,create_time')
|
||||
->where('person_id',$params['person_id'])
|
||||
->page($pageNo,$pageSize)->order('id desc')
|
||||
->select()->each(function($item)use($person){
|
||||
$report = BuildReport::field('report_code,plan_id')->where('id',$item['report_id'])->findOrEmpty();
|
||||
$plan = BuildPlan::field('process_id,zy_code,unit,price')->where('id',$report['plan_id'])->findOrEmpty();
|
||||
$process = BuildProcessSettings::field('division_id,process_step')->where('id',$plan['process_id'])->findOrEmpty();
|
||||
$division = BuildDivision::field('subentry_engineering')->where('id',$process['division_id'])->findOrEmpty();
|
||||
$item['report_code'] = $report['report_code'];
|
||||
$item['zy_code'] = $plan['zy_code'];
|
||||
$item['process_step'] = $process['process_step'];
|
||||
$item['subentry_engineering'] = $division['subentry_engineering'];
|
||||
$item['report_date'] = date('Y-m-d',strtotime($item['create_time']));
|
||||
$item['person_name'] = $person['name'];
|
||||
$item['person_idcard'] = $person['idcard'];
|
||||
$item['work_type_text'] = $person->work_type_text;
|
||||
$item['unit'] = $plan['unit'];
|
||||
$item['price'] = $plan['price'];
|
||||
$item['amount'] = $plan['price'] * $item['work_num'];
|
||||
unset($item['create_time']);
|
||||
return $item;
|
||||
})
|
||||
->toArray();
|
||||
$count = BuildReportDetail::field('id')->where('person_id',$params['person_id'])->count();
|
||||
$result = [
|
||||
'count' => $count,
|
||||
'page_no' => $pageNo,
|
||||
'page_size' => $pageSize,
|
||||
'lists' => $data
|
||||
];
|
||||
return $this->success('请求成功',$result);
|
||||
}
|
||||
|
||||
}
|
||||
@ -62,7 +62,7 @@ class BuildReportLists extends BaseAdminDataLists implements ListsSearchInterfac
|
||||
public function lists(): array
|
||||
{
|
||||
return BuildReport::where($this->searchWhere)
|
||||
->field(['id', 'plan_id', 'scene_file', 'report_workload', 'report_amount', 'remark', 'add_user'])
|
||||
->field(['id', 'report_code', 'plan_id', 'scene_file', 'report_workload', 'report_amount', 'remark', 'add_user'])
|
||||
->limit($this->limitOffset, $this->limitLength)
|
||||
->order(['id' => 'desc'])
|
||||
->select()->each(function($data){
|
||||
|
||||
@ -16,7 +16,11 @@ namespace app\adminapi\logic\project;
|
||||
|
||||
|
||||
use app\common\model\auth\Admin;
|
||||
use app\common\model\build\BuildPlan;
|
||||
use app\common\model\build\BuildReport;
|
||||
use app\common\model\build\BuildReportDetail;
|
||||
use app\common\model\project\Project;
|
||||
use app\common\model\project\ProjectAttendanceDetail;
|
||||
use app\common\model\project\ProjectPersonnel;
|
||||
use app\common\logic\BaseLogic;
|
||||
use think\facade\Db;
|
||||
@ -140,6 +144,20 @@ class ProjectPersonnelLogic extends BaseLogic
|
||||
$data['project_code'] = $project['project_code'];
|
||||
$data['add_user_name'] = $admin[$data['add_user']];
|
||||
$data['update_user_name'] = $admin[$data['update_user']];
|
||||
$data['daily_income'] = ProjectAttendanceDetail::where('person_id',$data['id'])->sum('daily_income');
|
||||
$build_report_details = BuildReportDetail::field('report_id,work_num')->where('person_id',$data['id'])->select()->each(function($item){
|
||||
$report = BuildReport::field('plan_id')->where('id',$item['report_id'])->findOrEmpty();
|
||||
$plan = BuildPlan::field('price')->where('id',$report['plan_id'])->findOrEmpty();
|
||||
$item['amount'] = $item['work_num'] * $plan['price'];
|
||||
})->toArray();
|
||||
$work_income = 0;
|
||||
foreach($build_report_details as $v){
|
||||
$work_income += $v['amount'];
|
||||
}
|
||||
$data['work_income'] = $work_income;
|
||||
$data['total_income'] = $data['daily_income'] + $data['work_income'];
|
||||
$data['pay_out'] = 0;
|
||||
$data['balance'] = $data['total_income'] - $data['pay_out'];
|
||||
return $data->toArray();
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user