diff --git a/web/app/Controllers/Admin/TicketController.php b/web/app/Controllers/Admin/TicketController.php
index 240244c2..125ea1b7 100644
--- a/web/app/Controllers/Admin/TicketController.php
+++ b/web/app/Controllers/Admin/TicketController.php
@@ -212,9 +212,17 @@ class TicketController extends AdminController
$ticketType = $this->ticketColumnExpression($schema, 'ticket_type', "'technical'");
$priority = $this->ticketColumnExpression($schema, 'priority', "'medium'");
$instanceId = $this->ticketColumnExpression($schema, 'instance_id', 'NULL');
- $datatables->query('Select ticket.id as op,ticket.id,ticket.datetime,ticket.title,ticket.userid,user.user_name,'
- . $ticketType . ' as ticket_type,' . $priority . ' as priority,' . $instanceId
- . ' as instance_id,ticket.status from ticket,user where ticket.userid = user.id and ticket.rootid = 0');
+ $datatables->query('SELECT ticket.id AS op,ticket.id,'
+ . 'CASE WHEN ticket_activity.last_reply_at IS NULL '
+ . 'OR ticket_activity.last_reply_at < ticket.datetime '
+ . 'THEN ticket.datetime ELSE ticket_activity.last_reply_at END AS datetime,'
+ . 'ticket.title,ticket.userid,user.user_name,'
+ . $ticketType . ' AS ticket_type,' . $priority . ' AS priority,' . $instanceId
+ . ' AS instance_id,ticket.status FROM ticket '
+ . 'INNER JOIN user ON ticket.userid = user.id '
+ . 'LEFT JOIN (SELECT rootid, MAX(datetime) AS last_reply_at FROM ticket '
+ . 'WHERE rootid <> 0 GROUP BY rootid) AS ticket_activity ON ticket_activity.rootid = ticket.id '
+ . 'WHERE ticket.rootid = 0');
$datatables->edit('op', function ($data) {
return '查看';
@@ -236,8 +244,22 @@ class TicketController extends AdminController
return $data['status'] == 1 ? '开启' : '关闭';
});
+ $statusTotals = Ticket::where('rootid', 0)
+ ->selectRaw('COUNT(*) AS total')
+ ->selectRaw('SUM(CASE WHEN status = 1 THEN 1 ELSE 0 END) AS open_count')
+ ->selectRaw('SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) AS closed_count')
+ ->first();
+ $payload = $datatables->generate(false);
+ $payload['statusTotals'] = [
+ 'total' => (int) ($statusTotals->total ?? 0),
+ 'open' => (int) ($statusTotals->open_count ?? 0),
+ 'closed' => (int) ($statusTotals->closed_count ?? 0),
+ ];
+
$body = $response->getBody();
- $body->write($datatables->generate());
+ $body->write((string) json_encode($payload, JSON_UNESCAPED_UNICODE));
+
+ return $response->withHeader('Content-Type', 'application/json; charset=utf-8');
}
private function ticketAttachmentsAvailable(): bool
diff --git a/web/app/Controllers/UserController.php b/web/app/Controllers/UserController.php
index 1563e2dc..67fa78bf 100644
--- a/web/app/Controllers/UserController.php
+++ b/web/app/Controllers/UserController.php
@@ -607,11 +607,16 @@ class UserController extends BaseController
{
$pageNum = 1;
if (isset($request->getQueryParams()["page"])) {
- $pageNum = $request->getQueryParams()["page"];
+ $pageNum = max(1, (int) $request->getQueryParams()["page"]);
}
$openTickets = Ticket::where("userid", $this->user->id)->where("rootid", 0)->where("status", 1)->count();
$closedTickets = Ticket::where("userid", $this->user->id)->where("rootid", 0)->where("status", 0)->count();
- $tickets = Ticket::where("userid", $this->user->id)->where("rootid", 0)->orderBy("datetime", "desc")->paginate(15, ['*'], 'page', $pageNum);
+ $tickets = Ticket::where("userid", $this->user->id)->where("rootid", 0)
+ ->selectRaw('ticket.*, COALESCE((SELECT MAX(ticket_replies.datetime) '
+ . 'FROM ticket AS ticket_replies WHERE ticket_replies.rootid = ticket.id), '
+ . 'ticket.datetime) AS last_activity_at')
+ ->orderByDesc('last_activity_at')->orderByDesc('id')
+ ->paginate(15, ['*'], 'page', $pageNum);
$tickets->setPath('/user/ticket');
return $this->view()->assign('tickets', $tickets)
diff --git a/web/app/Models/Ticket.php b/web/app/Models/Ticket.php
index 47184726..7e1032dc 100644
--- a/web/app/Models/Ticket.php
+++ b/web/app/Models/Ticket.php
@@ -15,6 +15,12 @@ class Ticket extends Model
{
return date("Y-m-d H:i:s", $this->attributes['datetime']);
}
+
+ public function lastActivity()
+ {
+ $timestamp = $this->attributes['last_activity_at'] ?? $this->attributes['datetime'];
+ return date("Y-m-d H:i:s", (int) $timestamp);
+ }
public function User()
{
diff --git a/web/resources/views/venix/admin/ticket/index.tpl b/web/resources/views/venix/admin/ticket/index.tpl
index 81dca841..61a682d3 100644
--- a/web/resources/views/venix/admin/ticket/index.tpl
+++ b/web/resources/views/venix/admin/ticket/index.tpl
@@ -84,7 +84,7 @@
类型 |
优先级 |
实例 |
- 时间 |
+ 最近活动 |
状态 |
操作 |
@@ -97,6 +97,14 @@
+
@@ -112,8 +120,16 @@
var search = document.getElementById('ticketSearch');
var reload = document.getElementById('ticketReload');
var toast = document.getElementById('ticketToast');
+ var pageSummary = document.getElementById('ticketPageSummary');
+ var pageNumber = document.getElementById('ticketPageNumber');
+ var previousPage = document.getElementById('ticketPagePrevious');
+ var nextPage = document.getElementById('ticketPageNext');
var filter = 'all';
- var allRows = [];
+ var page = 0;
+ var pageSize = 25;
+ var recordsFiltered = 0;
+ var requestSerial = 0;
+ var searchTimer = null;
if (window.VenixAdminSearchState) {
window.VenixAdminSearchState.bind(search);
@@ -154,32 +170,24 @@
return item.status === '开启' || item.status === '1' || item.status === 1;
}
- function updateStats(data) {
- var normalized = data.map(normalize);
- var openCount = normalized.filter(isOpen).length;
- total.textContent = normalized.length;
- open.textContent = openCount;
- closed.textContent = normalized.length - openCount;
+ function updateStats(totals, fallbackTotal) {
+ totals = totals || {};
+ total.textContent = typeof totals.total === 'number' ? totals.total : fallbackTotal;
+ open.textContent = typeof totals.open === 'number' ? totals.open : '--';
+ closed.textContent = typeof totals.closed === 'number' ? totals.closed : '--';
}
function render(data) {
- var keyword = (search.value || '').toLowerCase().trim();
var normalized = data.map(normalize);
- var filtered = normalized.filter(function (item) {
- var text = [item.id, item.title, item.userid, item.user_name, item.datetime].join(' ').toLowerCase();
- var statusMatched = filter === 'all' || (filter === 'open' && isOpen(item)) || (filter === 'closed' && !isOpen(item));
- return statusMatched && (!keyword || text.indexOf(keyword) !== -1);
- });
-
- count.textContent = '共 ' + filtered.length + ' 条';
+ count.textContent = '共 ' + recordsFiltered + ' 条';
- if (!filtered.length) {
+ if (!normalized.length) {
rows.innerHTML = '| 暂无工单 |
';
return;
}
rows.innerHTML = '';
- filtered.forEach(function (item) {
+ normalized.forEach(function (item) {
var tr = document.createElement('tr');
var openStatus = isOpen(item);
tr.innerHTML =
@@ -199,25 +207,41 @@
function buildParams() {
var params = new URLSearchParams();
params.set('draw', '1');
- params.set('start', '0');
- params.set('length', '500');
- params.set('search[value]', '');
- params.set('order[0][column]', '1');
+ params.set('start', String(page * pageSize));
+ params.set('length', String(pageSize));
+ params.set('search[value]', search.value.trim());
+ params.set('order[0][column]', '2');
params.set('order[0][dir]', 'desc');
['op', 'id', 'datetime', 'title', 'userid', 'user_name', 'ticket_type', 'priority', 'instance_id', 'status'].forEach(function (column, index) {
params.set('columns[' + index + '][data]', column);
params.set('columns[' + index + '][name]', '');
params.set('columns[' + index + '][searchable]', 'true');
params.set('columns[' + index + '][orderable]', 'true');
- params.set('columns[' + index + '][search][value]', '');
+ params.set('columns[' + index + '][search][value]', column === 'status'
+ ? (filter === 'open' ? '1' : (filter === 'closed' ? '0' : ''))
+ : '');
params.set('columns[' + index + '][search][regex]', 'false');
});
return params;
}
- function loadTickets() {
- rows.innerHTML = '| 工单加载中 |
';
+ function updatePagination() {
+ var pages = Math.max(1, Math.ceil(recordsFiltered / pageSize));
+ var first = recordsFiltered ? page * pageSize + 1 : 0;
+ var last = Math.min((page + 1) * pageSize, recordsFiltered);
+ previousPage.disabled = page <= 0;
+ nextPage.disabled = page + 1 >= pages;
+ pageNumber.textContent = '第 ' + (page + 1) + ' / ' + pages + ' 页';
+ pageSummary.textContent = recordsFiltered ? '显示 ' + first + '–' + last + ' 条' : '暂无匹配工单';
+ }
+
+ function loadTickets(resetPage) {
+ if (resetPage) page = 0;
+ var serial = ++requestSerial;
+ rows.innerHTML = '| 工单加载中 |
';
count.textContent = '读取中';
+ previousPage.disabled = true;
+ nextPage.disabled = true;
fetch('/admin/ticket/ajax', {
method: 'POST',
@@ -233,12 +257,16 @@
}
return response.json();
}).then(function (json) {
- allRows = json.data || [];
- updateStats(allRows);
- render(allRows);
+ if (serial !== requestSerial) return;
+ recordsFiltered = Number(json.recordsFiltered || 0);
+ updateStats(json.statusTotals, Number(json.recordsTotal || 0));
+ render(json.data || []);
+ updatePagination();
}).catch(function () {
+ if (serial !== requestSerial) return;
rows.innerHTML = '| 工单读取失败 |
';
count.textContent = '读取失败';
+ pageSummary.textContent = '读取失败';
showToast('工单读取失败', 'is-error');
});
}
@@ -249,16 +277,27 @@
document.querySelectorAll('[data-ticket-filter]').forEach(function (item) {
item.classList.toggle('active', item === button);
});
- render(allRows);
+ loadTickets(true);
});
});
- reload.addEventListener('click', loadTickets);
+ previousPage.addEventListener('click', function () {
+ if (page <= 0) return;
+ page -= 1;
+ loadTickets(false);
+ });
+ nextPage.addEventListener('click', function () {
+ if ((page + 1) * pageSize >= recordsFiltered) return;
+ page += 1;
+ loadTickets(false);
+ });
+ reload.addEventListener('click', function () { loadTickets(false); });
search.addEventListener('input', function () {
- render(allRows);
+ window.clearTimeout(searchTimer);
+ searchTimer = window.setTimeout(function () { loadTickets(true); }, 250);
});
- loadTickets();
+ loadTickets(true);
})();
{/literal}
diff --git a/web/resources/views/venix/user/ticket.tpl b/web/resources/views/venix/user/ticket.tpl
index 82cc4a92..be695d40 100755
--- a/web/resources/views/venix/user/ticket.tpl
+++ b/web/resources/views/venix/user/ticket.tpl
@@ -54,7 +54,7 @@
{elseif $ticket->priority|default:'' == 'low'}低优先级{/if}
{$ticket->title|escape:"html"}
- {$ticket->datetime()}
+ 最近活动 {$ticket->lastActivity()}
diff --git a/web/sql/ss.sql b/web/sql/ss.sql
index 567bdaa4..36c6af4d 100644
--- a/web/sql/ss.sql
+++ b/web/sql/ss.sql
@@ -570,6 +570,7 @@ ALTER TABLE `ss_password_reset`
ALTER TABLE `ticket`
ADD PRIMARY KEY (`id`),
ADD KEY `ticket_overview_root_status` (`rootid`,`status`),
+ ADD KEY `ticket_activity_root_datetime` (`rootid`,`datetime`),
ADD KEY `ticket_instance` (`instance_id`,`userid`,`rootid`);
ALTER TABLE `user`
diff --git a/web/tests/AdminTicketQueueContractTest.php b/web/tests/AdminTicketQueueContractTest.php
new file mode 100644
index 00000000..da5e61e9
--- /dev/null
+++ b/web/tests/AdminTicketQueueContractTest.php
@@ -0,0 +1,47 @@
+