修正
This commit is contained in:
parent
ac19ad40b4
commit
5ddd12c3f4
@ -13,9 +13,6 @@ use Firebase\JWT\JWT;
|
|||||||
use Firebase\JWT\Key;
|
use Firebase\JWT\Key;
|
||||||
use think\facade\Db;
|
use think\facade\Db;
|
||||||
use think\facade\Request;
|
use think\facade\Request;
|
||||||
use app\project\model\ProjectTask as TaskList;
|
|
||||||
use app\project\validate\TaskCheck;
|
|
||||||
use think\exception\ValidateException;
|
|
||||||
class Demo extends BaseController
|
class Demo extends BaseController
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
@ -23,7 +20,7 @@ class Demo extends BaseController
|
|||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
protected $middleware = [
|
protected $middleware = [
|
||||||
Auth::class => ['except' => ['index','login','task_add'] ]
|
Auth::class => ['except' => ['index','login'] ]
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -130,48 +127,4 @@ class Demo extends BaseController
|
|||||||
$userInfo = Db::name('Admin')->where(['id' => $uid])->find();
|
$userInfo = Db::name('Admin')->where(['id' => $uid])->find();
|
||||||
$this->apiSuccess('请求成功', ['user' => $userInfo]);
|
$this->apiSuccess('请求成功', ['user' => $userInfo]);
|
||||||
}
|
}
|
||||||
|
|
||||||
//添加
|
|
||||||
public function task_add()
|
|
||||||
{
|
|
||||||
$param = get_params();
|
|
||||||
if (request()->isPost()) {
|
|
||||||
if (isset($param['end_time'])) {
|
|
||||||
$param['end_time'] = strtotime(urldecode($param['end_time']));
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
validate(TaskCheck::class)->scene('add')->check($param);
|
|
||||||
} catch (ValidateException $e) {
|
|
||||||
// 验证失败 输出错误信息
|
|
||||||
return to_assign(1, $e->getError());
|
|
||||||
}
|
|
||||||
$param['create_time'] = time();
|
|
||||||
$param['admin_id'] = 1;
|
|
||||||
if(!empty($param['md5']) &&strlen($param['md5'])>2){
|
|
||||||
$id = TaskList::where('md5',$param['md5'])->value('id');
|
|
||||||
if($id){
|
|
||||||
return to_assign(1,'已存在');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$sid = TaskList::strict(false)->field(true)->insertGetId($param);
|
|
||||||
if ($sid) {
|
|
||||||
add_log('add', $sid, $param);
|
|
||||||
$log_data = array(
|
|
||||||
'module' => 'task',
|
|
||||||
'task_id' => $sid,
|
|
||||||
'new_content' => $param['title'],
|
|
||||||
'field' => 'new',
|
|
||||||
'action' => 'add',
|
|
||||||
'admin_id' => 1,
|
|
||||||
'create_time' => time(),
|
|
||||||
);
|
|
||||||
Db::name('ProjectLog')->strict(false)->field(true)->insert($log_data);
|
|
||||||
//发消息
|
|
||||||
//$users = $param['director_uid'];
|
|
||||||
//sendMessage($users, 21, ['title' => $param['title'],'from_uid' => $this->uid, 'create_time'=>date('Y-m-d H:i:s',time()), 'action_id' => $sid]);
|
|
||||||
}
|
|
||||||
return to_assign();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -1,14 +1,20 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @copyright Copyright (c) 2021 勾股工作室
|
* @copyright Copyright (c) 2021 勾股工作室
|
||||||
* @license https://opensource.org/licenses/GPL-3.0
|
* @license https://opensource.org/licenses/GPL-3.0
|
||||||
* @link https://www.gougucms.com
|
* @link https://www.gougucms.com
|
||||||
*/
|
*/
|
||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace app\home\controller;
|
namespace app\home\controller;
|
||||||
|
|
||||||
use app\api\BaseController;
|
use app\api\BaseController;
|
||||||
use think\facade\Db;
|
use think\facade\Db;
|
||||||
|
use app\project\model\ProjectTask as TaskList;
|
||||||
|
use app\project\validate\TaskCheck;
|
||||||
|
use think\exception\ValidateException;
|
||||||
|
|
||||||
class api extends BaseController
|
class api extends BaseController
|
||||||
{
|
{
|
||||||
@ -89,8 +95,7 @@ class api extends BaseController
|
|||||||
$val['create_time'] = date('Y-m-d H:i', $val['create_time']);
|
$val['create_time'] = date('Y-m-d H:i', $val['create_time']);
|
||||||
if ($val['end_time'] > 0) {
|
if ($val['end_time'] > 0) {
|
||||||
$val['plan_time'] = date('Y-m-d', $val['start_time']) . ' 至 ' . date('Y-m-d', $val['end_time']);
|
$val['plan_time'] = date('Y-m-d', $val['start_time']) . ' 至 ' . date('Y-m-d', $val['end_time']);
|
||||||
}
|
} else {
|
||||||
else{
|
|
||||||
$val['plan_time'] = '-';
|
$val['plan_time'] = '-';
|
||||||
}
|
}
|
||||||
$val['status_name'] = \app\project\model\Project::$Status[(int) $val['status']];
|
$val['status_name'] = \app\project\model\Project::$Status[(int) $val['status']];
|
||||||
@ -134,8 +139,7 @@ class api extends BaseController
|
|||||||
$val['director_name'] = Db::name('Admin')->where(['id' => $val['director_uid']])->value('name');
|
$val['director_name'] = Db::name('Admin')->where(['id' => $val['director_uid']])->value('name');
|
||||||
if ($val['end_time'] > 0) {
|
if ($val['end_time'] > 0) {
|
||||||
$val['end_time'] = date('Y-m-d', $val['end_time']);
|
$val['end_time'] = date('Y-m-d', $val['end_time']);
|
||||||
}
|
} else {
|
||||||
else{
|
|
||||||
$val['end_time'] = '-';
|
$val['end_time'] = '-';
|
||||||
}
|
}
|
||||||
$val['flow_name'] = \app\project\model\ProjectTask::$FlowStatus[(int) $val['flow_status']];
|
$val['flow_name'] = \app\project\model\ProjectTask::$FlowStatus[(int) $val['flow_status']];
|
||||||
@ -188,4 +192,47 @@ class api extends BaseController
|
|||||||
return to_assign(0, '', ['data_logs' => $data_logs]);
|
return to_assign(0, '', ['data_logs' => $data_logs]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//添加
|
||||||
|
public function task_add()
|
||||||
|
{
|
||||||
|
$param = get_params();
|
||||||
|
if (request()->isPost()) {
|
||||||
|
if (isset($param['end_time'])) {
|
||||||
|
$param['end_time'] = strtotime(urldecode($param['end_time']));
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
validate(TaskCheck::class)->scene('add')->check($param);
|
||||||
|
} catch (ValidateException $e) {
|
||||||
|
// 验证失败 输出错误信息
|
||||||
|
return to_assign(1, $e->getError());
|
||||||
|
}
|
||||||
|
$param['create_time'] = time();
|
||||||
|
$param['admin_id'] = 1;
|
||||||
|
if (!empty($param['md5']) && strlen($param['md5']) > 2) {
|
||||||
|
$id = TaskList::where('md5', $param['md5'])->value('id');
|
||||||
|
if ($id) {
|
||||||
|
return to_assign(1, '已存在');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$sid = TaskList::strict(false)->field(true)->insertGetId($param);
|
||||||
|
if ($sid) {
|
||||||
|
add_log('add', $sid, $param);
|
||||||
|
$log_data = array(
|
||||||
|
'module' => 'task',
|
||||||
|
'task_id' => $sid,
|
||||||
|
'new_content' => $param['title'],
|
||||||
|
'field' => 'new',
|
||||||
|
'action' => 'add',
|
||||||
|
'admin_id' => 1,
|
||||||
|
'create_time' => time(),
|
||||||
|
);
|
||||||
|
Db::name('ProjectLog')->strict(false)->field(true)->insert($log_data);
|
||||||
|
//发消息
|
||||||
|
//$users = $param['director_uid'];
|
||||||
|
//sendMessage($users, 21, ['title' => $param['title'],'from_uid' => $this->uid, 'create_time'=>date('Y-m-d H:i:s',time()), 'action_id' => $sid]);
|
||||||
|
}
|
||||||
|
return to_assign();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user