From 0166044275aefa9bbcf23e40ab7a2280fd43af52 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 25 三月 2025 17:40:17 +0800
Subject: [PATCH] 脱敏

---
 project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java |   32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 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 c8fa078..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,25 +50,33 @@
     @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));
         Map<String, Object> result = new HashMap<>(7);
-        result.put("companyNum", companyNum);
-        result.put("enforceCompanyNum", enforceCompanyNum);
-        result.put("enforceDeptNum", enforceDeptNum);
-        result.put("enforceUserNum", enforceUserNum);
-        result.put("enforceOrderNum", enforceOrderNum);
-        result.put("enforceOrderCheckedNum", enforceOrderCheckedNum);
-        result.put("enforceOrderCompleteNum", enforceOrderCompleteNum);
-        result.put("complaintNum", complaintNum);
-        result.put("docNum", docNum);
+        result.put("companyNum", companyNum); //浼佷笟鏁�
+        result.put("enforceCompanyNum", enforceCompanyNum);//琚墽娉曚紒涓氭暟
+        result.put("enforceDeptNum", enforceDeptNum);//鎵ф硶鍗曚綅
+        result.put("enforceUserNum", enforceUserNum);//鎵ф硶浜哄憳
+        result.put("enforceOrderNum", enforceOrderNum);//鎵ф硶鍗曟�绘暟
+        result.put("enforceOrderCheckedNum", enforceOrderCheckedNum);//宸插鎵规墽娉曞崟鏁�
+        result.put("enforceOrderCompleteNum", enforceOrderCompleteNum);//鎵ф硶鍗曞畬鎴愭暟
+        result.put("complaintNum", complaintNum);//鎶曡瘔鏁�
+        result.put("docNum", docNum);//鏀跨瓥鏁�
         return result;
     }
 

--
Gitblit v1.9.1