diff --git a/admin/components.d.ts b/admin/components.d.ts index e1d612fe..9ea57b0a 100644 --- a/admin/components.d.ts +++ b/admin/components.d.ts @@ -10,6 +10,7 @@ declare module '@vue/runtime-core' { Attachment: typeof import('./src/components/upload-attachment/attachment.vue')['default'] DiyLink: typeof import('./src/components/diy-link/index.vue')['default'] Editor: typeof import('./src/components/editor/index.vue')['default'] + ElAlert: typeof import('element-plus/es')['ElAlert'] ElAside: typeof import('element-plus/es')['ElAside'] ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] @@ -39,6 +40,7 @@ declare module '@vue/runtime-core' { ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] + ElPageHeader: typeof import('element-plus/es')['ElPageHeader'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopover: typeof import('element-plus/es')['ElPopover'] ElRadio: typeof import('element-plus/es')['ElRadio'] @@ -46,6 +48,8 @@ declare module '@vue/runtime-core' { ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] + ElStep: typeof import('element-plus/es')['ElStep'] + ElSteps: typeof import('element-plus/es')['ElSteps'] ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTable: typeof import('element-plus/es')['ElTable'] @@ -54,6 +58,7 @@ declare module '@vue/runtime-core' { ElTabs: typeof import('element-plus/es')['ElTabs'] ElTag: typeof import('element-plus/es')['ElTag'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] + ElTree: typeof import('element-plus/es')['ElTree'] ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect'] ElUpload: typeof import('element-plus/es')['ElUpload'] ExportSure: typeof import('./src/components/export-sure/index.vue')['default'] diff --git a/admin/src/app/api/customer_resources.ts b/admin/src/app/api/customer_resources.ts index 54b50473..2608449d 100644 --- a/admin/src/app/api/customer_resources.ts +++ b/admin/src/app/api/customer_resources.ts @@ -58,3 +58,7 @@ export function getWithPersonnelList(params: Record){ } // USER_CODE_END -- customer_resources + +export function fpEdit(params: Record) { + return request.post('customer_resources/fp_edit', params, { showErrorMessage: true, showSuccessMessage: true }) +} diff --git a/admin/src/app/views/customer_resource_changes/customer_resource_changes.vue b/admin/src/app/views/customer_resource_changes/customer_resource_changes.vue index 40945c66..b4704c5b 100644 --- a/admin/src/app/views/customer_resource_changes/customer_resource_changes.vue +++ b/admin/src/app/views/customer_resource_changes/customer_resource_changes.vue @@ -3,75 +3,8 @@
{{ pageName }} - - {{ t('addCustomerResourceChanges') }} -
- - - - - - - - - - - - - - - - - - - - - - - {{ t('search') }} - {{ - t('reset') - }} - - - -
+ + - - - - - + - + - + + - + +
@@ -182,12 +94,7 @@ let customerResourceChangesTable = reactive({ loading: true, data: [], searchParam: { - customer_resource_id: '', - operator_id: '', - campus_id: '', - modified_fields: '', - old_values: '', - new_values: '', + customer_resource_id: route.query.id }, }) @@ -244,7 +151,7 @@ const editEvent = (data: any) => { * 删除客户资源表变更记录 */ const deleteEvent = (id: number) => { - ElMessageBox.confirm(t('customerResourceChangesDeleteTips'), t('warning'), { + ElMessageBox.confirm("确定要回滚当前数据吗", t('warning'), { confirmButtonText: t('confirm'), cancelButtonText: t('cancel'), type: 'warning', diff --git a/admin/src/app/views/customer_resources/components/fp.vue b/admin/src/app/views/customer_resources/components/fp.vue new file mode 100644 index 00000000..813f0c33 --- /dev/null +++ b/admin/src/app/views/customer_resources/components/fp.vue @@ -0,0 +1,112 @@ + + + + + + \ No newline at end of file diff --git a/admin/src/app/views/customer_resources/customer_resources.vue b/admin/src/app/views/customer_resources/customer_resources.vue index 047a83c0..9521d2a0 100644 --- a/admin/src/app/views/customer_resources/customer_resources.vue +++ b/admin/src/app/views/customer_resources/customer_resources.vue @@ -4,7 +4,7 @@
{{pageName}} - + {{ t('addCustomerResources') }}
@@ -55,12 +55,24 @@ - + + + + + + +
@@ -71,6 +83,9 @@
+ + +
@@ -83,9 +98,24 @@ import { getCustomerResourcesList, deleteCustomerResources, getWithPersonnelList import { img } from '@/utils/common' import { ElMessageBox,FormInstance } from 'element-plus' import Edit from '@/app/views/customer_resources/components/customer-resources-edit.vue' -import { useRoute } from 'vue-router' +import Fp from '@/app/views/customer_resources/components/fp.vue' +import { useRouter, useRoute } from 'vue-router' const route = useRoute() const pageName = route.meta.title; +const router = useRouter() + +const type = pageName == '业绩分配' ? 'yjfp' : 'khzy'; + + + +const modificationLog = (id: number) => { + router.push({ path: '/six_speed_modification_log/six_speed_modification_log', query: { id: id } }) +} + +const resourceChanges = (id: number) => { + router.push({ path: '/customer_resource_changes/customer_resource_changes', query: { id: id } }) +} + let customerResourcesTable = reactive({ page: 1, @@ -95,7 +125,8 @@ let customerResourcesTable = reactive({ data: [], searchParam:{ "name":"", - "phone_number":"" + "phone_number":"", + 'type':type } }) @@ -164,6 +195,8 @@ loadCustomerResourcesList() const editCustomerResourcesDialog: Record | null = ref(null) +const fpCustomerResourcesDialog: Record | null = ref(null) + /** * 添加客户资源 */ @@ -181,6 +214,12 @@ const editEvent = (data: any) => { editCustomerResourcesDialog.value.showDialog = true } +const fpEvent = (data: any) => { + fpCustomerResourcesDialog.value.setFormData(data) + fpCustomerResourcesDialog.value.showDialog = true +} + + /** * 删除客户资源 */ diff --git a/admin/src/app/views/six_speed_modification_log/six_speed_modification_log.vue b/admin/src/app/views/six_speed_modification_log/six_speed_modification_log.vue index d2292276..6214c798 100644 --- a/admin/src/app/views/six_speed_modification_log/six_speed_modification_log.vue +++ b/admin/src/app/views/six_speed_modification_log/six_speed_modification_log.vue @@ -2,13 +2,10 @@
- {{ pageName }} - - {{ t('addSixSpeedModificationLog') }} - + 六要素修改记录
- @@ -44,7 +41,7 @@ }} - + -->
- - + + + + + + - - - @@ -151,6 +136,7 @@ let sixSpeedModificationLogTable = reactive({ loading: true, data: [], searchParam: { + customer_resource_id: route.query.id, campus_id: '', }, }) @@ -208,7 +194,7 @@ const editEvent = (data: any) => { * 删除六一速修改记录 */ const deleteEvent = (id: number) => { - ElMessageBox.confirm(t('sixSpeedModificationLogDeleteTips'), t('warning'), { + ElMessageBox.confirm("确定要回滚当前数据吗", t('warning'), { confirmButtonText: t('confirm'), cancelButtonText: t('cancel'), type: 'warning', diff --git a/admin/src/app/views/yjfp/yjfp.vue b/admin/src/app/views/yjfp/yjfp.vue new file mode 100644 index 00000000..3cacc0b9 --- /dev/null +++ b/admin/src/app/views/yjfp/yjfp.vue @@ -0,0 +1 @@ +12 \ No newline at end of file diff --git a/niucloud/app/adminapi/controller/customer_resource_changes/CustomerResourceChanges.php b/niucloud/app/adminapi/controller/customer_resource_changes/CustomerResourceChanges.php index f06887df..edd1f7cc 100644 --- a/niucloud/app/adminapi/controller/customer_resource_changes/CustomerResourceChanges.php +++ b/niucloud/app/adminapi/controller/customer_resource_changes/CustomerResourceChanges.php @@ -93,7 +93,7 @@ class CustomerResourceChanges extends BaseAdminController */ public function del(int $id){ (new CustomerResourceChangesService())->del($id); - return success('DELETE_SUCCESS'); + return success('回滚成功'); } diff --git a/niucloud/app/adminapi/controller/customer_resources/CustomerResources.php b/niucloud/app/adminapi/controller/customer_resources/CustomerResources.php index f9152768..e125a7a4 100644 --- a/niucloud/app/adminapi/controller/customer_resources/CustomerResources.php +++ b/niucloud/app/adminapi/controller/customer_resources/CustomerResources.php @@ -29,7 +29,8 @@ class CustomerResources extends BaseAdminController public function lists(){ $data = $this->request->params([ ["name",""], - ["phone_number",""] + ["phone_number",""], + ["type","khzy"] ]); return success((new CustomerResourcesService())->getPage($data)); } @@ -119,8 +120,6 @@ class CustomerResources extends BaseAdminController ["first_visit_status",""], ["second_visit_status",""], ["is_closed",""] - - ]); $this->validate($data, 'app\validate\customer_resources\CustomerResources.edit'); @@ -139,11 +138,25 @@ class CustomerResources extends BaseAdminController public function getPersonnelAll(){ - return success(( new CustomerResourcesService())->getPersonnelAll()); + $data = $this->request->params([ + ["role_id",""], + ]); + + return success(( new CustomerResourcesService())->getPersonnelAll($data)); } public function getCampusAll(){ return success(( new CustomerResourcesService())->getCampusAll()); } + public function fp_edit(){ + $data = $this->request->params([ + ["shared_id",""], + ["shared_by",""], + ]); + + return success(( new CustomerResourcesService())->fp_edit($data)); + } + + } diff --git a/niucloud/app/adminapi/controller/six_speed_modification_log/SixSpeedModificationLog.php b/niucloud/app/adminapi/controller/six_speed_modification_log/SixSpeedModificationLog.php index 1a4657eb..e944c4f8 100644 --- a/niucloud/app/adminapi/controller/six_speed_modification_log/SixSpeedModificationLog.php +++ b/niucloud/app/adminapi/controller/six_speed_modification_log/SixSpeedModificationLog.php @@ -28,7 +28,8 @@ class SixSpeedModificationLog extends BaseAdminController */ public function lists(){ $data = $this->request->params([ - ["campus_id",""] + ["campus_id",""], + ["customer_resource_id",""] ]); return success((new SixSpeedModificationLogService())->getPage($data)); } @@ -86,10 +87,10 @@ class SixSpeedModificationLog extends BaseAdminController */ public function del(int $id){ (new SixSpeedModificationLogService())->del($id); - return success('DELETE_SUCCESS'); + return success('回滚成功'); } - + public function getCampusAll(){ return success(( new SixSpeedModificationLogService())->getCampusAll()); } diff --git a/niucloud/app/adminapi/route/customer_resources.php b/niucloud/app/adminapi/route/customer_resources.php index 7dc8c08a..488caf69 100644 --- a/niucloud/app/adminapi/route/customer_resources.php +++ b/niucloud/app/adminapi/route/customer_resources.php @@ -34,11 +34,14 @@ Route::group('customer_resources', function () { Route::put('customer_resources/:id', 'customer_resources.CustomerResources/edit'); //删除客户资源 Route::delete('customer_resources/:id', 'customer_resources.CustomerResources/del'); - + Route::get('personnel_all','customer_resources.CustomerResources/getPersonnelAll'); Route::get('campus_all','customer_resources.CustomerResources/getCampusAll'); + Route::post('fp_edit', 'customer_resources.CustomerResources/fp_edit'); + + })->middleware([ AdminCheckToken::class, AdminCheckRole::class, diff --git a/niucloud/app/model/customer_resource_changes/CustomerResourceChanges.php b/niucloud/app/model/customer_resource_changes/CustomerResourceChanges.php index 6d6d7289..e8b40139 100644 --- a/niucloud/app/model/customer_resource_changes/CustomerResourceChanges.php +++ b/niucloud/app/model/customer_resource_changes/CustomerResourceChanges.php @@ -11,6 +11,7 @@ namespace app\model\customer_resource_changes; +use app\model\personnel\Personnel; use core\base\BaseModel; use think\model\concern\SoftDelete; use think\model\relation\HasMany; @@ -61,7 +62,7 @@ class CustomerResourceChanges extends BaseModel $query->where("id", $value); } } - + /** * 搜索器:客户资源表变更记录客户资源的ID * @param $value @@ -73,7 +74,7 @@ class CustomerResourceChanges extends BaseModel $query->where("customer_resource_id", $value); } } - + /** * 搜索器:客户资源表变更记录操作人的ID * @param $value @@ -85,7 +86,7 @@ class CustomerResourceChanges extends BaseModel $query->where("operator_id", $value); } } - + /** * 搜索器:客户资源表变更记录操作校区的ID * @param $value @@ -97,7 +98,7 @@ class CustomerResourceChanges extends BaseModel $query->where("campus_id", $value); } } - + /** * 搜索器:客户资源表变更记录修改的哪些字段 * @param $value @@ -109,7 +110,7 @@ class CustomerResourceChanges extends BaseModel $query->where("modified_fields", $value); } } - + /** * 搜索器:客户资源表变更记录修改前的值 * @param $value @@ -121,7 +122,7 @@ class CustomerResourceChanges extends BaseModel $query->where("old_values", $value); } } - + /** * 搜索器:客户资源表变更记录修改后的值 * @param $value @@ -133,10 +134,14 @@ class CustomerResourceChanges extends BaseModel $query->where("new_values", $value); } } - - - + public function personnel(){ + return $this->hasOne(Personnel::class, 'id', 'operator_id')->joinType('left')->withField('name,id')->bind(['staff_id_name'=>'name']); + } + + + + + - } diff --git a/niucloud/app/model/customer_resources/CustomerResources.php b/niucloud/app/model/customer_resources/CustomerResources.php index c9e00e87..64520bfd 100644 --- a/niucloud/app/model/customer_resources/CustomerResources.php +++ b/niucloud/app/model/customer_resources/CustomerResources.php @@ -11,6 +11,7 @@ namespace app\model\customer_resources; +use app\model\resource_sharing\ResourceSharing; use core\base\BaseModel; use think\model\concern\SoftDelete; use think\model\relation\HasMany; @@ -65,7 +66,7 @@ class CustomerResources extends BaseModel $query->where("name", $value); } } - + /** * 搜索器:客户资源联系电话 * @param $value @@ -77,12 +78,12 @@ class CustomerResources extends BaseModel $query->where("phone_number", $value); } } - - - - + + + + public function personnel(){ return $this->hasOne(Personnel::class, 'id', 'consultant')->joinType('left')->withField('name,id')->bind(['consultant_name'=>'name']); } @@ -91,4 +92,11 @@ class CustomerResources extends BaseModel return $this->hasOne(Campus::class, 'id', 'campus')->joinType('left')->withField('campus_name,id')->bind(['campus_name'=>'campus_name']); } + public function resourceSharing() + { + return $this->hasOne(ResourceSharing::class, 'resource_id', 'resource_id')->joinType('left') + ->withField('id as sharin_id,shared_by'); + + } + } diff --git a/niucloud/app/model/six_speed_modification_log/SixSpeedModificationLog.php b/niucloud/app/model/six_speed_modification_log/SixSpeedModificationLog.php index f019bb5b..2e6f2328 100644 --- a/niucloud/app/model/six_speed_modification_log/SixSpeedModificationLog.php +++ b/niucloud/app/model/six_speed_modification_log/SixSpeedModificationLog.php @@ -28,7 +28,7 @@ use app\model\personnel\Personnel; class SixSpeedModificationLog extends BaseModel { - + /** * 数据表主键 @@ -42,9 +42,9 @@ class SixSpeedModificationLog extends BaseModel */ protected $name = 'six_speed_modification_log'; - - + + /** * 搜索器:六一速修改记录编号 @@ -57,7 +57,7 @@ class SixSpeedModificationLog extends BaseModel $query->where("id", $value); } } - + /** * 搜索器:六一速修改记录校区 * @param $value @@ -69,18 +69,18 @@ class SixSpeedModificationLog extends BaseModel $query->where("campus_id", $value); } } - - - - + + + + public function campus(){ return $this->hasOne(Campus::class, 'id', 'campus_id')->joinType('left')->withField('campus_name,id')->bind(['campus_id_name'=>'campus_name']); } public function personnel(){ - return $this->hasOne(Personnel::class, 'id', 'staff_id')->joinType('left')->withField('name,id')->bind(['staff_id_name'=>'name']); + return $this->hasOne(Personnel::class, 'id', 'operator_id')->joinType('left')->withField('name,id')->bind(['staff_id_name'=>'name']); } } diff --git a/niucloud/app/service/admin/customer_resource_changes/CustomerResourceChangesService.php b/niucloud/app/service/admin/customer_resource_changes/CustomerResourceChangesService.php index 09dc4a72..a6bdc13e 100644 --- a/niucloud/app/service/admin/customer_resource_changes/CustomerResourceChangesService.php +++ b/niucloud/app/service/admin/customer_resource_changes/CustomerResourceChangesService.php @@ -13,6 +13,8 @@ namespace app\service\admin\customer_resource_changes; use app\model\customer_resource_changes\CustomerResourceChanges; +use app\model\customer_resources\CustomerResources; +use app\model\six_speed\SixSpeed; use core\base\BaseAdminService; @@ -39,8 +41,14 @@ class CustomerResourceChangesService extends BaseAdminService $field = 'id,customer_resource_id,operator_id,campus_id,modified_fields,old_values,new_values,modification_time,created_at,deleted_at,is_rolled_back,rollback_time'; $order = 'id desc'; - $search_model = $this->model->withSearch(["id","customer_resource_id","operator_id","campus_id","modified_fields","old_values","new_values"], $where)->field($field)->order($order); - $list = $this->pageQuery($search_model); + $search_model = $this->model->withSearch(["id","customer_resource_id","operator_id","campus_id","modified_fields","old_values","new_values"], $where)->with(['personnel'])->field($field)->order($order); + + $list = $this->pageQuery($search_model, function ($item) { + $customer = new CustomerResources(); + $json = json_decode($item['modified_fields'],true); + $item['count'] = count($json); + $item['name'] = $customer->where(['id' => $item['customer_resource_id']])->value('name'); + }); return $list; } @@ -89,11 +97,20 @@ class CustomerResourceChangesService extends BaseAdminService */ public function del(int $id) { - $model = $this->model->where([['id', '=', $id]])->find(); - $res = $model->delete(); - return $res; + $customerResources = new CustomerResources(); + + $data = $this->model->where([['id', '=', $id]])->find(); + + $save = json_decode($data['old_values'],true); + + $customerResources->where(['id' => $data['customer_resource_id']])->update($save); + + $this->model->where([['id', '=', $id]])->update([ + 'rollback_time' => date("Y-m-d H:i:s", time()), + 'is_rolled_back' => 1 + ]); } - + } diff --git a/niucloud/app/service/admin/customer_resources/CustomerResourcesService.php b/niucloud/app/service/admin/customer_resources/CustomerResourcesService.php index c9ce58b0..e47c4a70 100644 --- a/niucloud/app/service/admin/customer_resources/CustomerResourcesService.php +++ b/niucloud/app/service/admin/customer_resources/CustomerResourcesService.php @@ -16,6 +16,7 @@ use app\model\customer_resources\CustomerResources; use app\model\personnel\Personnel; use app\model\campus\Campus; +use app\model\resource_sharing\ResourceSharing; use app\model\six_speed\SixSpeed; use app\model\six_speed_modification_log\SixSpeedModificationLog; use core\base\BaseAdminService; @@ -39,13 +40,33 @@ class CustomerResourcesService extends BaseAdminService * @param array $where * @return array */ - public function getPage(array $where = []) + public function getPage(array $data = []) { - $field = 'id,create_year_month,create_date,source,source_channel,consultant,name,age,gender,phone_number,demand,purchasing_power,cognitive_idea,optional_class_time,distance,decision_maker,initial_intent,campus,created_at,updated_at,deleted_at,status'; - $order = 'id desc'; + $field = 'a.*,b.id as shared_id'; + $order = 'a.id desc'; + $where = []; + if($data['phone_number']){ + $where[] = ['a.phone_number','=',$data['phone_number']]; + } + + if($data['name']){ + $where[] = ['a.name','=',$data['name']]; + } + + if($data['type'] == 'yjfp'){ + $where[] = ['b.shared_by','=',0]; + } + + $search_model = $this->model + ->alias("a") + ->join(['school_resource_sharing' => 'b'],'a.id = b.resource_id','left') + ->where($where) + ->with(['personnel'])->field($field)->order($order); - $search_model = $this->model->withSearch(["name","phone_number"], $where)->with(['personnel'])->field($field)->order($order); $list = $this->pageQuery($search_model); + + + return $list; } @@ -74,8 +95,10 @@ class CustomerResourcesService extends BaseAdminService */ public function add(array $data) { + $resourceSharing = new ResourceSharing(); $personnel = new Personnel(); $data['consultant'] = $personnel->where(['sys_user_id' => $this->uid])->value("id"); + if(!$data['consultant']){ return fail("操作失败"); } @@ -83,6 +106,15 @@ class CustomerResourcesService extends BaseAdminService $res = $this->model->create($data); + + $role_id = $personnel->alias("a")->join(['school_campus_person_role' => 'b'],'a.id = b.person_id','left') + ->where(['a.id' => $data['consultant']])->value('b.role_id'); + $resourceSharing->insert([ + 'resource_id' => $res->id, + 'user_id' => $data['consultant'], + 'role_id' => $role_id + ]); + if($data['purchase_power']){ $six_id = $sixSpeed->where(['resource_id' => $res->id])->value("id"); $data['staff_id'] = $data['consultant']; @@ -226,15 +258,33 @@ class CustomerResourcesService extends BaseAdminService } - public function getPersonnelAll(){ + public function getPersonnelAll($data){ $personnelModel = new Personnel(); - return $personnelModel->select()->toArray(); + $where = []; + if($data['role_id']){ + $where[] = ['b.role_id','=',$data['role_id']]; + } + return $personnelModel + ->alias("a") + ->join(['school_campus_person_role' => 'b'],'a.id = b.person_id','left') + ->field("a.*") + ->where($where)->select()->toArray(); } + public function getCampusAll(){ $campusModel = new Campus(); return $campusModel->select()->toArray(); } + public function fp_edit($data){ + $resourceSharing = new ResourceSharing(); + $resourceSharing->where(['id' => $data['shared_id']])->update([ + 'shared_by' => $data['shared_by'], + 'shared_at' => date("Y-m-d H:i:s") + ]); + return "分配成功"; + } + } diff --git a/niucloud/app/service/admin/six_speed_modification_log/SixSpeedModificationLogService.php b/niucloud/app/service/admin/six_speed_modification_log/SixSpeedModificationLogService.php index 6b823c54..ae7eb76e 100644 --- a/niucloud/app/service/admin/six_speed_modification_log/SixSpeedModificationLogService.php +++ b/niucloud/app/service/admin/six_speed_modification_log/SixSpeedModificationLogService.php @@ -11,10 +11,13 @@ namespace app\service\admin\six_speed_modification_log; +use app\model\customer_resources\CustomerResources; +use app\model\six_speed\SixSpeed; use app\model\six_speed_modification_log\SixSpeedModificationLog; use app\model\campus\Campus; use app\model\personnel\Personnel; +use app\service\core\member\CoreMemberService; use core\base\BaseAdminService; @@ -38,11 +41,17 @@ class SixSpeedModificationLogService extends BaseAdminService */ public function getPage(array $where = []) { - $field = 'id,campus_id,staff_id,modified_field,old_value,new_value,is_rollback,rollback_time,created_at,updated_at'; + $field = 'id,campus_id,operator_id,customer_resource_id,modified_field,old_value,new_value,is_rollback,rollback_time,created_at,updated_at'; $order = 'id desc'; - $search_model = $this->model->withSearch(["id","campus_id"], $where)->with(['campus','personnel'])->field($field)->order($order); - $list = $this->pageQuery($search_model); + $search_model = $this->model->withSearch(["id","campus_id","customer_resource_id"], $where)->with(['campus','personnel'])->field($field)->order($order); + + $list = $this->pageQuery($search_model, function ($item) { + $customer = new CustomerResources(); + $json = json_decode($item['modified_field'],true); + $item['count'] = count($json); + $item['name'] = $customer->where(['id' => $item['customer_resource_id']])->value('name'); + }); return $list; } @@ -91,12 +100,23 @@ class SixSpeedModificationLogService extends BaseAdminService */ public function del(int $id) { - $model = $this->model->where([['id', '=', $id]])->find(); - $res = $model->delete(); - return $res; + $sixSpeed = new SixSpeed(); +// $model = $this->model->where([['id', '=', $id]])->find(); +// $res = $model->delete(); + $data = $this->model->where([['id', '=', $id]])->find(); + + $save = json_decode($data['old_value'],true); + + $sixSpeed->where(['resource_id' => $data['customer_resource_id']])->update($save); + + $this->model->where([['id', '=', $id]])->update([ + 'rollback_time' => date("Y-m-d H:i:s", time()), + 'is_rollback' => 1 + ]); + return true; } - + public function getCampusAll(){ $campusModel = new Campus(); return $campusModel->select()->toArray();