|
|
@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
|
|
|
use App\Http\Requests\Manager\Process\ViolationStore as Request;
|
|
|
use App\Models\Manager\Process\ViolationStore as ViolationStoreModel;
|
|
|
use App\Jobs\Manager\Process\ViolationStoreJobs;
|
|
|
+use App\Models\Manager\Personnel\Employee as EmployeeModel;
|
|
|
|
|
|
/**
|
|
|
* 违规处理-违规店铺
|
|
|
@@ -22,7 +23,7 @@ class ViolationStore extends Controller
|
|
|
* @date 2025-12-08
|
|
|
*
|
|
|
*/
|
|
|
- public function list(Request $request, ViolationStoreModel $ViolationStoreModel)
|
|
|
+ public function list(Request $request, ViolationStoreModel $ViolationStoreModel, EmployeeModel $EmployeeModel)
|
|
|
{
|
|
|
$request->scene('list')->validate();
|
|
|
// 查询条件
|
|
|
@@ -43,7 +44,7 @@ class ViolationStore extends Controller
|
|
|
if ($end_time) $map[] = ['insert_time', '<=', strtotime($end_time)];
|
|
|
// 其他条件
|
|
|
if (is_numeric($status)) $map[] = ['status', '=', $status];
|
|
|
-
|
|
|
+
|
|
|
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%"];
|
|
|
@@ -55,9 +56,25 @@ class ViolationStore extends Controller
|
|
|
$result = $ViolationStoreModel->query()
|
|
|
->where($map)
|
|
|
->orderByDesc('id')
|
|
|
- ->paginate($limit);
|
|
|
+ ->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]);
|
|
|
}
|
|
|
@@ -68,7 +85,7 @@ class ViolationStore extends Controller
|
|
|
* @version 1.0
|
|
|
* @date 2025-12-08
|
|
|
*/
|
|
|
- public function detail(Request $request, ViolationStoreModel $ViolationStoreModel)
|
|
|
+ public function detail(Request $request, ViolationStoreModel $ViolationStoreModel, EmployeeModel $EmployeeModel)
|
|
|
{
|
|
|
$request->scene('detail')->validate();
|
|
|
// 接收参数
|
|
|
@@ -76,6 +93,18 @@ class ViolationStore extends Controller
|
|
|
$map = ['id' => $id];
|
|
|
$data = $ViolationStoreModel->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]);
|
|
|
}
|
|
|
@@ -216,11 +245,11 @@ class ViolationStore extends Controller
|
|
|
*/
|
|
|
public function data_cleaning(Request $request)
|
|
|
{
|
|
|
- // 验证参数
|
|
|
+ // 验证参数
|
|
|
$request->scene('data_cleaning')->validate();
|
|
|
$access_token = request('access_token', '');
|
|
|
- $admin_id=$access_token['uid'];
|
|
|
- $message_data =['page'=>'1','limit'=>50,'admin_id'=>$admin_id];
|
|
|
+ $admin_id = $access_token['uid'];
|
|
|
+ $message_data = ['page' => '1', 'limit' => 50, 'admin_id' => $admin_id];
|
|
|
ViolationStoreJobs::dispatch($message_data);
|
|
|
// ViolationStoreJobs::dispatchSync($message_data);
|
|
|
// 告知结果
|