update
This commit is contained in:
parent
46620b3dca
commit
75ae871c69
@ -57,43 +57,6 @@ class CustomLists extends BaseAdminDataLists implements ListsSearchInterface
|
|||||||
*/
|
*/
|
||||||
public function lists(): array
|
public function lists(): array
|
||||||
{
|
{
|
||||||
// return Db::name('Custom')->alias('c')
|
|
||||||
// ->where($this->searchWhere)
|
|
||||||
// ->whereNull('c.delete_time')
|
|
||||||
// ->leftJoin('orgs o','o.id = c.org_id')
|
|
||||||
// ->leftJoin('dept d','d.id = c.dept_id')
|
|
||||||
// ->field('c.*, d.name as dept_name, o.name as org_name')
|
|
||||||
// ->limit($this->limitOffset, $this->limitLength)
|
|
||||||
// ->order(['c.id' => 'desc'])
|
|
||||||
// ->select()->each(function($item, $key){
|
|
||||||
// //关联数据后续添加
|
|
||||||
// if (!empty($item['other_contacts'])) {
|
|
||||||
// $otherContactsArray = json_decode($item['other_contacts'], true);
|
|
||||||
// if (is_array($otherContactsArray)) {
|
|
||||||
// $item['other_contacts'] = $otherContactsArray;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// $item['last_follow_date'] = '-';
|
|
||||||
// $item['next_follow_date'] = '-';
|
|
||||||
// $customFollow = CustomFollow::where('custom_id', $item['id'])->order('id', 'desc')->limit(1)->findOrEmpty();
|
|
||||||
// if (!$customFollow->isEmpty()) {
|
|
||||||
// $interval = date_diff(date_create($customFollow['date']), date_create(date('Y-m-d H:i:s')));
|
|
||||||
// if ($interval->days <= 3) {
|
|
||||||
// $item['last_follow_date'] = $interval->days . '天内';
|
|
||||||
// } else if ($interval->days <= 7) {
|
|
||||||
// $item['last_follow_date'] = '1周内';
|
|
||||||
// } else if ($interval->days <= 30) {
|
|
||||||
// $item['last_follow_date'] = '30天内';
|
|
||||||
// } else if ($interval->days <= 60) {
|
|
||||||
// $item['last_follow_date'] = '60天内';
|
|
||||||
// } else {
|
|
||||||
// $item['last_follow_date'] = '超过60天内';
|
|
||||||
// }
|
|
||||||
// $item['next_follow_date'] = $customFollow['next_follow_date'];
|
|
||||||
// }
|
|
||||||
// return $item;
|
|
||||||
// })
|
|
||||||
// ->toArray();
|
|
||||||
return Custom::field('id,name,custom_type,province,notes,master_name,master_position,master_telephone,master_phone,master_notes,add_user,create_time')
|
return Custom::field('id,name,custom_type,province,notes,master_name,master_position,master_telephone,master_phone,master_notes,add_user,create_time')
|
||||||
->where($this->searchWhere)->limit($this->limitOffset, $this->limitLength)
|
->where($this->searchWhere)->limit($this->limitOffset, $this->limitLength)
|
||||||
->order(['id' => 'desc'])
|
->order(['id' => 'desc'])
|
||||||
|
Loading…
x
Reference in New Issue
Block a user