|
|
@@ -178,12 +178,22 @@ class ViolationProduct extends Model
|
|
|
$first_responsible_persons = $data['first_responsible_person'] != '' ? explode(',', $data['first_responsible_person']) : [];
|
|
|
$first_responsible_person_data = [];
|
|
|
if (count($first_responsible_persons) > 0) {
|
|
|
+ $EmployeeModel = new EmployeeModel();
|
|
|
+ $employee_user_list = $EmployeeModel->whereIn('id', $first_responsible_persons)->select(['id', 'name'])->get()->toarray();
|
|
|
+ $employee_user_list_name = [];
|
|
|
+ if (!empty($employee_user_list)) {
|
|
|
+ foreach ($employee_user_list as $key => $employee_user_info) {
|
|
|
+ $employee_id = $employee_user_info['id'];
|
|
|
+ $employee_user_list_name[$employee_id] = $employee_user_info['name'];
|
|
|
+ }
|
|
|
+ }
|
|
|
foreach ($first_responsible_persons as $key => $employee_id) {
|
|
|
//如果不是数字或者为空,则跳过
|
|
|
if ($employee_id == '' || is_null($employee_id) || !is_numeric($employee_id)) continue;
|
|
|
$first_responsible_person_data[] = [
|
|
|
'violation_product_logid' => $ViolationProduct_id,
|
|
|
'employee_id' => $employee_id,
|
|
|
+ 'employee_name' => isset($employee_user_list_name[$employee_id]) ? $employee_user_list_name[$employee_id] : '',
|
|
|
'duty_type' => 1, //责任类型1=第一责任人,2=责任人,3=溯源责任人
|
|
|
];
|
|
|
}
|
|
|
@@ -192,12 +202,22 @@ class ViolationProduct extends Model
|
|
|
$responsible_persons = $data['responsible_person'] != '' ? explode(',', $data['responsible_person']) : [];
|
|
|
$responsible_person_data = [];
|
|
|
if (count($responsible_persons) > 0) {
|
|
|
+ $EmployeeModel = new EmployeeModel();
|
|
|
+ $employee_user_list = $EmployeeModel->whereIn('id', $responsible_persons)->select(['id', 'name'])->get()->toarray();
|
|
|
+ $employee_user_list_name = [];
|
|
|
+ if (!empty($employee_user_list)) {
|
|
|
+ foreach ($employee_user_list as $key => $employee_user_info) {
|
|
|
+ $employee_id = $employee_user_info['id'];
|
|
|
+ $employee_user_list_name[$employee_id] = $employee_user_info['name'];
|
|
|
+ }
|
|
|
+ }
|
|
|
foreach ($responsible_persons as $key => $employee_id) {
|
|
|
//如果不是数字或者为空,则跳过
|
|
|
if ($employee_id == '' || is_null($employee_id) || !is_numeric($employee_id)) continue;
|
|
|
$responsible_person_data[] = [
|
|
|
'violation_product_logid' => $ViolationProduct_id,
|
|
|
'employee_id' => $employee_id,
|
|
|
+ 'employee_name' => isset($employee_user_list_name[$employee_id]) ? $employee_user_list_name[$employee_id] : '',
|
|
|
'duty_type' => 2, //责任类型1=第一责任人,2=责任人,3=溯源责任人
|
|
|
];
|
|
|
}
|
|
|
@@ -206,12 +226,22 @@ class ViolationProduct extends Model
|
|
|
$source_responsible_persons = $data['source_responsible_person'] != '' ? explode(',', $data['source_responsible_person']) : [];
|
|
|
$source_responsible_person_data = [];
|
|
|
if (count($source_responsible_persons) > 0) {
|
|
|
+ $EmployeeModel = new EmployeeModel();
|
|
|
+ $employee_user_list = $EmployeeModel->whereIn('id', $source_responsible_persons)->select(['id', 'name'])->get()->toarray();
|
|
|
+ $employee_user_list_name = [];
|
|
|
+ if (!empty($employee_user_list)) {
|
|
|
+ foreach ($employee_user_list as $key => $employee_user_info) {
|
|
|
+ $employee_id = $employee_user_info['id'];
|
|
|
+ $employee_user_list_name[$employee_id] = $employee_user_info['name'];
|
|
|
+ }
|
|
|
+ }
|
|
|
foreach ($source_responsible_persons as $key => $employee_id) {
|
|
|
//如果不是数字或者为空,则跳过
|
|
|
if ($employee_id == '' || is_null($employee_id) || !is_numeric($employee_id)) continue;
|
|
|
$source_responsible_person_data[] = [
|
|
|
'violation_product_logid' => $ViolationProduct_id,
|
|
|
'employee_id' => $employee_id,
|
|
|
+ 'employee_name' => isset($employee_user_list_name[$employee_id]) ? $employee_user_list_name[$employee_id] : '',
|
|
|
'duty_type' => 3, //责任类型1=第一责任人,2=责任人,3=溯源责任人
|
|
|
];
|
|
|
}
|