From c0ccbb980be6975389f09ad13dcabd7d3156dae3 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 22 九月 2025 19:03:56 +0800
Subject: [PATCH] 更新提醒-》只提醒编程员；工控网显示临时更改单号
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/controller/RemindController.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/controller/RemindController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/controller/RemindController.java
index 25e24f7..a1fa8eb 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/controller/RemindController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/controller/RemindController.java
@@ -21,6 +21,7 @@
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowTransferService;
import org.springblade.mdm.flow.vo.FlowVO;
+import org.springblade.mdm.flow.vo.TodoQueryVO;
import org.springblade.mdm.gkw.programnode.vo.ProgramNodeVO;
import org.springblade.mdm.program.service.NcProgramApprovedService;
import org.springblade.mdm.program.vo.NcProgramExportDncPageVO;
@@ -44,7 +45,7 @@
public class RemindController {
@Autowired
- NcProgramApprovedService ncProgramApprovedService;
+ private NcProgramApprovedService ncProgramApprovedService;
@Autowired
private FlowBusinessService businessService;
@Autowired
@@ -54,8 +55,8 @@
*/
@GetMapping("task-count")
@ApiOperationSupport(order = 3)
- @Operation(summary = "寰呭姙浠诲姟", description = "浼犲叆娴佺▼淇℃伅")
- public R<RemindVO> todoList() {
+ @Operation(summary = "寰呭姙浠诲姟鏁伴噺鏌ヨ", description = "寰呭姙浠诲姟鏁伴噺鏌ヨ")
+ public R<RemindVO> taskCount() {
RemindVO result = new RemindVO();
result.setTodoCount(queryTodoCount());
@@ -65,10 +66,10 @@
return R.data(result);
}
long queryTodoCount(){
- Query query = new Query();
+ TodoQueryVO query = new TodoQueryVO();
query.setCurrent(1);
query.setSize(1);
- IPage<FlowVO> pages = businessService.selectTodoPage(Condition.getPage(query), null,null,null);
+ IPage<FlowVO> pages = businessService.selectTodoPage(Condition.getPage(query), query);
return pages.getTotal();
}
/**
@@ -79,13 +80,8 @@
NcProgramExportDncQueryVO query = new NcProgramExportDncQueryVO();
query.setCurrent(1);
query.setSize(1);
-
- List<String> userRoleAliasList = Func.toStrList(",", AuthUtil.getUserRole());//瑙掕壊鍒悕锛屽涓鑹查�楀彿鍒嗛殧
- String managerRole = paramService.getProgramManagerRoleAlias();
- if(!userRoleAliasList.contains(managerRole) && !AuthUtil.isAdministrator() && !AuthUtil.isAdmin()){
- //闈炴暟鎺х鐞嗗憳瑙掕壊銆佺鐞嗗憳锛岄檺鍒舵湭鍙兘瀵煎嚭鑷繁鐨勭▼搴�
- query.setUserId(AuthUtil.getUserId());
- }
+ query.setUserId(AuthUtil.getUserId());
+ query.setQueryType(NcProgramExportDncQueryVO.TYPE_SELF);
IPage<NcProgramExportDncPageVO> pages = ncProgramApprovedService.exportDncPageQuery(query);
return pages.getTotal();
--
Gitblit v1.9.3