|
@@ -222,15 +222,15 @@ class ViolationProduct extends Controller
|
|
|
foreach ($result['data'] as $key => $value) {
|
|
foreach ($result['data'] as $key => $value) {
|
|
|
//查询第一责任人名称
|
|
//查询第一责任人名称
|
|
|
$first_responsible_person = explode(',', $value['first_responsible_person']);
|
|
$first_responsible_person = explode(',', $value['first_responsible_person']);
|
|
|
- $first_responsible_person_name = $ViolationProductMemberModel->where('violation_product_logid',$value['id'])->whereIn('employee_id', $first_responsible_person)->pluck('employee_name')->toarray();
|
|
|
|
|
|
|
+ $first_responsible_person_name = $ViolationProductMemberModel->where('violation_product_logid',$value['id'])->where('duty_type','1')->whereIn('employee_id', $first_responsible_person)->pluck('employee_name')->toarray();
|
|
|
$result['data'][$key]['first_responsible_person_name'] = $first_responsible_person_name;
|
|
$result['data'][$key]['first_responsible_person_name'] = $first_responsible_person_name;
|
|
|
//查询责任人名称
|
|
//查询责任人名称
|
|
|
$responsible_person = explode(',', $value['responsible_person']);
|
|
$responsible_person = explode(',', $value['responsible_person']);
|
|
|
- $responsible_person_name = $ViolationProductMemberModel->where('violation_product_logid',$value['id'])->whereIn('employee_id', $responsible_person)->pluck('employee_name')->toarray();
|
|
|
|
|
|
|
+ $responsible_person_name = $ViolationProductMemberModel->where('violation_product_logid',$value['id'])->where('duty_type','2')->whereIn('employee_id', $responsible_person)->pluck('employee_name')->toarray();
|
|
|
$result['data'][$key]['responsible_person_name'] = $responsible_person_name;
|
|
$result['data'][$key]['responsible_person_name'] = $responsible_person_name;
|
|
|
//查询来源责任人名称
|
|
//查询来源责任人名称
|
|
|
$source_responsible_person = explode(',', $value['source_responsible_person']);
|
|
$source_responsible_person = explode(',', $value['source_responsible_person']);
|
|
|
- $source_responsible_person_name = $ViolationProductMemberModel->where('violation_product_logid',$value['id'])->whereIn('employee_id', $source_responsible_person)->pluck('employee_name')->toarray();
|
|
|
|
|
|
|
+ $source_responsible_person_name = $ViolationProductMemberModel->where('violation_product_logid',$value['id'])->where('duty_type','3')->whereIn('employee_id', $source_responsible_person)->pluck('employee_name')->toarray();
|
|
|
$result['data'][$key]['source_responsible_person_name'] = $source_responsible_person_name;
|
|
$result['data'][$key]['source_responsible_person_name'] = $source_responsible_person_name;
|
|
|
//关闭快照不展示数据
|
|
//关闭快照不展示数据
|
|
|
if(!empty($snapshot_status) && $snapshot_status == 1) $result['data'][$key]['snapshot_url'] = '';
|
|
if(!empty($snapshot_status) && $snapshot_status == 1) $result['data'][$key]['snapshot_url'] = '';
|