c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4

Browse Source
This commit is contained in:
c-zhouhf1
2025-09-25 21:29:32 +08:00
parent 2810427b17 7630890799
commit 9a6e9c0b0a
20 changed files with 1248 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java
+30 -5
View File
@@ -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;
@@ -53,11 +52,14 @@ public class FlowTodoCenterController {
t.variable,
ins.state AS instanceState,
ins.id AS instanceId,
ins.businessNo
ins.businessNo,
cat.`name` categoryName
FROM
wf_process_task t
LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
LEFT JOIN wf_process_define def ON def.id = ins.processDefineId
LEFT JOIN wf_process_category cat ON cat.id = def.category
$condition
""");
Cnd cnd = Cnd.NEW();
@@ -89,11 +91,14 @@ public class FlowTodoCenterController {
t.variable,
ins.state AS instanceState,
ins.id AS instanceId,
ins.businessNo
ins.businessNo,
cat.`name` categoryName
FROM
wf_process_task t
LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
LEFT JOIN wf_process_define def ON def.id = ins.processDefineId
LEFT JOIN wf_process_category cat ON cat.id = def.category
$condition
""");
Cnd cnd = Cnd.NEW();
@@ -122,10 +127,13 @@ public class FlowTodoCenterController {
ins.operator,
ins.variable,
ins.createdAt,
GROUP_CONCAT(DISTINCT t.displayName) as taskName
GROUP_CONCAT(DISTINCT t.displayName) as taskName,
cat.`name` categoryName
FROM
wf_process_instance ins
LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id and t.taskState = 10
LEFT JOIN wf_process_define def ON def.id = ins.processDefineId
LEFT JOIN wf_process_category cat ON cat.id = def.category
$condition
""");
Cnd cnd = Cnd.NEW();
@@ -178,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));
}
}
src/main/java/com/budwk/app/sys/controller/SysHomeV4Controller.java
+7
View File
@@ -36,6 +36,13 @@ public class SysHomeV4Controller {
}
@At("/home2")
@Ok("beetl:/layouts/v4/home/index.html")
@SaCheckLogin
public void home2() {
}
/**
* 应用中心
*/
src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxMineController.java
+3 -2
View File
@@ -2,6 +2,7 @@ package com.budwk.app.zhgh.democratic.suggestionBox.controller;
import cn.dev33.satoken.annotation.SaCheckLogin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaMode;
import cn.hutool.core.util.StrUtil;
import com.budwk.app.base.annotation.SLog;
import com.budwk.app.base.page.Pagination;
@@ -53,7 +54,7 @@ public class SuggestionBoxMineController {
@At
@SaCheckPermission("suggestionBox.mine")
@SaCheckPermission(value = {"suggestionBox.mine", "h5.suggestionBox.mine"}, mode = SaMode.OR)
public Result pageData(Integer pageNumber, Integer pageSize, String searchKeyword, Integer year) {
Sql sql = Sqls.create("""
SELECT
@@ -100,7 +101,7 @@ public class SuggestionBoxMineController {
}
@At
@SaCheckPermission("suggestionBox.mine")
@SaCheckPermission(value = {"suggestionBox.mine", "h5.suggestionBox.mine"}, mode = SaMode.OR)
@Aop(TransAop.READ_COMMITTED)
@ApiOperation("删除")
@SLog(tag = "建言献策-我的申请", msg = "删除")
src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxQueryController.java
+5 -4
View File
@@ -2,6 +2,7 @@ package com.budwk.app.zhgh.democratic.suggestionBox.controller;
import cn.dev33.satoken.annotation.SaCheckLogin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaMode;
import cn.hutool.core.util.StrUtil;
import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.result.Result;
@@ -44,14 +45,14 @@ public class SuggestionBoxQueryController {
@At
@Ok("beetl:/platform/zhghh5/democratic/suggestionBox/query/index.html")
@SaCheckPermission("suggestionBox.query")
public void h5Index() {
@SaCheckPermission("h5.suggestionBox.query")
public void h5() {
}
@At
@SaCheckPermission("suggestionBox.query")
@SaCheckPermission(value = {"suggestionBox.query", "h5.suggestionBox.query"}, mode = SaMode.OR)
public Result pageData(Integer pageNumber, Integer pageSize, String searchKeyword, Integer year) {
Sql sql = Sqls.create("""
SELECT
@@ -97,7 +98,7 @@ public class SuggestionBoxQueryController {
}
@At
@SaCheckLogin
@SaCheckPermission(value = {"suggestionBox.query", "h5.suggestionBox.query"}, mode = SaMode.OR)
@Aop(TransAop.READ_COMMITTED)
@ApiOperation("删除")
public Result delete(@Param("id") String id) {
src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxWriteController.java
+5 -4
View File
@@ -2,6 +2,7 @@ package com.budwk.app.zhgh.democratic.suggestionBox.controller;
import cn.dev33.satoken.annotation.SaCheckLogin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaMode;
import cn.hutool.core.lang.Dict;
import com.budwk.app.base.annotation.SLog;
import com.budwk.app.base.result.Result;
@@ -55,7 +56,7 @@ public class SuggestionBoxWriteController {
}
@At
@SaCheckPermission("suggestionBox.write")
@SaCheckPermission(value = {"suggestionBox.write", "h5.suggestionBox.write"}, mode = SaMode.OR)
@ApiOperation("保存申请")
@SLog(tag = "建言献策-填写申请", msg = "保存申请")
public Result save(@Param("data") SuggestionBox suggestionBox) {
@@ -66,7 +67,7 @@ public class SuggestionBoxWriteController {
@At
@SaCheckPermission("suggestionBox.write")
@SaCheckPermission(value = {"suggestionBox.write", "h5.suggestionBox.write"}, mode = SaMode.OR)
@ApiOperation("提交申请")
@Aop(TransAop.READ_COMMITTED)
@SLog(tag = "建言献策-填写申请", msg = "提交申请")
@@ -88,7 +89,7 @@ public class SuggestionBoxWriteController {
}
@At
@SaCheckPermission("suggestionBox.write")
@SaCheckPermission(value = {"suggestionBox.write", "h5.suggestionBox.write"}, mode = SaMode.OR)
@ApiOperation("重新提交申请")
@Aop(TransAop.READ_COMMITTED)
@SLog(tag = "建言献策-填写申请", msg = "重新提交申请")
@@ -103,7 +104,7 @@ public class SuggestionBoxWriteController {
}
@At
@SaCheckPermission("suggestionBox.write")
@SaCheckPermission(value = {"suggestionBox.write", "h5.suggestionBox.write"}, mode = SaMode.OR)
@ApiOperation("获取申请信息")
public Result info(@Param("id") String id) {
SuggestionBox box = dao.fetch(SuggestionBox.class, id);
src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionXghController.java
+3 -2
View File
@@ -1,6 +1,7 @@
package com.budwk.app.zhgh.democratic.suggestionBox.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaMode;
import cn.hutool.core.util.StrUtil;
import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.param.PageForm;
@@ -49,7 +50,7 @@ public class SuggestionXghController {
@At
@SaCheckPermission("suggestionBox.xgh")
@SaCheckPermission(value = {"suggestionBox.xgh", "h5.suggestionBox.xgh"}, mode = SaMode.OR)
public Result pageData(PageForm pageForm, String taskId, String searchKeyword, Integer year, boolean approval) {
Sql sql = Sqls.create("""
SELECT
@@ -114,7 +115,7 @@ public class SuggestionXghController {
}
@At
@SaCheckPermission("suggestionBox.xgh")
@SaCheckPermission(value = {"suggestionBox.xgh", "h5.suggestionBox.xgh"}, mode = SaMode.OR)
@ApiOperation("查询任务")
public Result queryTask(@Valid @Param("taskId") String taskId) {
Sql sql = Sqls.create("""