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-04-09 11:22:24 +08:00
parent 3a12e761c9
commit e79af98d1d
9 changed files with 143 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/lists/marketing/MarketingContractLists.php
View File

@ -66,7 +66,7 @@
$contract = MarketingContract::field('contract_name')->where('id', $data['related_contract_id'])->findOrEmpty(); $contract = MarketingContract::field('contract_name')->where('id', $data['related_contract_id'])->findOrEmpty();
$custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty(); $custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty();
$dept = Dept::where('id', 'in', [$data['signed_dept'], $data['supervise_dept']])->column('name', 'id'); $dept = Dept::where('id', 'in', [$data['signed_dept'], $data['supervise_dept']])->column('name', 'id');
$admin = Admin::where('in', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['project_manager'], $data['seal_user']])->column('name', 'id'); $admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['project_manager'], $data['seal_user']])->column('name', 'id');
$data['framework_agreement_name'] = $contract['contract_name']; $data['framework_agreement_name'] = $contract['contract_name'];
$data['part_a_name'] = $custom['name']; $data['part_a_name'] = $custom['name'];
$data['part_b_signatory_name'] = $admin[$data['part_b_signatory']]; $data['part_b_signatory_name'] = $admin[$data['part_b_signatory']];

2
app/adminapi/lists/marketing/MarketingFrameworkAgreementLists.php
View File

@ -64,7 +64,7 @@
->select()->each(function ($data) { ->select()->each(function ($data) {
$custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty(); $custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty();
$dept = Dept::field('name')->where('id', $data['signed_dept'])->findOrEmpty(); $dept = Dept::field('name')->where('id', $data['signed_dept'])->findOrEmpty();
$admin = Admin::where('in', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['seal_user']])->column('name', 'id'); $admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['seal_user']])->column('name', 'id');
$data['part_a_name'] = $custom['name']; $data['part_a_name'] = $custom['name'];
$data['part_b_signatory_name'] = $admin[$data['part_b_signatory']]; $data['part_b_signatory_name'] = $admin[$data['part_b_signatory']];
$data['signed_dept_name'] = $dept['name']; $data['signed_dept_name'] = $dept['name'];

2
app/adminapi/lists/marketing/MarketingSupplementaryAgreementLists.php
View File

@ -65,7 +65,7 @@
$contract = MarketingContract::field('contract_name')->where('id', $data['related_contract_id'])->findOrEmpty(); $contract = MarketingContract::field('contract_name')->where('id', $data['related_contract_id'])->findOrEmpty();
$custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty(); $custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty();
$dept = Dept::field('name')->where('id', $data['signed_dept'])->findOrEmpty(); $dept = Dept::field('name')->where('id', $data['signed_dept'])->findOrEmpty();
$admin = Admin::where('in', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['seal_user']])->column('name', 'id'); $admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['seal_user']])->column('name', 'id');
$data['supplementary_agreement_name'] = $contract['contract_name']; $data['supplementary_agreement_name'] = $contract['contract_name'];
$data['part_a_name'] = $custom['name']; $data['part_a_name'] = $custom['name'];
$data['part_b_signatory_name'] = $admin[$data['part_b_signatory']]; $data['part_b_signatory_name'] = $admin[$data['part_b_signatory']];

2
app/adminapi/lists/project/ProjectAttendanceDetailLists.php
View File

@ -41,7 +41,7 @@
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['project_id'] '=' => ['attendance_id', 'project_id']
]; ];
} }

2
app/adminapi/logic/marketing/MarketingContractLogic.php
View File

@ -191,7 +191,7 @@
$contract = MarketingContract::field('contract_name')->where('id', $data['related_contract_id'])->findOrEmpty(); $contract = MarketingContract::field('contract_name')->where('id', $data['related_contract_id'])->findOrEmpty();
$custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty(); $custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty();
$dept = Dept::where('id', 'in', [$data['signed_dept'], $data['supervise_dept']])->column('name', 'id'); $dept = Dept::where('id', 'in', [$data['signed_dept'], $data['supervise_dept']])->column('name', 'id');
$admin = Admin::where('in', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['project_manager'], $data['seal_user']])->column('name', 'id'); $admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['project_manager'], $data['seal_user']])->column('name', 'id');
$data['framework_agreement_name'] = $contract['contract_name']; $data['framework_agreement_name'] = $contract['contract_name'];
$data['part_a_name'] = $custom['name']; $data['part_a_name'] = $custom['name'];
$data['part_b_signatory_name'] = $admin[$data['part_b_signatory']]; $data['part_b_signatory_name'] = $admin[$data['part_b_signatory']];

2
app/adminapi/logic/marketing/MarketingFrameworkAgreementLogic.php
View File

@ -166,7 +166,7 @@
$data = MarketingContract::withoutField('update_time,delete_time')->findOrEmpty($params['id']); $data = MarketingContract::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty(); $custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty();
$dept = Dept::field('name')->where('id', $data['signed_dept'])->findOrEmpty(); $dept = Dept::field('name')->where('id', $data['signed_dept'])->findOrEmpty();
$admin = Admin::where('in', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['seal_user']])->column('name', 'id'); $admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['seal_user']])->column('name', 'id');
$data['part_a_name'] = $custom['name']; $data['part_a_name'] = $custom['name'];
$data['part_b_signatory_name'] = $admin[$data['part_b_signatory']]; $data['part_b_signatory_name'] = $admin[$data['part_b_signatory']];
$data['signed_dept_name'] = $dept['name']; $data['signed_dept_name'] = $dept['name'];

2
app/adminapi/logic/marketing/MarketingSupplementaryAgreementLogic.php
View File

@ -163,7 +163,7 @@
$contract = MarketingContract::field('contract_name')->where('id', $data['related_contract_id'])->findOrEmpty(); $contract = MarketingContract::field('contract_name')->where('id', $data['related_contract_id'])->findOrEmpty();
$custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty(); $custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty();
$dept = Dept::field('name')->where('id', $data['signed_dept'])->findOrEmpty(); $dept = Dept::field('name')->where('id', $data['signed_dept'])->findOrEmpty();
$admin = Admin::where('in', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['seal_user']])->column('name', 'id'); $admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['seal_user']])->column('name', 'id');
$data['supplementary_agreement_name'] = $contract['contract_name']; $data['supplementary_agreement_name'] = $contract['contract_name'];
$data['part_a_name'] = $custom['name']; $data['part_a_name'] = $custom['name'];
$data['part_b_signatory_name'] = $admin[$data['part_b_signatory']]; $data['part_b_signatory_name'] = $admin[$data['part_b_signatory']];

35
app/adminapi/logic/project/ProjectAttendanceDetailLogic.php
View File

@ -12,23 +12,24 @@
// | 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\logic\BaseLogic; use app\common\model\project\ProjectAttendanceDetail;
use app\common\model\project\ProjectPersonnel; use app\common\model\project\ProjectAttendanceRecord;
use think\facade\Db; use app\common\model\project\ProjectPersonnel;
use think\facade\Db;
/** /**
* 考勤明细逻辑 * 考勤明细逻辑
* Class ProjectAttendanceDetailLogic * Class ProjectAttendanceDetailLogic
* @package app\adminapi\logic\project * @package app\adminapi\logic\project
*/ */
class ProjectAttendanceDetailLogic extends BaseLogic class ProjectAttendanceDetailLogic extends BaseLogic
{ {
/** /**
@ -40,10 +41,12 @@ class ProjectAttendanceDetailLogic extends BaseLogic
*/ */
public static function add(array $params): bool public static function add(array $params): bool
{ {
$attendance = ProjectAttendanceRecord::field('project_id')->where('id', $params['attendance_id'])->findOrEmpty();
Db::startTrans(); Db::startTrans();
try { try {
ProjectAttendanceDetail::create([ ProjectAttendanceDetail::create([
'project_id' => $params['project_id'], 'attendance_id' => $params['attendance_id'],
'project_id' => $attendance['project_id'],
'person_id' => $params['person_id'], 'person_id' => $params['person_id'],
'attendance_date' => strtotime($params['attendance_date']), 'attendance_date' => strtotime($params['attendance_date']),
'work_start_time' => strtotime($params['work_start_time']), 'work_start_time' => strtotime($params['work_start_time']),
@ -75,9 +78,13 @@ class ProjectAttendanceDetailLogic extends BaseLogic
*/ */
public static function edit(array $params): bool public static function edit(array $params): bool
{ {
$attendance = ProjectAttendanceRecord::field('project_id')->where('id', $params['attendance_id'])->findOrEmpty();
Db::startTrans(); Db::startTrans();
try { try {
ProjectAttendanceDetail::where('id', $params['id'])->update([ ProjectAttendanceDetail::where('id', $params['id'])->update([
'attendance_id' => $params['attendance_id'],
'project_id' => $attendance['project_id'],
'person_id' => $params['person_id'],
'attendance_date' => strtotime($params['attendance_date']), 'attendance_date' => strtotime($params['attendance_date']),
'work_start_time' => strtotime($params['work_start_time']), 'work_start_time' => strtotime($params['work_start_time']),
'work_end_time' => strtotime($params['work_end_time']), 'work_end_time' => strtotime($params['work_end_time']),
@ -122,8 +129,10 @@ class ProjectAttendanceDetailLogic extends BaseLogic
public static function detail($params): array public static function detail($params): array
{ {
$data = ProjectAttendanceDetail::findOrEmpty($params['id'])->toArray(); $data = ProjectAttendanceDetail::findOrEmpty($params['id'])->toArray();
$project = Project::field('name,project_code')->where('id',$data['project_id'])->findOrEmpty(); $attendance = ProjectAttendanceRecord::field('attendance_code')->where('id', $params['attendance_id'])->findOrEmpty();
$person = ProjectPersonnel::field('name,idcard,work_type')->where('id',$data['person_id'])->findOrEmpty(); $project = Project::field('name,project_code')->where('id', $data['project_id'])->findOrEmpty();
$person = ProjectPersonnel::field('name,idcard,work_type')->where('id', $data['person_id'])->findOrEmpty();
$data['attendance_code'] = $attendance['attendance_code'];
$data['project_name'] = $project['name']; $data['project_name'] = $project['name'];
$data['project_code'] = $project['project_code']; $data['project_code'] = $project['project_code'];
$data['person_name'] = $person['name']; $data['person_name'] = $person['name'];
@ -131,4 +140,4 @@ class ProjectAttendanceDetailLogic extends BaseLogic
$data['work_type_text'] = $person->work_type_text; $data['work_type_text'] = $person->work_type_text;
return $data; return $data;
} }
} }

13
app/adminapi/validate/project/ProjectAttendanceDetailValidate.php
View File

@ -15,7 +15,7 @@
namespace app\adminapi\validate\project; namespace app\adminapi\validate\project;
use app\common\model\project\Project; use app\common\model\project\ProjectAttendanceRecord;
use app\common\model\project\ProjectPersonnel; use app\common\model\project\ProjectPersonnel;
use app\common\validate\BaseValidate; use app\common\validate\BaseValidate;
@ -34,7 +34,7 @@
*/ */
protected $rule = [ protected $rule = [
'id' => 'require', 'id' => 'require',
'project_id' => 'require|checkProject', 'attendance_id' => 'require|checkAttendance',
'person_id' => 'require|checkPerson', 'person_id' => 'require|checkPerson',
'attendance_date' => 'require|dateFormat:Y-m-d', 'attendance_date' => 'require|dateFormat:Y-m-d',
'work_start_time' => 'dateFormat:H:i', 'work_start_time' => 'dateFormat:H:i',
@ -49,7 +49,7 @@
protected $message = [ protected $message = [
'id.require' => '缺少必要参数', 'id.require' => '缺少必要参数',
'project_id.require' => '请选择项目', 'attendance_id.require' => '请选择考勤记录',
'person_id.require' => '请选择项目人员', 'person_id.require' => '请选择项目人员',
'attendance_date.require' => '请选择考勤日期', 'attendance_date.require' => '请选择考勤日期',
'attendance_date.dateFormat' => '考勤日期格式错误', 'attendance_date.dateFormat' => '考勤日期格式错误',
@ -92,7 +92,6 @@
*/ */
public function sceneEdit() public function sceneEdit()
{ {
return $this->only(['id', 'attendance_date', 'work_start_time', 'work_end_time', 'work_record_num', 'daily_salary', 'daily_living', 'daily_subsidy', 'daily_other', 'daily_income']);
} }
/** /**
@ -118,11 +117,11 @@
return $this->only(['id']); return $this->only(['id']);
} }
public function checkProject($value): bool|string public function checkAttendance($value): bool|string
{ {
$data = Project::where('id', $value)->findOrEmpty(); $data = ProjectAttendanceRecord::where('id', $value)->findOrEmpty();
if ($data->isEmpty()) { if ($data->isEmpty()) {
return '项目不存在'; return '考勤记录信息不存在';
} }
return true; return true;
} }