diff --git a/src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java b/src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java index 5a38f639..f9e8cd92 100644 --- a/src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java +++ b/src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java @@ -18,7 +18,6 @@ import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -187,7 +186,24 @@ public class FlowTodoCenterController { dao.execute(doneSql); int doneCount = doneSql.getInt(); - return Result.success(Map.of("startedCount", startedCount, "todoCount", todoCount, "doneCount", doneCount)); + // 查询未读消息 + Sql msgSql = Sqls.create(""" + SELECT + count(DISTINCT r.messageId) + FROM + global_message_receiver r + LEFT JOIN global_message m ON m.id = r.messageId + WHERE + r.receiverId = @userId + AND r.isRead = 0 + AND m.`status` = 2 + """); + msgSql.setParam("userId", SecurityUtil.getUserId()); + msgSql.setCallback(Sqls.callback.integer()); + dao.execute(msgSql); + int msgCount = msgSql.getInt(); + + return Result.success(Map.of("startedCount", startedCount, "todoCount", todoCount, "doneCount", doneCount, "notifications", msgCount)); } } diff --git a/src/main/resources/views/layouts/v4/home/act.js b/src/main/resources/views/layouts/v4/home/act.js index a6776d34..366041bc 100644 --- a/src/main/resources/views/layouts/v4/home/act.js +++ b/src/main/resources/views/layouts/v4/home/act.js @@ -16,7 +16,7 @@ const act = {
-

diff --git a/src/main/resources/views/layouts/v4/home/user.js b/src/main/resources/views/layouts/v4/home/user.js index 692645ca..9d11e6cb 100644 --- a/src/main/resources/views/layouts/v4/home/user.js +++ b/src/main/resources/views/layouts/v4/home/user.js @@ -88,9 +88,10 @@ const user = { }, methods: { handleStatClick(type) { - debugger if (['todo', 'done', 'application'].includes(type)) { window.open('/flow/todoCenter?status=' + type) + } else if (type === 'notification') { + window.open('/platform/v4/msg') } }, loadStats() {