[智价云] 商品部门信息关联展示

app/Http/Controllers/Manager/Personnel/Employee.php

@@ -5,8 +5,12 @@ namespace App\Http\Controllers\Manager\Personnel;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Manager\Personnel\Employee as Request;
 use App\Models\Manager\Personnel\Employee as EmployeeModel;
+use App\Models\Manager\Personnel\Department as DepartmentModel;
+use App\Models\Manager\Personnel\Roles as RolesModel;
+use App\Models\Manager\Citys as CitysModel;
 
 /**
+ * 人员信息管理-员工管理
  * @author 唐远望
  * @version 1.0
  * @date 2025-12-04
@@ -20,7 +24,7 @@ class Employee extends Controller
      * @date      2025-12-04
      * 
      */
-    public function list(Request $request, EmployeeModel $EmployeeModel)
+    public function list(Request $request, EmployeeModel $EmployeeModel,DepartmentModel $DepartmentModel,RolesModel $RolesModel,CitysModel $CitysModel)
     {
         $request->scene('list')->validate();
         // 查询条件
@@ -55,6 +59,23 @@ class Employee extends Controller
             ->paginate($limit);
         // 分配数据
         if (!$result)  return json_send(['code' => 'error', 'msg' => '暂无数据']);
+        if(isset($result['data']) && count($result['data']) > 0){
+            foreach ($result['data'] as $key => $value) {
+                //查询部门信息
+                $department_info = $DepartmentModel->where(['id' => $value['department_id']])->first();
+                //查询角色信息
+                $role_info = $RolesModel->where(['id' => $value['role_id']])->first();
+                //查询城市信息
+                $city_ids = explode(',', $value['city_ids']);
+                $city_info = [];
+                if(count($city_ids) > 0){
+                    $city_info = $CitysModel->whereIn('id', $city_ids)->pluck('name');
+                }
+                $result['data'][$key]['department_name'] = isset($department_info['name']) ? $department_info['name'] : '';
+                $result['data'][$key]['role_name'] = isset($role_info['name']) ? $role_info['name'] : '';
+                $result['data'][$key]['city_info'] = $city_info;
+            }
+        }
         // 加载模板
         return        json_send(['code' => 'success', 'msg' => '获取成功', 'data' => $result]);
     }
@@ -65,7 +86,7 @@ class Employee extends Controller
      * @version   1.0
      * @date      2025-12-04
      */
-    public function detail(Request $request, EmployeeModel $EmployeeModel)
+    public function detail(Request $request, EmployeeModel $EmployeeModel,DepartmentModel $DepartmentModel,RolesModel $RolesModel,CitysModel $CitysModel)
     {
         $request->scene('detail')->validate();
         // 接收参数
@@ -74,6 +95,19 @@ class Employee extends Controller
         $field = ['id','employee_code', 'name','mobile', 'department_id', 'role_id', 'city_ids', 'open_notice','insert_time','update_time','status'];
         $data = $EmployeeModel->where($map)->select($field)->first();
         if (!$data)     return json_send(['code' => 'error', 'msg' => '记录不存在']);
+        // 查询部门信息
+        $department_info = $DepartmentModel->where(['id' => $data['department_id']])->first();
+        // 查询角色信息
+        $role_info = $RolesModel->where(['id' => $data['role_id']])->first();
+        // 查询城市信息
+        $city_ids = explode(',', $data['city_ids']);
+        $city_info = [];
+        if(count($city_ids) > 0){
+            $city_info = $CitysModel->whereIn('id', $city_ids)->pluck('name');
+        }
+        $data['department_name'] = isset($department_info['name']) ? $department_info['name'] : '';
+        $data['role_name'] = isset($role_info['name']) ? $role_info['name'] : '';
+        $data['city_info'] = $city_info;
         // 加载模板
         return json_send(['code' => 'success', 'msg' => '获取成功', 'data' => $data]);
     }

app/Http/Controllers/Manager/WashConfig/ControlGoods.php

@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Manager\WashConfig;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Manager\WashConfig\ControlGoods as Request;
 use App\Models\Manager\WashConfig\ControlGoods as ControlGoodsModel;
-
+use App\Models\Manager\WashConfig\ViolationStore as ViolationStoreModel;
 
 /**
  * 数据清洗-强管控商品配置
@@ -22,7 +22,7 @@ class ControlGoods extends Controller
      * @date      2025-12-03
      * 
      */
-    public function list(Request $request, ControlGoodsModel $ControlGoodsModel)
+    public function list(Request $request, ControlGoodsModel $ControlGoodsModel,ViolationStoreModel $ViolationStoreModel)
     {
         $request->scene('list')->validate();
         // 查询条件
@@ -42,9 +42,21 @@ class ControlGoods extends Controller
         $result = $ControlGoodsModel->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) {
+                //查询店铺名称
+                if(trim($value['store_scope']) == ''){
+                    $result['data'][$key]['store_name'] =['全部店铺'];
+                }else{
+                    $store_scope = explode(',',$value['store_scope']);
+                    $store_name = $ViolationStoreModel->whereIn('id',$store_scope)->pluck('store_name');
+                    $result['data'][$key]['store_name'] = $store_name;
+                }
+            }
+        }
         // 加载模板
         return        json_send(['code' => 'success', 'msg' => '获取成功', 'data' => $result]);
     }
@@ -55,7 +67,7 @@ class ControlGoods extends Controller
      * @version   1.0
      * @date      2025-12-03
      */
-    public function detail(Request $request, ControlGoodsModel $ControlGoodsModel)
+    public function detail(Request $request, ControlGoodsModel $ControlGoodsModel,ViolationStoreModel $ViolationStoreModel)
     {
         $request->scene('detail')->validate();
         // 接收参数
@@ -63,6 +75,14 @@ class ControlGoods extends Controller
         $map = ['id' => $id];
         $data = $ControlGoodsModel->where($map)->first();
         if (!$data)     return json_send(['code' => 'error', 'msg' => '记录不存在']);
+        //查询店铺名称
+        if(trim($data['store_scope']) == ''){
+            $data['store_name'] = ['全部店铺'];
+        }else{
+            $store_scope = explode(',',$data['store_scope']);
+            $store_name = $ViolationStoreModel->whereIn('id',$store_scope)->pluck('store_name');
+            $data['store_name'] = $store_name;
+        }
         // 加载模板
         return json_send(['code' => 'success', 'msg' => '获取成功', 'data' => $data]);
     }

app/Http/Controllers/Manager/WashConfig/LowPriceGoods.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Manager\WashConfig;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Manager\WashConfig\LowPriceGoods as Request;
 use App\Models\Manager\WashConfig\LowPriceGoods as LowPriceGoodsModel;
+use App\Models\Manager\WashConfig\ViolationStore as ViolationStoreModel;
 
 
 /**
@@ -22,7 +23,7 @@ class LowPriceGoods extends Controller
      * @date      2025-12-02
      * 
      */
-    public function list(Request $request, LowPriceGoodsModel $LowPriceGoodsModel)
+    public function list(Request $request, LowPriceGoodsModel $LowPriceGoodsModel,ViolationStoreModel $ViolationStoreModel)
     {
         $request->scene('list')->validate();
         // 查询条件
@@ -42,9 +43,21 @@ class LowPriceGoods extends Controller
         $result = $LowPriceGoodsModel->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) {
+                //查询店铺名称
+                if(trim($value['store_scope']) == ''){
+                    $result['data'][$key]['store_name'] =['全部店铺'];
+                }else{
+                    $store_scope = explode(',',$value['store_scope']);
+                    $store_name = $ViolationStoreModel->whereIn('id',$store_scope)->pluck('store_name');
+                    $result['data'][$key]['store_name'] = $store_name;
+                }
+            }
+        }
         // 加载模板
         return        json_send(['code' => 'success', 'msg' => '获取成功', 'data' => $result]);
     }
@@ -55,7 +68,7 @@ class LowPriceGoods extends Controller
      * @version   1.0
      * @date      2025-12-02
      */
-    public function detail(Request $request, LowPriceGoodsModel $LowPriceGoodsModel)
+    public function detail(Request $request, LowPriceGoodsModel $LowPriceGoodsModel,ViolationStoreModel $ViolationStoreModel)
     {
         $request->scene('detail')->validate();
         // 接收参数
@@ -63,6 +76,14 @@ class LowPriceGoods extends Controller
         $map = ['id' => $id];
         $data = $LowPriceGoodsModel->where($map)->first();
         if (!$data)     return json_send(['code' => 'error', 'msg' => '记录不存在']);
+        //查询店铺名称
+        if(trim($data['store_scope']) == ''){
+            $data['store_name'] = ['全部店铺'];
+        }else{
+            $store_scope = explode(',',$data['store_scope']);
+            $store_name = $ViolationStoreModel->whereIn('id',$store_scope)->pluck('store_name');
+            $data['store_name'] = $store_name;
+        }
         // 加载模板
         return json_send(['code' => 'success', 'msg' => '获取成功', 'data' => $data]);
     }

app/Http/Controllers/Manager/WashConfig/ViolationProduct.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Manager\WashConfig;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Manager\WashConfig\ViolationProduct as Request;
 use App\Models\Manager\WashConfig\ViolationProduct as ViolationProductModel;
+use App\Models\Manager\WashConfig\ViolationStore as ViolationStoreModel;
 
 
 /**
@@ -22,7 +23,7 @@ class ViolationProduct extends Controller
      * @date      2025-12-03
      * 
      */
-    public function list(Request $request, ViolationProductModel $ViolationProductModel)
+    public function list(Request $request, ViolationProductModel $ViolationProductModel,ViolationStoreModel $ViolationStoreModel)
     {
         $request->scene('list')->validate();
         // 查询条件
@@ -42,9 +43,21 @@ class ViolationProduct extends Controller
         $result = $ViolationProductModel->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) {
+                //查询店铺名称
+                if(trim($value['store_scope']) == ''){
+                    $result['data'][$key]['store_name'] =['全部店铺'];
+                }else{
+                    $store_scope = explode(',',$value['store_scope']);
+                    $store_name = $ViolationStoreModel->whereIn('id',$store_scope)->pluck('store_name');
+                    $result['data'][$key]['store_name'] = $store_name;
+                }
+            }
+        }
         // 加载模板
         return        json_send(['code' => 'success', 'msg' => '获取成功', 'data' => $result]);
     }
@@ -55,7 +68,7 @@ class ViolationProduct extends Controller
      * @version   1.0
      * @date      2025-12-03
      */
-    public function detail(Request $request, ViolationProductModel $ViolationProductModel)
+    public function detail(Request $request, ViolationProductModel $ViolationProductModel,ViolationStoreModel $ViolationStoreModel)
     {
         $request->scene('detail')->validate();
         // 接收参数
@@ -63,6 +76,14 @@ class ViolationProduct extends Controller
         $map = ['id' => $id];
         $data = $ViolationProductModel->where($map)->first();
         if (!$data)     return json_send(['code' => 'error', 'msg' => '记录不存在']);
+        //查询店铺名称
+        if(trim($data['store_scope']) == ''){
+            $data['store_name'] = ['全部店铺'];
+        }else{
+            $store_scope = explode(',',$data['store_scope']);
+            $store_name = $ViolationStoreModel->whereIn('id',$store_scope)->pluck('store_name');
+            $data['store_name'] = $store_name;
+        }
         // 加载模板
         return json_send(['code' => 'success', 'msg' => '获取成功', 'data' => $data]);
     }

app/Models/Manager/Personnel/Department.php

@@ -6,6 +6,12 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 
+/**
+ * 部门模型
+ * @author 唐远望
+ * @version 1.0
+ * @date 2025-12-04
+ */
 class Department extends Model
 {
     use HasFactory;

app/Models/Manager/Personnel/Employee.php

@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 
 /**
- * 添加
+ * 员工模型
  * @author 唐远望
  * @version 1.0
  * @date 2025-12-04
@@ -37,6 +37,7 @@ class Employee extends Model
             'mobile'    => $data['mobile'],
             'password'  => md5($data['password']),
             'role_id'     => $data['role_id'],
+            'province_ids'    => isset($data['province_ids'])? $data['province_ids'] : '',
             'city_ids'    => isset($data['city_ids'])? $data['city_ids'] : '',
             'department_id' => $data['department_id'],
             'open_notice' => $data['open_notice'],