From f8ce7aa161ef2ef316357ead8208bc60de938ead Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 24 三月 2025 09:36:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/controller/IndexController.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/IndexController.java b/business/src/main/java/com/ycl/controller/IndexController.java
index 6cb53e6..63739ac 100644
--- a/business/src/main/java/com/ycl/controller/IndexController.java
+++ b/business/src/main/java/com/ycl/controller/IndexController.java
@@ -1,5 +1,6 @@
package com.ycl.controller;
+import com.ycl.common.base.Result;
import com.ycl.common.core.controller.BaseController;
import com.ycl.common.core.domain.R;
import com.ycl.common.core.page.TableDataInfo;
@@ -7,6 +8,8 @@
import com.ycl.domain.vo.*;
import com.ycl.service.AuditHistoryService;
import com.ycl.service.ProjectInfoService;
+import com.ycl.service.ProjectProcessService;
+import com.ycl.system.domain.base.AbsQuery;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,12 +26,9 @@
public class IndexController extends BaseController {
- @Autowired
- private ProjectInfoService projectInfoService;
-
-
- @Autowired
- private AuditHistoryService auditHistoryService;
+ private final ProjectInfoService projectInfoService;
+ private final AuditHistoryService auditHistoryService;
+ private final ProjectProcessService projectProcessService;
/**
* 椤圭洰鏁伴噺缁熻
@@ -74,10 +74,8 @@
* 娑堟伅鏉℃暟
*/
@GetMapping("/message-count")
- public R<IndexMsgCountVO> messageCount() {
- IndexMsgCountVO vo = new IndexMsgCountVO();
- vo.setAuditCount(0L);
- return R.ok(vo);
+ public Result messageCount(AbsQuery query) {
+ return projectProcessService.getProcessMsg(query);
}
/**
--
Gitblit v1.8.0