diff --git a/app/adminapi/logic/auth/AdminLogic.php b/app/adminapi/logic/auth/AdminLogic.php index 8d6c9ca70..3510c685d 100755 --- a/app/adminapi/logic/auth/AdminLogic.php +++ b/app/adminapi/logic/auth/AdminLogic.php @@ -65,10 +65,10 @@ class AdminLogic extends BaseLogic // self::insertDept($admin_id, $params['dept_id'] ?? []); // 岗位 // self::insertJobs($admin_id, $params['jobs_id'] ?? []); - self::createUser($params, $password, $admin_id); - if($params['party_a']>0){ - self::contract($admin_id, $params);//生成合同 - } + // self::createUser($params, $password, $admin_id); + // if($params['party_a']>0){ + // self::contract($admin_id, $params);//生成合同 + // } Db::commit(); return true; } catch (\Exception $e) { @@ -132,18 +132,18 @@ class AdminLogic extends BaseLogic AdminJobs::delByUserId($params['id']); // 角色 self::insertRole($params['id'], $role_id_arr); - if($is_contract){ - $datas=[ - 'party_a' => $params['party_a'], - 'party_b' => $params['id'], - 'contract_type' => $params['contract_type'], - 'type' => 2, - 'file' => $params['file'], - ]; - self::contract($params['id'], $datas);//生成合同 - } + // if($is_contract){ + // $datas=[ + // 'party_a' => $params['party_a'], + // 'party_b' => $params['id'], + // 'contract_type' => $params['contract_type'], + // 'type' => 2, + // 'file' => $params['file'], + // ]; + // self::contract($params['id'], $datas);//生成合同 + // } //修改用户同步信息 - self::createUser($params, $data['password'] ?? '', $data['id']); + // self::createUser($params, $data['password'] ?? '', $data['id']); // 部门 // self::insertDept($params['id'], $params['dept_id'] ?? []); // // 岗位 diff --git a/app/api/controller/CeshiController.php b/app/api/controller/CeshiController.php index 1145caea0..3ac59bbd2 100644 --- a/app/api/controller/CeshiController.php +++ b/app/api/controller/CeshiController.php @@ -16,6 +16,8 @@ class CeshiController extends BaseApiController public function index() { + $all=TaskSchedulingPlan::whereDay('end_time','yesterday')->where('is_pay',0)->with(['template_info','scheduling'])->select()->toArray(); +halt($all); $all=TaskSchedulingPlan::whereDay('start_time')->where('is_pay',0)->with(['template_info','scheduling'])->select()->toArray(); foreach($all as $k=>$v){ queue(TaskInformationJob::class,$v); diff --git a/app/common/logic/task/TaskLogic.php b/app/common/logic/task/TaskLogic.php index 6d2333695..e7f925ee4 100644 --- a/app/common/logic/task/TaskLogic.php +++ b/app/common/logic/task/TaskLogic.php @@ -111,7 +111,7 @@ class TaskLogic extends BaseLogic $data['extend'] = json_encode($v['extend']); $task_id = (new Task())->insertGetId($data); TaskSchedulingPlan::where('id', $TaskSchedulingPlan['id'])->update(['task_id' => $task_id, 'is_execute' => 1]); - // TaskTemplate::where('id', $v['id'])->update(['cron_time' => time()]); + TaskTemplate::where('id', $v['id'])->update(['cron_time' => time()]); return true; } catch (\Exception $e) { Log::error('定时任务添加失败', [$e->getMessage()]); diff --git a/app/task/TaskSettlementCron.php b/app/task/TaskSettlementCron.php index 5ce7b9ecd..226c2d30b 100644 --- a/app/task/TaskSettlementCron.php +++ b/app/task/TaskSettlementCron.php @@ -20,7 +20,7 @@ class TaskSettlementCron extends Task{ */ protected function execute() { - +//yesterday $all=TaskSchedulingPlan::whereDay('end_time','yesterday')->where('is_pay',0)->with(['template_info','scheduling'])->select()->toArray(); foreach($all as $k=>$v){ queue(TaskInformationJob::class,$v);