修正
This commit is contained in:
parent
ac19ad40b4
commit
5ddd12c3f4
@ -13,9 +13,6 @@ use Firebase\JWT\JWT;
|
||||
use Firebase\JWT\Key;
|
||||
use think\facade\Db;
|
||||
use think\facade\Request;
|
||||
use app\project\model\ProjectTask as TaskList;
|
||||
use app\project\validate\TaskCheck;
|
||||
use think\exception\ValidateException;
|
||||
class Demo extends BaseController
|
||||
{
|
||||
/**
|
||||
@ -23,7 +20,7 @@ class Demo extends BaseController
|
||||
* @var array
|
||||
*/
|
||||
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();
|
||||
$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
|
||||
|
||||
/**
|
||||
* @copyright Copyright (c) 2021 勾股工作室
|
||||
* @license https://opensource.org/licenses/GPL-3.0
|
||||
* @link https://www.gougucms.com
|
||||
*/
|
||||
declare (strict_types = 1);
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace app\home\controller;
|
||||
|
||||
use app\api\BaseController;
|
||||
use think\facade\Db;
|
||||
use app\project\model\ProjectTask as TaskList;
|
||||
use app\project\validate\TaskCheck;
|
||||
use think\exception\ValidateException;
|
||||
|
||||
class api extends BaseController
|
||||
{
|
||||
@ -33,10 +39,10 @@ class api extends BaseController
|
||||
//首页知识列表
|
||||
public function get_article_list()
|
||||
{
|
||||
$prefix = get_config('database.connections.mysql.prefix');//判断是否安装了文章模块
|
||||
$exist = Db::query('show tables like "'.$prefix.'article"');
|
||||
$prefix = get_config('database.connections.mysql.prefix'); //判断是否安装了文章模块
|
||||
$exist = Db::query('show tables like "' . $prefix . 'article"');
|
||||
$res['data'] = [];
|
||||
if($exist){
|
||||
if ($exist) {
|
||||
$list = Db::name('Article')
|
||||
->field('a.id,a.title,a.create_time,a.read,c.title as cate_title')
|
||||
->alias('a')
|
||||
@ -55,7 +61,7 @@ class api extends BaseController
|
||||
|
||||
function isAuthProject($uid)
|
||||
{
|
||||
if($uid == 1){
|
||||
if ($uid == 1) {
|
||||
return 1;
|
||||
}
|
||||
$map = [];
|
||||
@ -67,14 +73,14 @@ class api extends BaseController
|
||||
//首页项目
|
||||
public function get_project_list()
|
||||
{
|
||||
$prefix = get_config('database.connections.mysql.prefix');//判断是否安装了项目模块
|
||||
$exist = Db::query('show tables like "'.$prefix.'project"');
|
||||
$prefix = get_config('database.connections.mysql.prefix'); //判断是否安装了项目模块
|
||||
$exist = Db::query('show tables like "' . $prefix . 'project"');
|
||||
$res['data'] = [];
|
||||
if($exist){
|
||||
if ($exist) {
|
||||
$project_ids = Db::name('ProjectUser')->where(['uid' => $this->uid, 'delete_time' => 0])->column('project_id');
|
||||
$where =[];
|
||||
$where = [];
|
||||
$where[] = ['a.delete_time', '=', 0];
|
||||
if($this->isAuthProject($this->uid)==0){
|
||||
if ($this->isAuthProject($this->uid) == 0) {
|
||||
$where[] = ['a.id', 'in', $project_ids];
|
||||
}
|
||||
$list = Db::name('Project')
|
||||
@ -87,10 +93,9 @@ class api extends BaseController
|
||||
->select()->toArray();
|
||||
foreach ($list as $key => &$val) {
|
||||
$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']);
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
$val['plan_time'] = '-';
|
||||
}
|
||||
$val['status_name'] = \app\project\model\Project::$Status[(int) $val['status']];
|
||||
@ -103,10 +108,10 @@ class api extends BaseController
|
||||
//首页任务
|
||||
public function get_task_list()
|
||||
{
|
||||
$prefix = get_config('database.connections.mysql.prefix');//判断是否安装了项目模块
|
||||
$exist = Db::query('show tables like "'.$prefix.'project_task"');
|
||||
$prefix = get_config('database.connections.mysql.prefix'); //判断是否安装了项目模块
|
||||
$exist = Db::query('show tables like "' . $prefix . 'project_task"');
|
||||
$res['data'] = [];
|
||||
if($exist){
|
||||
if ($exist) {
|
||||
$where = array();
|
||||
$whereOr = array();
|
||||
$map1 = [];
|
||||
@ -115,8 +120,8 @@ class api extends BaseController
|
||||
$map1[] = ['admin_id', '=', $this->uid];
|
||||
$map2[] = ['director_uid', '=', $this->uid];
|
||||
$map3[] = ['', 'exp', Db::raw("FIND_IN_SET({$this->uid},assist_admin_ids)")];
|
||||
if($this->isAuthProject($this->uid)==0){
|
||||
$whereOr =[$map1,$map2,$map3];
|
||||
if ($this->isAuthProject($this->uid) == 0) {
|
||||
$whereOr = [$map1, $map2, $map3];
|
||||
}
|
||||
$where[] = ['delete_time', '=', 0];
|
||||
$list = Db::name('ProjectTask')
|
||||
@ -132,10 +137,9 @@ class api extends BaseController
|
||||
->select()->toArray();
|
||||
foreach ($list as $key => &$val) {
|
||||
$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']);
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
$val['end_time'] = '-';
|
||||
}
|
||||
$val['flow_name'] = \app\project\model\ProjectTask::$FlowStatus[(int) $val['flow_status']];
|
||||
@ -168,7 +172,7 @@ class api extends BaseController
|
||||
{
|
||||
$times = strtotime("-30 day");
|
||||
$where = [];
|
||||
$where[] = ['uid','<>',1];
|
||||
$where[] = ['uid', '<>', 1];
|
||||
$where[] = ['create_time', '>', $times];
|
||||
$list = Db::name('AdminLog')->field("id,uid")->where($where)->select();
|
||||
$logs = array();
|
||||
@ -176,7 +180,7 @@ class api extends BaseController
|
||||
$uid = $value['uid'];
|
||||
if (empty($logs[$uid])) {
|
||||
$logs[$uid]['count'] = 1;
|
||||
$logs[$uid]['name'] = Db::name('Admin')->where('id',$uid)->value('name');
|
||||
$logs[$uid]['name'] = Db::name('Admin')->where('id', $uid)->value('name');
|
||||
} else {
|
||||
$logs[$uid]['count'] += 1;
|
||||
}
|
||||
@ -188,4 +192,47 @@ class api extends BaseController
|
||||
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