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 13:50:13 +08:00
parent 7706cb2b19
commit cc98f46f98
6 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/adminapi/lists/marketing/MarketingCustomReturnVisitEvaluateLists.php
View File

@ -17,6 +17,7 @@
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\marketing\MarketingContract;
use app\common\model\marketing\MarketingCustomReturnVisit;
use app\common\model\marketing\MarketingCustomReturnVisitEvaluate;
@ -61,8 +62,8 @@
->order(['id' => 'desc'])
->select()->each(function ($data) {
$custom_return_visit = MarketingCustomReturnVisit::field('contract_id,code')->where('id', $data['custom_return_visit_id'])->findOrEmpty();
//todo
$data['contract_name'] = '';
$contract = MarketingContract::field('contract_name')->where('id', $custom_return_visit['contract_id'])->findOrEmpty();
$data['contract_name'] = $contract['contract_name'];
$data['custom_return_visit_code'] = $custom_return_visit['code'];
})
->toArray();

11
app/adminapi/lists/marketing/MarketingCustomReturnVisitLists.php
View File

@ -17,6 +17,8 @@
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\marketing\MarketingContract;
use app\common\model\marketing\MarketingCustom;
use app\common\model\marketing\MarketingCustomReturnVisit;
use app\common\model\marketing\MarketingCustomReturnVisitTemplate;
@ -62,10 +64,11 @@
->select()->each(function ($data) {
$custom_return_visit_template = MarketingCustomReturnVisitTemplate::field('name')->where('id', $data['custom_return_visit_template_id'])->findOrEmpty();
$data['template_name'] = $custom_return_visit_template['name'];
//todo
$data['contract_name'] = '';
$data['custom_name'] = '';
$data['custom_head'] = '';
$contract = MarketingContract::field('contract_name,part_a,part_a_contact')->where('id', $data['contract_id'])->findOrEmpty();
$custom = MarketingCustom::field('name')->where('id', $contract['part_a'])->findOrEmpty();
$data['contract_name'] = $contract['contract_name'];
$data['custom_name'] = $custom['name'];
$data['custom_head'] = $contract['part_a_contact'];
$data['return_visit_type_text'] = $data->return_visit_type_text;
})
->toArray();

11
app/adminapi/logic/marketing/MarketingCustomReturnVisitLogic.php
View File

@ -16,6 +16,8 @@
use app\common\logic\BaseLogic;
use app\common\model\marketing\MarketingContract;
use app\common\model\marketing\MarketingCustom;
use app\common\model\marketing\MarketingCustomReturnVisit;
use app\common\model\marketing\MarketingCustomReturnVisitEvaluate;
use app\common\model\marketing\MarketingCustomReturnVisitSurvey;
@ -190,10 +192,11 @@
$data = MarketingCustomReturnVisit::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$custom_return_visit_template = MarketingCustomReturnVisitTemplate::field('name')->where('id', $data['custom_return_visit_template_id'])->findOrEmpty();
$data['template_name'] = $custom_return_visit_template['name'];
//todo
$data['contract_name'] = '';
$data['custom_name'] = '';
$data['custom_head'] = '';
$contract = MarketingContract::field('contract_name,part_a,part_a_contact')->where('id', $data['contract_id'])->findOrEmpty();
$custom = MarketingCustom::field('name')->where('id', $contract['part_a'])->findOrEmpty();
$data['contract_name'] = $contract['contract_name'];
$data['custom_name'] = $custom['name'];
$data['custom_head'] = $contract['part_a_contact'];
$data['return_visit_type_text'] = $data->return_visit_type_text;
return $data->toArray();
}

5
app/adminapi/validate/marketing/MarketingCustomReturnVisitValidate.php
View File

@ -16,6 +16,7 @@
use app\common\model\dict\DictData;
use app\common\model\marketing\MarketingContract;
use app\common\model\marketing\MarketingCustomReturnVisit;
use app\common\model\marketing\MarketingCustomReturnVisitEvaluate;
use app\common\model\marketing\MarketingCustomReturnVisitSurvey;
@ -117,8 +118,8 @@
public function checkContract($value)
{
//todo
return true;
$data = MarketingContract::where('id', $value)->findOrEmpty();
return $data->isEmpty() ? '合同数据不存在' : true;
}
public function checkReturnVisitType($value): bool|string

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

@ -126,10 +126,10 @@
return true;
}
public function checkPerson($value, $rule, $data): bool|string
public function checkPerson($value): bool|string
{
$person = ProjectPersonnel::where('id', $value)->findOrEmpty();
if ($person->isEmpty() || $person['project_id'] != $data['project_id']) {
if ($person->isEmpty()) {
return '项目人员不存在';
}
return true;

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

@ -128,12 +128,12 @@
}
}
if (isset($v['work_start_time']) && $v['work_start_time'] != '') {
if (date('Y-m-d H:i', strtotime($v['work_start_time'])) != $v['work_start_time']) {
if (date('H:i', strtotime($v['work_start_time'])) != $v['work_start_time']) {
return '上班时间格式错误';
}
}
if (isset($v['work_end_time']) && $v['work_end_time'] != '') {
if (date('Y-m-d H:i', strtotime($v['work_end_time'])) != $v['work_end_time']) {
if (date('H:i', strtotime($v['work_end_time'])) != $v['work_end_time']) {
return '下班时间格式错误';
}
if (strtotime($v['work_end_time']) - strtotime($v['work_start_time']) < 0) {