mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'yaooo' into dev

Browse Source
This commit is contained in:
yaooo 2023-12-08 17:20:46 +08:00
commit 7fe37f2b98
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/adminapi/lists/custom/CustomContactsLists.php
View File

@ -38,7 +38,7 @@ class CustomContactsLists extends BaseAdminDataLists implements ListsSearchInter
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['custom_id', 'name', 'position', 'phone', 'telephone', 'email', 'notes', 'annex', 'status'], '=' => ['custom_id', 'name', 'position', 'phone', 'telephone', 'email', 'notes', 'annex'],
]; ];
} }
@ -55,7 +55,7 @@ class CustomContactsLists extends BaseAdminDataLists implements ListsSearchInter
public function lists(): array public function lists(): array
{ {
return CustomContacts::where($this->searchWhere) return CustomContacts::where($this->searchWhere)
->field(['id', 'custom_id', 'name', 'position', 'phone', 'telephone', 'email', 'notes', 'annex', 'status']) ->field(['id', 'custom_id', 'name', 'position', 'phone', 'telephone', 'email', 'notes', 'annex'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select() ->select()

4
app/adminapi/lists/custom_service/CustomServiceLists.php
View File

@ -38,7 +38,7 @@ class CustomServiceLists extends BaseAdminDataLists implements ListsSearchInterf
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['project_id', 'custom_id', 'approve_id', 'contacts', 'phone', 'date', 'classification', 'urgency', 'receiver', 'processed_admin_id', 'name', 'description', 'notes', 'annex', 'status'], '=' => ['project_id', 'custom_id', 'approve_id', 'contacts', 'phone', 'date', 'classification', 'urgency', 'receiver', 'processed_admin_id', 'name', 'description', 'notes', 'annex'],
]; ];
} }
@ -55,7 +55,7 @@ class CustomServiceLists extends BaseAdminDataLists implements ListsSearchInterf
public function lists(): array public function lists(): array
{ {
return CustomService::where($this->searchWhere) return CustomService::where($this->searchWhere)
->field(['id', 'project_id', 'custom_id', 'approve_id', 'contacts', 'phone', 'date', 'classification', 'urgency', 'receiver', 'processed_admin_id', 'name', 'description', 'notes', 'annex', 'status']) ->field(['id', 'project_id', 'custom_id', 'approve_id', 'contacts', 'phone', 'date', 'classification', 'urgency', 'receiver', 'processed_admin_id', 'name', 'description', 'notes', 'annex'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select() ->select()

2
app/adminapi/logic/custom/CustomContactsLogic.php
View File

@ -49,7 +49,6 @@ class CustomContactsLogic extends BaseLogic
'email' => $params['email'], 'email' => $params['email'],
'notes' => $params['notes'], 'notes' => $params['notes'],
'annex' => $params['annex'], 'annex' => $params['annex'],
'status' => $params['status']
]); ]);
Db::commit(); Db::commit();
@ -82,7 +81,6 @@ class CustomContactsLogic extends BaseLogic
'email' => $params['email'], 'email' => $params['email'],
'notes' => $params['notes'], 'notes' => $params['notes'],
'annex' => $params['annex'], 'annex' => $params['annex'],
'status' => $params['status']
]); ]);
Db::commit(); Db::commit();

6
app/adminapi/logic/custom_service/CustomServiceLogic.php
View File

@ -54,8 +54,7 @@ class CustomServiceLogic extends BaseLogic
'name' => $params['name'], 'name' => $params['name'],
'description' => $params['description'], 'description' => $params['description'],
'notes' => $params['notes'], 'notes' => $params['notes'],
'annex' => $params['annex'], 'annex' => $params['annex']
'status' => $params['status']
]); ]);
Db::commit(); Db::commit();
@ -93,8 +92,7 @@ class CustomServiceLogic extends BaseLogic
'name' => $params['name'], 'name' => $params['name'],
'description' => $params['description'], 'description' => $params['description'],
'notes' => $params['notes'], 'notes' => $params['notes'],
'annex' => $params['annex'], 'annex' => $params['annex']
'status' => $params['status']
]); ]);
Db::commit(); Db::commit();