|
@@ -11,6 +11,7 @@ use App\Models\Manager\Personnel\EmployeeArea as EmployeeAreaModel;
|
|
|
use App\Models\Manager\Personnel\Employee as EmployeeModel;
|
|
use App\Models\Manager\Personnel\Employee as EmployeeModel;
|
|
|
use App\Models\Manager\WashConfig\ViolationCompany as ViolationCompanyModel;
|
|
use App\Models\Manager\WashConfig\ViolationCompany as ViolationCompanyModel;
|
|
|
use App\Models\Manager\WashConfig\ViolationCompanyMember as ViolationCompanyMemberModel;
|
|
use App\Models\Manager\WashConfig\ViolationCompanyMember as ViolationCompanyMemberModel;
|
|
|
|
|
+use App\Models\Manager\Process\ViolationProductMember as ViolationProductMemberModel;
|
|
|
use App\Models\Manager\Personnel\EmployeePlatform as EmployeePlatformModel;
|
|
use App\Models\Manager\Personnel\EmployeePlatform as EmployeePlatformModel;
|
|
|
use App\Models\Manager\Process\LowPriceGoodsMember as LowPriceGoodsMemberModel;
|
|
use App\Models\Manager\Process\LowPriceGoodsMember as LowPriceGoodsMemberModel;
|
|
|
use App\Models\Manager\Process\ViolationStoreMember as ViolationStoreMemberModel;
|
|
use App\Models\Manager\Process\ViolationStoreMember as ViolationStoreMemberModel;
|
|
@@ -103,18 +104,27 @@ class CollectData extends Controller
|
|
|
$first_responsible_persons = array_unique($first_responsible_persons);
|
|
$first_responsible_persons = array_unique($first_responsible_persons);
|
|
|
//移除数组内的空值
|
|
//移除数组内的空值
|
|
|
$first_responsible_persons = array_filter($first_responsible_persons);
|
|
$first_responsible_persons = array_filter($first_responsible_persons);
|
|
|
|
|
+ $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) {
|
|
foreach ($first_responsible_persons as $key => $employee_id) {
|
|
|
//如果不是数字或者为空,则跳过
|
|
//如果不是数字或者为空,则跳过
|
|
|
if ($employee_id == '' || is_null($employee_id) || !is_numeric($employee_id)) continue;
|
|
if ($employee_id == '' || is_null($employee_id) || !is_numeric($employee_id)) continue;
|
|
|
$first_responsible_person_data[] = [
|
|
$first_responsible_person_data[] = [
|
|
|
'lowprice_product_logid' => $LowPriceGoods_id,
|
|
'lowprice_product_logid' => $LowPriceGoods_id,
|
|
|
'employee_id' => $employee_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=溯源责任人
|
|
'duty_type' => 1, //责任类型1=第一责任人,2=责任人,3=溯源责任人
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
$LowPriceGoodsMemberModel->insert($first_responsible_person_data);
|
|
$LowPriceGoodsMemberModel->insert($first_responsible_person_data);
|
|
|
- $data['responsible_person'] = isset($insert_product_data['responsible_person']) ? $insert_product_data['responsible_person'] : '';
|
|
|
|
|
$responsible_persons = $data['responsible_person'] != '' ? explode(',', $data['responsible_person']) : [];
|
|
$responsible_persons = $data['responsible_person'] != '' ? explode(',', $data['responsible_person']) : [];
|
|
|
$responsible_person_data = [];
|
|
$responsible_person_data = [];
|
|
|
if (count($responsible_persons) > 0) {
|
|
if (count($responsible_persons) > 0) {
|
|
@@ -122,18 +132,27 @@ class CollectData extends Controller
|
|
|
$responsible_persons = array_unique($responsible_persons);
|
|
$responsible_persons = array_unique($responsible_persons);
|
|
|
//移除数组内的空值
|
|
//移除数组内的空值
|
|
|
$responsible_persons = array_filter($responsible_persons);
|
|
$responsible_persons = array_filter($responsible_persons);
|
|
|
|
|
+ $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) {
|
|
foreach ($responsible_persons as $key => $employee_id) {
|
|
|
//如果不是数字或者为空,则跳过
|
|
//如果不是数字或者为空,则跳过
|
|
|
if ($employee_id == '' || is_null($employee_id) || !is_numeric($employee_id)) continue;
|
|
if ($employee_id == '' || is_null($employee_id) || !is_numeric($employee_id)) continue;
|
|
|
$responsible_person_data[] = [
|
|
$responsible_person_data[] = [
|
|
|
'lowprice_product_logid' => $LowPriceGoods_id,
|
|
'lowprice_product_logid' => $LowPriceGoods_id,
|
|
|
'employee_id' => $employee_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=溯源责任人
|
|
'duty_type' => 2, //责任类型1=第一责任人,2=责任人,3=溯源责任人
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
$LowPriceGoodsMemberModel->insert($responsible_person_data);
|
|
$LowPriceGoodsMemberModel->insert($responsible_person_data);
|
|
|
- $data['source_responsible_person'] = isset($insert_product_data['source_responsible_person']) ? $insert_product_data['source_responsible_person'] : '';
|
|
|
|
|
$source_responsible_persons = $data['source_responsible_person'] != '' ? explode(',', $data['source_responsible_person']) : [];
|
|
$source_responsible_persons = $data['source_responsible_person'] != '' ? explode(',', $data['source_responsible_person']) : [];
|
|
|
$source_responsible_person_data = [];
|
|
$source_responsible_person_data = [];
|
|
|
if (count($source_responsible_persons) > 0) {
|
|
if (count($source_responsible_persons) > 0) {
|
|
@@ -141,12 +160,22 @@ class CollectData extends Controller
|
|
|
$source_responsible_persons = array_unique($source_responsible_persons);
|
|
$source_responsible_persons = array_unique($source_responsible_persons);
|
|
|
//移除数组内的空值
|
|
//移除数组内的空值
|
|
|
$source_responsible_persons = array_filter($source_responsible_persons);
|
|
$source_responsible_persons = array_filter($source_responsible_persons);
|
|
|
|
|
+ $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) {
|
|
foreach ($source_responsible_persons as $key => $employee_id) {
|
|
|
//如果不是数字或者为空,则跳过
|
|
//如果不是数字或者为空,则跳过
|
|
|
if ($employee_id == '' || is_null($employee_id) || !is_numeric($employee_id)) continue;
|
|
if ($employee_id == '' || is_null($employee_id) || !is_numeric($employee_id)) continue;
|
|
|
$source_responsible_person_data[] = [
|
|
$source_responsible_person_data[] = [
|
|
|
'lowprice_product_logid' => $LowPriceGoods_id,
|
|
'lowprice_product_logid' => $LowPriceGoods_id,
|
|
|
'employee_id' => $employee_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=溯源责任人
|
|
'duty_type' => 3, //责任类型1=第一责任人,2=责任人,3=溯源责任人
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
@@ -453,8 +482,8 @@ class CollectData extends Controller
|
|
|
*/
|
|
*/
|
|
|
private function insert_violation_product_responsible_person_info($product_data, $data)
|
|
private function insert_violation_product_responsible_person_info($product_data, $data)
|
|
|
{
|
|
{
|
|
|
- $ViolationStoreMemberModel = new ViolationStoreMemberModel();
|
|
|
|
|
- $ViolationStore_id = $product_data['id'];
|
|
|
|
|
|
|
+ $ViolationProductMemberModel = new ViolationProductMemberModel();
|
|
|
|
|
+ $ViolationProduct_id = $product_data['id'];
|
|
|
$first_responsible_persons = $data['first_responsible_person'] != '' ? explode(',', $data['first_responsible_person']) : [];
|
|
$first_responsible_persons = $data['first_responsible_person'] != '' ? explode(',', $data['first_responsible_person']) : [];
|
|
|
$first_responsible_person_data = [];
|
|
$first_responsible_person_data = [];
|
|
|
if (count($first_responsible_persons) > 0) {
|
|
if (count($first_responsible_persons) > 0) {
|
|
@@ -462,17 +491,27 @@ class CollectData extends Controller
|
|
|
$first_responsible_persons = array_unique($first_responsible_persons);
|
|
$first_responsible_persons = array_unique($first_responsible_persons);
|
|
|
//移除数组内的空值
|
|
//移除数组内的空值
|
|
|
$first_responsible_persons = array_filter($first_responsible_persons);
|
|
$first_responsible_persons = array_filter($first_responsible_persons);
|
|
|
|
|
+ $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) {
|
|
foreach ($first_responsible_persons as $key => $employee_id) {
|
|
|
//如果不是数字或者为空,则跳过
|
|
//如果不是数字或者为空,则跳过
|
|
|
if ($employee_id == '' || is_null($employee_id) || !is_numeric($employee_id)) continue;
|
|
if ($employee_id == '' || is_null($employee_id) || !is_numeric($employee_id)) continue;
|
|
|
$first_responsible_person_data[] = [
|
|
$first_responsible_person_data[] = [
|
|
|
- 'violation_store_logid' => $ViolationStore_id,
|
|
|
|
|
|
|
+ 'violation_product_logid' => $ViolationProduct_id,
|
|
|
'employee_id' => $employee_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=溯源责任人
|
|
'duty_type' => 1, //责任类型1=第一责任人,2=责任人,3=溯源责任人
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- $ViolationStoreMemberModel->insert($first_responsible_person_data);
|
|
|
|
|
|
|
+ $ViolationProductMemberModel->insert($first_responsible_person_data);
|
|
|
$responsible_persons = $data['responsible_person'] != '' ? explode(',', $data['responsible_person']) : [];
|
|
$responsible_persons = $data['responsible_person'] != '' ? explode(',', $data['responsible_person']) : [];
|
|
|
$responsible_person_data = [];
|
|
$responsible_person_data = [];
|
|
|
if (count($responsible_persons) > 0) {
|
|
if (count($responsible_persons) > 0) {
|
|
@@ -480,17 +519,27 @@ class CollectData extends Controller
|
|
|
$responsible_persons = array_unique($responsible_persons);
|
|
$responsible_persons = array_unique($responsible_persons);
|
|
|
//移除数组内的空值
|
|
//移除数组内的空值
|
|
|
$responsible_persons = array_filter($responsible_persons);
|
|
$responsible_persons = array_filter($responsible_persons);
|
|
|
|
|
+ $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) {
|
|
foreach ($responsible_persons as $key => $employee_id) {
|
|
|
//如果不是数字或者为空,则跳过
|
|
//如果不是数字或者为空,则跳过
|
|
|
if ($employee_id == '' || is_null($employee_id) || !is_numeric($employee_id)) continue;
|
|
if ($employee_id == '' || is_null($employee_id) || !is_numeric($employee_id)) continue;
|
|
|
$responsible_person_data[] = [
|
|
$responsible_person_data[] = [
|
|
|
- 'violation_store_logid' => $ViolationStore_id,
|
|
|
|
|
|
|
+ 'violation_product_logid' => $ViolationProduct_id,
|
|
|
'employee_id' => $employee_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=溯源责任人
|
|
'duty_type' => 2, //责任类型1=第一责任人,2=责任人,3=溯源责任人
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- $ViolationStoreMemberModel->insert($responsible_person_data);
|
|
|
|
|
|
|
+ $ViolationProductMemberModel->insert($responsible_person_data);
|
|
|
$source_responsible_persons = $data['source_responsible_person'] != '' ? explode(',', $data['source_responsible_person']) : [];
|
|
$source_responsible_persons = $data['source_responsible_person'] != '' ? explode(',', $data['source_responsible_person']) : [];
|
|
|
$source_responsible_person_data = [];
|
|
$source_responsible_person_data = [];
|
|
|
if (count($source_responsible_persons) > 0) {
|
|
if (count($source_responsible_persons) > 0) {
|
|
@@ -498,17 +547,27 @@ class CollectData extends Controller
|
|
|
$source_responsible_persons = array_unique($source_responsible_persons);
|
|
$source_responsible_persons = array_unique($source_responsible_persons);
|
|
|
//移除数组内的空值
|
|
//移除数组内的空值
|
|
|
$source_responsible_persons = array_filter($source_responsible_persons);
|
|
$source_responsible_persons = array_filter($source_responsible_persons);
|
|
|
|
|
+ $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) {
|
|
foreach ($source_responsible_persons as $key => $employee_id) {
|
|
|
//如果不是数字或者为空,则跳过
|
|
//如果不是数字或者为空,则跳过
|
|
|
if ($employee_id == '' || is_null($employee_id) || !is_numeric($employee_id)) continue;
|
|
if ($employee_id == '' || is_null($employee_id) || !is_numeric($employee_id)) continue;
|
|
|
$source_responsible_person_data[] = [
|
|
$source_responsible_person_data[] = [
|
|
|
- 'violation_store_logid' => $ViolationStore_id,
|
|
|
|
|
|
|
+ 'violation_product_logid' => $ViolationProduct_id,
|
|
|
'employee_id' => $employee_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=溯源责任人
|
|
'duty_type' => 3, //责任类型1=第一责任人,2=责任人,3=溯源责任人
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- $ViolationStoreMemberModel->insert($source_responsible_person_data);
|
|
|
|
|
|
|
+ $ViolationProductMemberModel->insert($source_responsible_person_data);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -569,12 +628,26 @@ class CollectData extends Controller
|
|
|
$first_responsible_persons = $data['first_responsible_person'] != '' ? explode(',', $data['first_responsible_person']) : [];
|
|
$first_responsible_persons = $data['first_responsible_person'] != '' ? explode(',', $data['first_responsible_person']) : [];
|
|
|
$first_responsible_person_data = [];
|
|
$first_responsible_person_data = [];
|
|
|
if (count($first_responsible_persons) > 0) {
|
|
if (count($first_responsible_persons) > 0) {
|
|
|
|
|
+ //去除重复的责任人
|
|
|
|
|
+ $first_responsible_persons = array_unique($first_responsible_persons);
|
|
|
|
|
+ //移除数组内的空值
|
|
|
|
|
+ $first_responsible_persons = array_filter($first_responsible_persons);
|
|
|
|
|
+ $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) {
|
|
foreach ($first_responsible_persons as $key => $employee_id) {
|
|
|
//如果不是数字或者为空,则跳过
|
|
//如果不是数字或者为空,则跳过
|
|
|
if ($employee_id == '' || is_null($employee_id) || !is_numeric($employee_id)) continue;
|
|
if ($employee_id == '' || is_null($employee_id) || !is_numeric($employee_id)) continue;
|
|
|
$first_responsible_person_data[] = [
|
|
$first_responsible_person_data[] = [
|
|
|
'violation_store_logid' => $ViolationStore_id,
|
|
'violation_store_logid' => $ViolationStore_id,
|
|
|
'employee_id' => $employee_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=溯源责任人
|
|
'duty_type' => 1, //责任类型1=第一责任人,2=责任人,3=溯源责任人
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
@@ -583,12 +656,26 @@ class CollectData extends Controller
|
|
|
$responsible_persons = $data['responsible_person'] != '' ? explode(',', $data['responsible_person']) : [];
|
|
$responsible_persons = $data['responsible_person'] != '' ? explode(',', $data['responsible_person']) : [];
|
|
|
$responsible_person_data = [];
|
|
$responsible_person_data = [];
|
|
|
if (count($responsible_persons) > 0) {
|
|
if (count($responsible_persons) > 0) {
|
|
|
|
|
+ //去除重复的责任人
|
|
|
|
|
+ $responsible_persons = array_unique($responsible_persons);
|
|
|
|
|
+ //移除数组内的空值
|
|
|
|
|
+ $responsible_persons = array_filter($responsible_persons);
|
|
|
|
|
+ $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) {
|
|
foreach ($responsible_persons as $key => $employee_id) {
|
|
|
//如果不是数字或者为空,则跳过
|
|
//如果不是数字或者为空,则跳过
|
|
|
if ($employee_id == '' || is_null($employee_id) || !is_numeric($employee_id)) continue;
|
|
if ($employee_id == '' || is_null($employee_id) || !is_numeric($employee_id)) continue;
|
|
|
$responsible_person_data[] = [
|
|
$responsible_person_data[] = [
|
|
|
'violation_store_logid' => $ViolationStore_id,
|
|
'violation_store_logid' => $ViolationStore_id,
|
|
|
'employee_id' => $employee_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=溯源责任人
|
|
'duty_type' => 2, //责任类型1=第一责任人,2=责任人,3=溯源责任人
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
@@ -597,12 +684,26 @@ class CollectData extends Controller
|
|
|
$source_responsible_persons = $data['source_responsible_person'] != '' ? explode(',', $data['source_responsible_person']) : [];
|
|
$source_responsible_persons = $data['source_responsible_person'] != '' ? explode(',', $data['source_responsible_person']) : [];
|
|
|
$source_responsible_person_data = [];
|
|
$source_responsible_person_data = [];
|
|
|
if (count($source_responsible_persons) > 0) {
|
|
if (count($source_responsible_persons) > 0) {
|
|
|
|
|
+ //去除重复的责任人
|
|
|
|
|
+ $source_responsible_persons = array_unique($source_responsible_persons);
|
|
|
|
|
+ //移除数组内的空值
|
|
|
|
|
+ $source_responsible_persons = array_filter($source_responsible_persons);
|
|
|
|
|
+ $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) {
|
|
foreach ($source_responsible_persons as $key => $employee_id) {
|
|
|
//如果不是数字或者为空,则跳过
|
|
//如果不是数字或者为空,则跳过
|
|
|
if ($employee_id == '' || is_null($employee_id) || !is_numeric($employee_id)) continue;
|
|
if ($employee_id == '' || is_null($employee_id) || !is_numeric($employee_id)) continue;
|
|
|
$source_responsible_person_data[] = [
|
|
$source_responsible_person_data[] = [
|
|
|
'violation_store_logid' => $ViolationStore_id,
|
|
'violation_store_logid' => $ViolationStore_id,
|
|
|
'employee_id' => $employee_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=溯源责任人
|
|
'duty_type' => 3, //责任类型1=第一责任人,2=责任人,3=溯源责任人
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|