From 1e2b04fabbbc4b1ae37d7951068d7ab235f5b5f9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 17 九月 2025 15:29:38 +0800
Subject: [PATCH] 现场编制功能适配
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/controller/RemindController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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..725ca85 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();
}
/**
--
Gitblit v1.9.3