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-25 16:16:12 +08:00
parent 364c491a98
commit 09df951406
6 changed files with 281 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/adminapi/lists/project/ProjectAttendanceRecordLists.php
View File

@ -12,23 +12,23 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\project; namespace app\adminapi\lists\project;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\project\Project; use app\common\lists\ListsSearchInterface;
use app\common\model\project\ProjectAttendanceDetail; use app\common\model\project\Project;
use app\common\model\project\ProjectAttendanceRecord; use app\common\model\project\ProjectAttendanceDetail;
use app\common\lists\ListsSearchInterface; use app\common\model\project\ProjectAttendanceRecord;
/** /**
* 考勤记录列表 * 考勤记录列表
* Class ProjectAttendanceRecordLists * Class ProjectAttendanceRecordLists
* @package app\adminapi\listsproject * @package app\adminapi\listsproject
*/ */
class ProjectAttendanceRecordLists extends BaseAdminDataLists implements ListsSearchInterface class ProjectAttendanceRecordLists extends BaseAdminDataLists implements ListsSearchInterface
{ {
/** /**
@ -40,7 +40,7 @@ class ProjectAttendanceRecordLists extends BaseAdminDataLists implements ListsSe
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['attendance_date','project_id'], '=' => ['attendance_date', 'project_id'],
]; ];
} }
@ -57,21 +57,21 @@ class ProjectAttendanceRecordLists extends BaseAdminDataLists implements ListsSe
public function lists(): array public function lists(): array
{ {
return ProjectAttendanceRecord::where($this->searchWhere) return ProjectAttendanceRecord::where($this->searchWhere)
->field(['id','attendance_code','project_id', 'attendance_date','remark', 'file']) ->field(['id', 'attendance_code', 'project_id', 'attendance_date', 'remark'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function($item){ ->select()->each(function ($item) {
//'work_record_num', 'daily_salary', 'daily_living', 'daily_subsidy', 'daily_other', 'daily_income', //'work_record_num', 'daily_salary', 'daily_living', 'daily_subsidy', 'daily_other', 'daily_income',
$project = Project::field('name,project_code')->where('id',$item['project_id'])->findOrEmpty(); $project = Project::field('name,project_code')->where('id', $item['project_id'])->findOrEmpty();
$item['project_name'] = $project['name']; $item['project_name'] = $project['name'];
$item['project_code'] = $project['project_code']; $item['project_code'] = $project['project_code'];
$item['work_record_num_total'] = ProjectAttendanceDetail::where('attendance_id',$item['id'])->sum('work_record_num'); $item['work_record_num_total'] = ProjectAttendanceDetail::where('attendance_id', $item['id'])->sum('work_record_num');
$item['daily_salary_total'] = ProjectAttendanceDetail::where('attendance_id',$item['id'])->sum('daily_salary'); $item['daily_salary_total'] = ProjectAttendanceDetail::where('attendance_id', $item['id'])->sum('daily_salary');
$item['daily_living_total'] = ProjectAttendanceDetail::where('attendance_id',$item['id'])->sum('daily_living'); $item['daily_living_total'] = ProjectAttendanceDetail::where('attendance_id', $item['id'])->sum('daily_living');
$item['daily_subsidy_total'] = ProjectAttendanceDetail::where('attendance_id',$item['id'])->sum('daily_subsidy'); $item['daily_subsidy_total'] = ProjectAttendanceDetail::where('attendance_id', $item['id'])->sum('daily_subsidy');
$item['daily_other_total'] = ProjectAttendanceDetail::where('attendance_id',$item['id'])->sum('daily_other'); $item['daily_other_total'] = ProjectAttendanceDetail::where('attendance_id', $item['id'])->sum('daily_other');
$item['daily_income_total'] = ProjectAttendanceDetail::where('attendance_id',$item['id'])->sum('daily_income'); $item['daily_income_total'] = ProjectAttendanceDetail::where('attendance_id', $item['id'])->sum('daily_income');
$item['cqrs'] = ProjectAttendanceDetail::where('attendance_id',$item['id'])->count(); $item['cqrs'] = ProjectAttendanceDetail::where('attendance_id', $item['id'])->count();
return $item; return $item;
}) })
->toArray(); ->toArray();
@ -89,4 +89,4 @@ class ProjectAttendanceRecordLists extends BaseAdminDataLists implements ListsSe
return ProjectAttendanceRecord::where($this->searchWhere)->count(); return ProjectAttendanceRecord::where($this->searchWhere)->count();
} }
} }

45
app/adminapi/logic/project/ProjectAttendanceRecordLogic.php
View File

@ -12,23 +12,23 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\logic\project; namespace app\adminapi\logic\project;
use app\common\model\project\Project; use app\common\logic\BaseLogic;
use app\common\model\project\ProjectAttendanceDetail; use app\common\model\project\Project;
use app\common\model\project\ProjectAttendanceRecord; use app\common\model\project\ProjectAttendanceDetail;
use app\common\logic\BaseLogic; use app\common\model\project\ProjectAttendanceRecord;
use app\common\model\project\ProjectPersonnel; use app\common\model\project\ProjectPersonnel;
use think\facade\Db; use think\facade\Db;
/** /**
* 考勤记录逻辑 * 考勤记录逻辑
* Class ProjectAttendanceRecordLogic * Class ProjectAttendanceRecordLogic
* @package app\adminapi\logic\project * @package app\adminapi\logic\project
*/ */
class ProjectAttendanceRecordLogic extends BaseLogic class ProjectAttendanceRecordLogic extends BaseLogic
{ {
/** /**
@ -42,16 +42,15 @@ class ProjectAttendanceRecordLogic extends BaseLogic
{ {
Db::startTrans(); Db::startTrans();
try { try {
$attendance_detail = $params['attendance_detail'];//json_decode($params['attendance_detail'],true);
$attendance_code = data_unique_code('项目考勤记录'); $attendance_code = data_unique_code('项目考勤记录');
$ProjectAttendanceRecordRes = ProjectAttendanceRecord::create([ $ProjectAttendanceRecordRes = ProjectAttendanceRecord::create([
'project_id' => $params['project_id'], 'project_id' => $params['project_id'],
'attendance_code' => $attendance_code, 'attendance_code' => $attendance_code,
'attendance_date' => strtotime($params['attendance_date']), 'attendance_date' => strtotime($params['attendance_date']),
'remark' => $params['remark'], 'remark' => $params['remark'],
'file' => $params['file']? json_encode($params['file']) : null, 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
]); ]);
foreach($attendance_detail as $v){ foreach ($params['attendance_detail'] as $v) {
ProjectAttendanceDetail::create([ ProjectAttendanceDetail::create([
'attendance_code' => $attendance_code, 'attendance_code' => $attendance_code,
'attendance_id' => $ProjectAttendanceRecordRes->id, 'attendance_id' => $ProjectAttendanceRecordRes->id,
@ -66,7 +65,7 @@ class ProjectAttendanceRecordLogic extends BaseLogic
'daily_subsidy' => $v['daily_subsidy'], 'daily_subsidy' => $v['daily_subsidy'],
'daily_other' => $v['daily_other'], 'daily_other' => $v['daily_other'],
'daily_income' => $v['daily_income'], 'daily_income' => $v['daily_income'],
'remark' => $v['work_num']??'', 'remark' => $v['work_num'] ?? '',
]); ]);
} }
Db::commit(); Db::commit();
@ -91,8 +90,10 @@ class ProjectAttendanceRecordLogic extends BaseLogic
Db::startTrans(); Db::startTrans();
try { try {
ProjectAttendanceRecord::where('id', $params['id'])->update([ ProjectAttendanceRecord::where('id', $params['id'])->update([
'project_id' => $params['project_id'],
'attendance_date' => strtotime($params['attendance_date']), 'attendance_date' => strtotime($params['attendance_date']),
'remark' => $params['remark'], 'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
]); ]);
Db::commit(); Db::commit();
return true; return true;
@ -115,7 +116,7 @@ class ProjectAttendanceRecordLogic extends BaseLogic
{ {
Db::startTrans(); Db::startTrans();
try { try {
$detailIds = ProjectAttendanceDetail::where('attendance_id',$params['id'])->column('id'); $detailIds = ProjectAttendanceDetail::where('attendance_id', $params['id'])->column('id');
ProjectAttendanceDetail::destroy($detailIds); ProjectAttendanceDetail::destroy($detailIds);
ProjectAttendanceRecord::destroy($params['id']); ProjectAttendanceRecord::destroy($params['id']);
Db::commit(); Db::commit();
@ -137,14 +138,14 @@ class ProjectAttendanceRecordLogic extends BaseLogic
*/ */
public static function detail($params): array public static function detail($params): array
{ {
$data = ProjectAttendanceRecord::field(['id','attendance_code','project_id', 'attendance_date','remark', 'file'])->findOrEmpty($params['id'])->toArray(); $data = ProjectAttendanceRecord::field(['id', 'attendance_code', 'project_id', 'attendance_date', 'remark', 'annex'])->findOrEmpty($params['id'])->toArray();
$project = Project::field('name,project_code')->where('id',$data['project_id'])->findOrEmpty(); $project = Project::field('name,project_code')->where('id', $data['project_id'])->findOrEmpty();
$data['project_name'] = $project['name']; $data['project_name'] = $project['name'];
$data['project_code'] = $project['project_code']; $data['project_code'] = $project['project_code'];
$data['attendance_num'] = ProjectAttendanceDetail::field('id')->where('attendance_id',$data['id'])->count(); $data['attendance_num'] = ProjectAttendanceDetail::field('id')->where('attendance_id', $data['id'])->count();
$data['attendance_detail'] = ProjectAttendanceDetail::field(['id', 'person_id', 'work_start_time', 'work_end_time', 'work_record_num', 'daily_salary', 'daily_living', 'daily_subsidy', 'daily_other', 'daily_income', 'remark'])->where('attendance_id',$data['id']) $data['attendance_detail'] = ProjectAttendanceDetail::field(['id', 'person_id', 'work_start_time', 'work_end_time', 'work_record_num', 'daily_salary', 'daily_living', 'daily_subsidy', 'daily_other', 'daily_income', 'remark'])->where('attendance_id', $data['id'])
->select()->each(function($item){ ->select()->each(function ($item) {
$person = ProjectPersonnel::field('name,idcard,work_type')->where('id',$item['person_id'])->findOrEmpty(); $person = ProjectPersonnel::field('name,idcard,work_type')->where('id', $item['person_id'])->findOrEmpty();
$item['name'] = $person['name']; $item['name'] = $person['name'];
$item['idcard'] = $person['idcard']; $item['idcard'] = $person['idcard'];
$item['work_type_text'] = $person->work_type_text; $item['work_type_text'] = $person->work_type_text;
@ -153,4 +154,4 @@ class ProjectAttendanceRecordLogic extends BaseLogic
->toArray(); ->toArray();
return $data; return $data;
} }
} }

1
app/adminapi/logic/project/ProjectSalaryPaymentLogic.php
View File

@ -132,6 +132,7 @@
$project = Project::field('name,project_code')->where('id', $data['project_id'])->findOrEmpty(); $project = Project::field('name,project_code')->where('id', $data['project_id'])->findOrEmpty();
$data['project_name'] = $project['name']; $data['project_name'] = $project['name'];
$data['project_code'] = $project['project_code']; $data['project_code'] = $project['project_code'];
$data['payment_type_text'] = $data->payment_type_text;
//总工资付款 //总工资付款
$data['total_amount'] = ProjectSalaryDetail::where('salary_payment_id', $data['id'])->sum('apply_amount'); $data['total_amount'] = ProjectSalaryDetail::where('salary_payment_id', $data['id'])->sum('apply_amount');
return $data->toArray(); return $data->toArray();

12
app/adminapi/validate/project/ProjectAttendanceRecordValidate.php
View File

@ -37,7 +37,7 @@
'project_id' => 'require|checkProject', 'project_id' => 'require|checkProject',
'attendance_date' => 'require|dateFormat:Y-m-d', 'attendance_date' => 'require|dateFormat:Y-m-d',
'attendance_detail' => 'require|checkAttendanceDetail', 'attendance_detail' => 'require|checkAttendanceDetail',
'file' => 'checkFile', 'annex' => 'checkAnnex',
]; ];
protected $message = [ protected $message = [
@ -105,16 +105,6 @@
return true; return true;
} }
public function checkFile($value): bool|string
{
if (!empty($value) && $value != '') {
if (!is_array($value)) {
return '附件必须是json数组';
}
}
return true;
}
public function checkAttendanceDetail($value, $rule, $data): bool|string public function checkAttendanceDetail($value, $rule, $data): bool|string
{ {
$attendance_detail = $value;//json_decode($value,true); $attendance_detail = $value;//json_decode($value,true);

21
app/common/model/project/ProjectAttendanceRecord.php
View File

@ -12,30 +12,27 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\common\model\project; namespace app\common\model\project;
use app\common\model\BaseModel; use app\common\model\BaseModel;
use think\model\concern\SoftDelete; use think\model\concern\SoftDelete;
/** /**
* 考勤记录模型 * 考勤记录模型
* Class ProjectAttendanceRecord * Class ProjectAttendanceRecord
* @package app\common\model\project * @package app\common\model\project
*/ */
class ProjectAttendanceRecord extends BaseModel class ProjectAttendanceRecord extends BaseModel
{ {
use SoftDelete; use SoftDelete;
protected $name = 'project_attendance_record'; protected $name = 'project_attendance_record';
protected $deleteTime = 'delete_time'; protected $deleteTime = 'delete_time';
public function getFileAttr($value)
{
return !empty($value) ? json_decode($value,true) : '';
}
public function getAttendanceDateAttr($value): string public function getAttendanceDateAttr($value): string
{ {
return !empty($value) ? date('Y-m-d',$value) : ''; return !empty($value) ? date('Y-m-d', $value) : '';
}
} }
}

25
app/common/model/project/ProjectSalaryPayment.php
View File

@ -12,38 +12,39 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\common\model\project; namespace app\common\model\project;
use app\common\model\BaseModel; use app\common\model\BaseModel;
use app\common\model\dict\DictData; use app\common\model\dict\DictData;
use think\model\concern\SoftDelete; use think\model\concern\SoftDelete;
/** /**
* 工资付款模型 * 工资付款模型
* Class ProjectSalaryPayment * Class ProjectSalaryPayment
* @package app\common\model\project * @package app\common\model\project
*/ */
class ProjectSalaryPayment extends BaseModel class ProjectSalaryPayment extends BaseModel
{ {
use SoftDelete; use SoftDelete;
protected $name = 'project_salary_payment'; protected $name = 'project_salary_payment';
protected $deleteTime = 'delete_time'; protected $deleteTime = 'delete_time';
public function getAnnexAttr($value) public function getAnnexAttr($value)
{ {
return !empty($value) ? json_decode($value,true) : ''; return !empty($value) ? json_decode($value, true) : '';
} }
public function getApplyDateAttr($value): string public function getApplyDateAttr($value): string
{ {
return !empty($value) ? date('Y-m-d',$value) : ''; return !empty($value) ? date('Y-m-d', $value) : '';
} }
public function getPaymentTypeAttr($value,$data): string public function getPaymentTypeTextAttr($value, $data): string
{ {
$dictData = DictData::where('type_value','salary_payment_type')->column('name','value'); $dictData = DictData::where('type_value', 'salary_payment_type')->column('name', 'value');
return !empty($data['payment_type']) ? $dictData[$data['payment_type']] : ''; return !empty($data['payment_type']) ? $dictData[$data['payment_type']] : '';
} }
} }