|
|
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api\Process;
|
|
|
use App\Http\Controllers\Api\Api;
|
|
|
use App\Http\Requests\Api\Process\ControlGoods as Request;
|
|
|
use App\Models\Api\Process\ControlGoods as ControlGoodsModel;
|
|
|
+use App\Models\Api\Personnel\Employee as EmployeeModel;
|
|
|
|
|
|
/**
|
|
|
* 违规处理-强管控商品
|
|
|
@@ -14,14 +15,14 @@ use App\Models\Api\Process\ControlGoods as ControlGoodsModel;
|
|
|
*/
|
|
|
class ControlGoods extends Api
|
|
|
{
|
|
|
- /**
|
|
|
+ /**
|
|
|
* 列表
|
|
|
* @author 唐远望
|
|
|
* @version 1.0
|
|
|
* @date 2025-12-09
|
|
|
*
|
|
|
*/
|
|
|
- public function list(Request $request, ControlGoodsModel $ControlGoodsModel)
|
|
|
+ public function list(Request $request, ControlGoodsModel $ControlGoodsModel, EmployeeModel $EmployeeModel)
|
|
|
{
|
|
|
$user_info = $this->checkLogin();
|
|
|
if (!$user_info) return json_send(['code' => 'error', 'msg' => '请先登录']);
|
|
|
@@ -47,7 +48,7 @@ class ControlGoods extends Api
|
|
|
// 其他条件
|
|
|
if ($status) $map[] = ['status', '=', $status];
|
|
|
if ($product_name) $map[] = ['product_name', 'like', "%$product_name%"];
|
|
|
-
|
|
|
+
|
|
|
if ($first_responsible_person) $map[] = ['first_responsible_person', 'like', "%$first_responsible_person%"];
|
|
|
if ($responsible_person) $map[] = ['responsible_person', 'like', "%$responsible_person%"];
|
|
|
if ($platform) $map[] = ['platform', 'like', "%$platform%"];
|
|
|
@@ -56,9 +57,9 @@ class ControlGoods extends Api
|
|
|
if ($source_responsible_person) $map[] = ['source_responsible_person', 'like', "%$source_responsible_person%"];
|
|
|
if ($processing_status) $map[] = ['processing_status', '=', $processing_status];
|
|
|
// 查询数据
|
|
|
- $map1 = array_merge($map, [['first_responsible_person', 'like',"%,$user_id,%"]]);
|
|
|
- $map2 = array_merge($map, [['responsible_person', 'like',"%,$user_id,%"]]);
|
|
|
- $map3 = array_merge($map, [['source_responsible_person', 'like',"%,$user_id,%"]]);
|
|
|
+ $map1 = array_merge($map, [['first_responsible_person', 'like', "%,$user_id,%"]]);
|
|
|
+ $map2 = array_merge($map, [['responsible_person', 'like', "%,$user_id,%"]]);
|
|
|
+ $map3 = array_merge($map, [['source_responsible_person', 'like', "%,$user_id,%"]]);
|
|
|
$result = $ControlGoodsModel->query()
|
|
|
->where($map1)
|
|
|
->orWhere($map2)
|
|
|
@@ -67,6 +68,22 @@ class ControlGoods extends Api
|
|
|
->paginate($limit)->toarray();
|
|
|
// 分配数据
|
|
|
if (!$result) return json_send(['code' => 'error', 'msg' => '暂无数据']);
|
|
|
+ if (isset($result['data']) && count($result['data']) > 0) {
|
|
|
+ foreach ($result['data'] as $key => $value) {
|
|
|
+ //查询第一责任人名称
|
|
|
+ $first_responsible_person = explode(',', $value['first_responsible_person']);
|
|
|
+ $first_responsible_person_name = $EmployeeModel->whereIn('id', $first_responsible_person)->pluck('name')->toarray();
|
|
|
+ $result['data'][$key]['first_responsible_person_name'] = $first_responsible_person_name;
|
|
|
+ //查询责任人名称
|
|
|
+ $responsible_person = explode(',', $value['responsible_person']);
|
|
|
+ $responsible_person_name = $EmployeeModel->whereIn('id', $responsible_person)->pluck('name')->toarray();
|
|
|
+ $result['data'][$key]['responsible_person_name'] = $responsible_person_name;
|
|
|
+ //查询来源责任人名称
|
|
|
+ $source_responsible_person = explode(',', $value['source_responsible_person']);
|
|
|
+ $source_responsible_person_name = $EmployeeModel->whereIn('id', $source_responsible_person)->pluck('name')->toarray();
|
|
|
+ $result['data'][$key]['source_responsible_person_name'] = $source_responsible_person_name;
|
|
|
+ }
|
|
|
+ }
|
|
|
// 加载模板
|
|
|
return json_send(['code' => 'success', 'msg' => '获取成功', 'data' => $result]);
|
|
|
}
|
|
|
@@ -77,7 +94,7 @@ class ControlGoods extends Api
|
|
|
* @version 1.0
|
|
|
* @date 2025-12-09
|
|
|
*/
|
|
|
- public function detail(Request $request, ControlGoodsModel $ControlGoodsModel)
|
|
|
+ public function detail(Request $request, ControlGoodsModel $ControlGoodsModel, EmployeeModel $EmployeeModel)
|
|
|
{
|
|
|
$user_info = $this->checkLogin();
|
|
|
if (!$user_info) return json_send(['code' => 'error', 'msg' => '请先登录']);
|
|
|
@@ -87,6 +104,18 @@ class ControlGoods extends Api
|
|
|
$map = ['id' => $id];
|
|
|
$data = $ControlGoodsModel->where($map)->first();
|
|
|
if (!$data) return json_send(['code' => 'error', 'msg' => '记录不存在']);
|
|
|
+ //查询第一责任人名称
|
|
|
+ $first_responsible_person = explode(',', $data->first_responsible_person);
|
|
|
+ $first_responsible_person_name = $EmployeeModel->whereIn('id', $first_responsible_person)->pluck('name')->toarray();
|
|
|
+ $data->first_responsible_person_name = $first_responsible_person_name;
|
|
|
+ //查询责任人名称
|
|
|
+ $responsible_person = explode(',', $data->responsible_person);
|
|
|
+ $responsible_person_name = $EmployeeModel->whereIn('id', $responsible_person)->pluck('name')->toarray();
|
|
|
+ $data->responsible_person_name = $responsible_person_name;
|
|
|
+ //查询来源责任人名称
|
|
|
+ $source_responsible_person = explode(',', $data->source_responsible_person);
|
|
|
+ $source_responsible_person_name = $EmployeeModel->whereIn('id', $source_responsible_person)->pluck('name')->toarray();
|
|
|
+ $data->source_responsible_person_name = $source_responsible_person_name;
|
|
|
// 加载模板
|
|
|
return json_send(['code' => 'success', 'msg' => '获取成功', 'data' => $data]);
|
|
|
}
|
|
|
@@ -132,11 +161,10 @@ class ControlGoods extends Api
|
|
|
// 查询用户
|
|
|
$where = ['id' => $id];
|
|
|
// 执行修改
|
|
|
- $result = $ControlGoodsModel->changeProcessingStatus($where, $processing_status);
|
|
|
+ $result = $ControlGoodsModel->changeProcessingStatus($where, $processing_status);
|
|
|
// 提示新增失败
|
|
|
if (!$result) return json_send(['code' => 'error', 'msg' => '设置失败']);
|
|
|
// 告知结果
|
|
|
return json_send(['code' => 'success', 'msg' => '设置成功']);
|
|
|
}
|
|
|
-
|
|
|
-}
|
|
|
+}
|