Переглянути джерело

[智价云] 公司分类信息记录&查询功能

tangyuanwang 1 день тому
батько
коміт
6ee8ae4a7a

+ 13 - 2
app/Http/Controllers/Manager/WashConfig/ViolationStore.php

@@ -8,6 +8,7 @@ use App\Models\Manager\WashConfig\ViolationStore as ViolationStoreModel;
 use App\Models\Manager\WashConfig\LowPriceGoodsCompany as LowPriceGoodsCompanyModel;
 use App\Models\Manager\WashConfig\ViolationProductCompany as ViolationProductCompanyModel;
 use App\Models\Manager\Personnel\Employee as EmployeeModel;
+use App\Models\Manager\WashConfig\CompanyCategory as CompanyCategoryModel;
 
 /**
  * 数据清洗-违规店铺(公司)配置
@@ -24,7 +25,7 @@ class ViolationStore extends Controller
      * @date      2025-12-03
      * 
      */
-    public function list(Request $request, ViolationStoreModel $ViolationStoreModel,EmployeeModel $EmployeeModel)
+    public function list(Request $request, ViolationStoreModel $ViolationStoreModel,EmployeeModel $EmployeeModel, CompanyCategoryModel $CompanyCategoryModel)
     {
         $request->scene('list')->validate();
         // 查询条件
@@ -37,6 +38,7 @@ class ViolationStore extends Controller
         $company_name = request('company_name', '');
         $social_credit_code = request('social_credit_code', '');
         $store_type = request('store_type', '');
+        $category_id = request('category_id', '');
         // 时间条件
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
@@ -46,6 +48,7 @@ class ViolationStore extends Controller
         if ($company_name) $map[] = ['company_name', 'like', "%$company_name%"];
         if ($store_name) $map[] = ['store_name', 'like', "%$store_name%"];
         if ($store_type) $map[] = ['store_type', '=', $store_type];
+        if ($category_id) $map[] = ['category_id', '=', $category_id];
         // 查询数据
         $result = $ViolationStoreModel->query()
             ->where($map)
@@ -59,6 +62,7 @@ class ViolationStore extends Controller
                 $result['data'][$key]['platform'] = isset($value['platform']) ? explode(',', $value['platform']) : '';
                 $result['data'][$key]['employee_ids'] = $employee_ids;
                 $result['data'][$key]['employee_name'] = $employee_ids ? $EmployeeModel->whereIn('id', $employee_ids)->pluck('name')->toArray() : '';
+                $result['data'][$key]['category_name'] = $value['category_id'] ? $CompanyCategoryModel->where('id', $value['category_id'])->value('name') : '';
             }
         }
         // 加载模板
@@ -83,6 +87,7 @@ class ViolationStore extends Controller
         $store_name = request('store_name', '');
         $company_name = request('company_name', '');
         $social_credit_code = request('social_credit_code', '');
+        $category_id = request('category_id', '');
         // 时间条件
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
@@ -91,6 +96,7 @@ class ViolationStore extends Controller
         if ($social_credit_code) $map[] = ['social_credit_code', 'like', "%$social_credit_code%"];
         if ($company_name) $map[] = ['company_name', 'like', "%$company_name%"];
         if ($store_name) $map[] = ['store_name', 'like', "%$store_name%"];
+        if ($category_id) $map[] = ['category_id', '=', $category_id];
         // 查询数据
         $result = $ViolationStoreModel->query()
             ->where($map)
@@ -108,7 +114,7 @@ class ViolationStore extends Controller
      * @version   1.0
      * @date      2025-12-03
      */
-    public function detail(Request $request, ViolationStoreModel $ViolationStoreModel,EmployeeModel $EmployeeModel)
+    public function detail(Request $request, ViolationStoreModel $ViolationStoreModel,EmployeeModel $EmployeeModel, CompanyCategoryModel $CompanyCategoryModel)
     {
         $request->scene('detail')->validate();
         // 接收参数
@@ -119,6 +125,7 @@ class ViolationStore extends Controller
         $employee_ids = $data->employee_ids !='' ? explode(',', $data->employee_ids) : '';
         $data->employee_ids = $employee_ids;
         $data->employee_name = $employee_ids ? $EmployeeModel->whereIn('id', $employee_ids)->pluck('name')->toArray() : '';
+        $data->category_name = $data->category_id ? $CompanyCategoryModel->where('id', $data->category_id)->value('name') : '';
         // 加载模板
         return json_send(['code' => 'success', 'msg' => '获取成功', 'data' => $data]);
     }
@@ -139,6 +146,8 @@ class ViolationStore extends Controller
         $all_data['store_scope'] = $store_scope;//店铺范围
         $employee_ids = request('employee_ids', '');
         $all_data['employee_ids'] = $employee_ids;
+        $category_id = request('category_id', '0');
+        $all_data['category_id'] = $category_id;
         //查询是否存在
         $map = ['social_credit_code' => $all_data['social_credit_code']];
         $data = $ViolationStoreModel->where($map)->first();
@@ -169,6 +178,8 @@ class ViolationStore extends Controller
         $all_data['store_scope'] = $store_scope;
         $employee_ids = request('employee_ids', '');
         $all_data['employee_ids'] = $employee_ids;
+        $category_id = request('category_id', '0');
+        $all_data['category_id'] = $category_id;
         //查询是否存在
         $map = ['social_credit_code' => $all_data['social_credit_code']];
         $data = $ViolationStoreModel->where($map)->where('id', '!=', $id)->first();

+ 6 - 0
app/Models/Manager/WashConfig/ViolationStore.php

@@ -36,9 +36,11 @@ class ViolationStore extends Model
     public function addViolationStore_content($data)
     {
         $insert_data = [
+            'category_id' => $data['category_id'],
             'company_name' => $data['company_name'],
             'social_credit_code'    => $data['social_credit_code'],
             'store_type'    => $data['store_type'],
+            'employee_ids'  => $data['employee_ids'],
             'insert_time' => time(),
         ];
         $ViolationStore_id = $this->insertGetId($insert_data);
@@ -60,6 +62,7 @@ class ViolationStore extends Model
         try {
             $ViolationCompanyMemberModel = new ViolationCompanyMemberModel();
             $insert_data = [
+                'category_id' => $data['category_id'],
                 'company_name' => $data['company_name'],
                 'social_credit_code'    => $data['social_credit_code'],
                 'store_type'    => $data['store_type'],
@@ -104,9 +107,11 @@ class ViolationStore extends Model
         if (!$ViolationStore) {
             return false;
         }
+        $ViolationStore->category_id = $data['category_id'];
         $ViolationStore->company_name = $data['company_name'];
         $ViolationStore->social_credit_code = $data['social_credit_code'];
         $ViolationStore->store_type = $data['store_type'];
+        $ViolationStore->employee_ids = $data['employee_ids'];
         $ViolationStore->update_time = time();
         $ViolationStore->save();
         return true;
@@ -131,6 +136,7 @@ class ViolationStore extends Model
             if (!$ViolationStore) {
                 return false;
             }
+            $ViolationStore->category_id = $data['category_id'];
             $ViolationStore->company_name = $data['company_name'];
             $ViolationStore->social_credit_code = $data['social_credit_code'];
             $ViolationStore->store_type = $data['store_type'];