From 366ea52e19897a287355e2e5241f0593befd7d3c Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期四, 27 六月 2024 09:56:00 +0800
Subject: [PATCH] 统计状态过滤

---
 project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java b/project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java
index 20b0d8f..281cc20 100644
--- a/project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java
+++ b/project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java
@@ -50,12 +50,20 @@
     @Override//姹囨��
     public Map<String, Object> getTotalInfo()
     {
-        int companyNum = companyService.count(companyService.lq().eq(SysCompany::getCompanyStatus, 0));
+        int companyNum = companyService.count(companyService.lq()
+                .eq(SysCompany::getCompanyStatus, 0)
+                .eq(SysCompany::getCheckStatus, 2)
+        );
         int enforceCompanyNum = orderService.getDistinctCompanyNum();
         int enforceDeptNum = deptService.count(deptService.lq().eq(SysDept::getParentId,100));
-        int enforceUserNum = userService.count(userService.lq().ne(SysUser::getUserType,"02"));
+        int enforceUserNum = userService.count(userService.lq()
+                .ne(SysUser::getUserType,"02")
+                .ne(SysUser::getUserName,"admin")
+                .eq(SysUser::getStatus,"0")
+                .eq(SysUser::getDelFlag,"0")
+        );
         int enforceOrderNum = orderService.count();
-        int enforceOrderCheckedNum = orderService.count(orderService.lq().eq(EnforceOrder::getOrderStatus,2));
+        int enforceOrderCheckedNum = orderService.count(orderService.lq().ge(EnforceOrder::getCheckStatus,2));
         int enforceOrderCompleteNum = orderService.count(orderService.lq().eq(EnforceOrder::getOrderStatus,4));
         int complaintNum = complaintLogService.count();
         int docNum = docService.count(docService.lq().eq(SysDoc::getDocStatus,0));

--
Gitblit v1.9.1