xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/mzl_dev

Browse Source
This commit is contained in:
mzl
2025-07-11 17:15:52 +08:00
parent abd6d5516e 3ef2957db3
commit 80945c79c1
4 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/ticket/controller/ConversationController.php
+2 -2
View File
@@ -23,7 +23,7 @@ class ConversationController extends BaseController
public function add(Request $request)
{
try {
$request->setPost('user_id', 1);
$request->setPost('user_id', $request->user->uid);
return (new ConversationService())->add($request->all())
? $this->success()
: $this->error();
@@ -34,7 +34,7 @@ class ConversationController extends BaseController
public function edit(Request $request)
{
try {
$request->setPost('user_id', 1);
$request->setPost('user_id', $request->user->uid);
$result = (new ConversationService())->edit($request->all());
return $result
? $this->success($result)
app/ticket/controller/TicketController.php
+21 -3
View File
@@ -17,10 +17,28 @@ class TicketController extends BaseController
return $this->error($e->getMessage());
}
}
/**
* 我的工单
* @param Request $request
* @return \support\Response
*/
public function self(Request $request)
{
try {
$request->setGet('user_id',$request->user->uid);
$result = (new TicketService())->list($request->all());
return $this->success($result);
// return $this->success($this->page($result));
} catch (\Throwable $e) {
return $this->error($e->getMessage().' '.$e->getLine().' '.$e->getFile().' '.$e->getTraceAsString());
}
}
public function add(Request $request)
{
try {
$request->setPost('user_id', 1);
$request->setPost('user_id', $request->user->uid);
return (new TicketService())->add($request->all())
? $this->success()
@@ -33,7 +51,7 @@ class TicketController extends BaseController
public function edit(Request $request)
{
try {
$request->setPost('user_id', 1);
$request->setPost('user_id', $request->user->uid);
$result = (new TicketService())->edit($request->all());
return $result
? $this->success($result)
@@ -45,7 +63,7 @@ class TicketController extends BaseController
public function status(Request $request)
{
try {
$request->setPost('user_id', 1);
$request->setPost('user_id', $request->user->uid);
$result = (new TicketService())->status($request->all());
return $result
? $this->success($result)
app/ticket/logic/TicketLogic.php
+4
View File
@@ -20,11 +20,15 @@ class TicketLogic
if(!empty($params['categorie_id'])){
$where[] = ['categorie_id', '=', $params['categorie_id']];
}
if(!empty($params['user_id'])){
$where[] = ['user_id', '=', $params['user_id']];
}
if(!empty($params['status'])){
$where[] = ['status', '=', $params['status']];
}
$size = $params['size'];
$current = $params['current'];
return Ticket::with('attachments')->with('categorie')->with('categorie.translation')->where($where)->orderBy('id','desc')->paginate($size, ['*'], 'page', $current);
}
public function add(array $data)
config/route.php
+1
View File
@@ -64,6 +64,7 @@ Route::group('/ticket', function () {
Route::any('/ticket/add', [app\ticket\controller\TicketController::class, 'add']);
Route::any('/ticket/edit', [app\ticket\controller\TicketController::class, 'edit']);
Route::any('/ticket/list', [app\ticket\controller\TicketController::class, 'index']);
Route::any('/ticket/self', [app\ticket\controller\TicketController::class, 'self']);
Route::any('/ticket/status', [app\ticket\controller\TicketController::class, 'status']);
Route::any('/ticket/getStatus', [app\ticket\controller\TicketController::class, 'getStatus']);