chenbo
/
suyuan-breed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

This commit is contained in:
chenbo 2024-02-03 11:14:33 +08:00
parent e4ff4556aa
commit 24c38b1c69
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/api/lists/suyuan_operation/OperationDewormingLogLists.php
View File

@ -56,7 +56,7 @@ class OperationDewormingLogLists extends BaseDataLists implements ListsSearchInt
*/ */
public function lists(): array public function lists(): array
{ {
return AnimalOperateAction::where($this->searchWhere)->where('type', 2) return AnimalOperateAction::whereRaw("animal_info_id = {$this->request->param('animal_info_id', 0)} or fence_house_id={$this->request->param('fence_house_id', 0)}")->where('type', 2)
->with(['fenceHouseAttr', 'animalInfo']) ->with(['fenceHouseAttr', 'animalInfo'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
@ -77,7 +77,7 @@ class OperationDewormingLogLists extends BaseDataLists implements ListsSearchInt
*/ */
public function count(): int public function count(): int
{ {
return AnimalOperateAction::where($this->searchWhere)->where('type', 2)->count(); return AnimalOperateAction::whereRaw("animal_info_id = {$this->request->param('animal_info_id', 0)} or fence_house_id={$this->request->param('fence_house_id', 0)}")->where('type', 2)->count();
} }
} }

4
app/api/lists/suyuan_operation/OperationDisinfectLogLists.php
View File

@ -56,7 +56,7 @@ class OperationDisinfectLogLists extends BaseDataLists implements ListsSearchInt
*/ */
public function lists(): array public function lists(): array
{ {
return AnimalOperateAction::where($this->searchWhere)->where('type', 1) return AnimalOperateAction::whereRaw("animal_info_id = {$this->request->param('animal_info_id', 0)} or fence_house_id={$this->request->param('fence_house_id', 0)}")->where('type', 1)
->with(['fenceHouseAttr', 'animalInfo']) ->with(['fenceHouseAttr', 'animalInfo'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
@ -77,7 +77,7 @@ class OperationDisinfectLogLists extends BaseDataLists implements ListsSearchInt
*/ */
public function count(): int public function count(): int
{ {
return AnimalOperateAction::where($this->searchWhere)->where('type', 1)->count(); return AnimalOperateAction::whereRaw("animal_info_id = {$this->request->param('animal_info_id', 0)} or fence_house_id={$this->request->param('fence_house_id', 0)}")->where('type', 1)->count();
} }
} }

4
app/api/lists/suyuan_operation/OperationFeedingLogLists.php
View File

@ -57,7 +57,7 @@ class OperationFeedingLogLists extends BaseDataLists implements ListsSearchInter
*/ */
public function lists(): array public function lists(): array
{ {
return AnimalOperateAction::where($this->searchWhere)->where('type', 3) return AnimalOperateAction::whereRaw("animal_info_id = {$this->request->param('animal_info_id', 0)} or fence_house_id={$this->request->param('fence_house_id', 0)}")->where('type', 3)
->with(['fenceHouseAttr', 'animalInfo']) ->with(['fenceHouseAttr', 'animalInfo'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
@ -78,7 +78,7 @@ class OperationFeedingLogLists extends BaseDataLists implements ListsSearchInter
*/ */
public function count(): int public function count(): int
{ {
return AnimalOperateAction::where($this->searchWhere)->where('type', 3)->count(); return AnimalOperateAction::whereRaw("animal_info_id = {$this->request->param('animal_info_id', 0)} or fence_house_id={$this->request->param('fence_house_id', 0)}")->where('type', 3)->count();
} }
} }

4
app/api/lists/suyuan_operation/OperationVaccinumLogLists.php
View File

@ -56,7 +56,7 @@ class OperationVaccinumLogLists extends BaseDataLists implements ListsSearchInte
*/ */
public function lists(): array public function lists(): array
{ {
return AnimalOperateAction::where($this->searchWhere)->where('type', 4) return AnimalOperateAction::whereRaw("animal_info_id = {$this->request->param('animal_info_id', 0)} or fence_house_id={$this->request->param('fence_house_id', 0)}")->where('type', 4)
->with(['fenceHouseAttr', 'animalInfo']) ->with(['fenceHouseAttr', 'animalInfo'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
@ -77,7 +77,7 @@ class OperationVaccinumLogLists extends BaseDataLists implements ListsSearchInte
*/ */
public function count(): int public function count(): int
{ {
return AnimalOperateAction::where($this->searchWhere)->where('type', 4)->count(); return AnimalOperateAction::whereRaw("animal_info_id = {$this->request->param('animal_info_id', 0)} or fence_house_id={$this->request->param('fence_house_id', 0)}")->where('type', 4)->count();
} }
} }

4
app/api/lists/suyuan_operation/OperationWaterLogLists.php
View File

@ -56,7 +56,7 @@ class OperationWaterLogLists extends BaseDataLists implements ListsSearchInterfa
*/ */
public function lists(): array public function lists(): array
{ {
return AnimalOperateAction::where($this->searchWhere)->where('type', 5) return AnimalOperateAction::whereRaw("animal_info_id = {$this->request->param('animal_info_id', 0)} or fence_house_id={$this->request->param('fence_house_id', 0)}")->where('type', 5)
->with(['fenceHouseAttr', 'animalInfo']) ->with(['fenceHouseAttr', 'animalInfo'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
@ -77,7 +77,7 @@ class OperationWaterLogLists extends BaseDataLists implements ListsSearchInterfa
*/ */
public function count(): int public function count(): int
{ {
return AnimalOperateAction::where($this->searchWhere)->where('type', 5)->count(); return AnimalOperateAction::whereRaw("animal_info_id = {$this->request->param('animal_info_id', 0)} or fence_house_id={$this->request->param('fence_house_id', 0)}")->where('type', 5)->count();
} }
} }