[智价云] 客户端违规查询更新

app/Http/Controllers/Api/Process/ViolationProduct.php

@@ -98,32 +98,32 @@ class ViolationProduct extends Api
         //多选第一责任人
         if ($first_responsible_person && is_string($first_responsible_person)) {
             $first_responsible_person = explode(',', $first_responsible_person);
-            $subQuery = $ViolationProductMemberModel->whereIn('employee_id', $first_responsible_person)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $subQuery = $ViolationProductMemberModel->whereIn('employee_id', $first_responsible_person)->distinct('violation_product_logid')->select('violation_product_logid');
             $ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query1) use ($subQuery) {
-                $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
+                $query1->select('violation_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
         //多选责任人
         if ($responsible_person && is_string($responsible_person)) {
             $responsible_person = explode(',', $responsible_person);
-            $subQuery = $ViolationProductMemberModel->whereIn('employee_id', $responsible_person)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $subQuery = $ViolationProductMemberModel->whereIn('employee_id', $responsible_person)->distinct('violation_product_logid')->select('violation_product_logid');
             $ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query1) use ($subQuery) {
-                $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
+                $query1->select('violation_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
         //多选溯源责任人
         if ($source_responsible_person && is_string($source_responsible_person)) {
             $source_responsible_person = explode(',', $source_responsible_person);
-            $subQuery = $ViolationProductMemberModel->whereIn('employee_id', $source_responsible_person)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $subQuery = $ViolationProductMemberModel->whereIn('employee_id', $source_responsible_person)->distinct('violation_product_logid')->select('violation_product_logid');
             $ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query1) use ($subQuery) {
-                $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
+                $query1->select('violation_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
         // 查询数据
         $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 = $ViolationProductModel->query()
+        $result = $ViolationProductModel
             ->where($map1)
             ->orWhere($map2)
             ->orWhere($map3)

app/Http/Controllers/Api/Process/ViolationStore.php

@@ -90,32 +90,32 @@ class ViolationStore extends Api
         //多选第一责任人
         if ($first_responsible_person && is_string($first_responsible_person)) {
             $first_responsible_person = explode(',', $first_responsible_person);
-            $subQuery = $ViolationStoreMemberModel->whereIn('employee_id', $first_responsible_person)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $subQuery = $ViolationStoreMemberModel->whereIn('employee_id', $first_responsible_person)->distinct('violation_store_logid')->select('violation_store_logid');
             $ViolationStoreModel = $ViolationStoreModel->whereIn('id', function ($query1) use ($subQuery) {
-                $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
+                $query1->select('violation_store_logid')->fromSub($subQuery, 'sub1');
             });
         }
         //多选责任人
         if ($responsible_person && is_string($responsible_person)) {
             $responsible_person = explode(',', $responsible_person);
-            $subQuery = $ViolationStoreMemberModel->whereIn('employee_id', $responsible_person)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $subQuery = $ViolationStoreMemberModel->whereIn('employee_id', $responsible_person)->distinct('violation_store_logid')->select('violation_store_logid');
             $ViolationStoreModel = $ViolationStoreModel->whereIn('id', function ($query1) use ($subQuery) {
-                $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
+                $query1->select('violation_store_logid')->fromSub($subQuery, 'sub1');
             });
         }
         //多选溯源责任人
         if ($source_responsible_person && is_string($source_responsible_person)) {
             $source_responsible_person = explode(',', $source_responsible_person);
-            $subQuery = $ViolationStoreMemberModel->whereIn('employee_id', $source_responsible_person)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $subQuery = $ViolationStoreMemberModel->whereIn('employee_id', $source_responsible_person)->distinct('violation_store_logid')->select('violation_store_logid');
             $ViolationStoreModel = $ViolationStoreModel->whereIn('id', function ($query1) use ($subQuery) {
-                $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
+                $query1->select('violation_store_logid')->fromSub($subQuery, 'sub1');
             });
         }
         // 查询数据
         $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 = $ViolationStoreModel->query()
+        $result = $ViolationStoreModel
             ->where($map1)
             ->orWhere($map2)
             ->orWhere($map3)