From b88f3ec86a22f0011cef172bff0e4e296ce6cbeb Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期四, 27 六月 2024 09:15:30 +0800
Subject: [PATCH] 统计状态过滤
---
project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java | 8 ++++++--
project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java b/project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java
index 3a08577..2c34a04 100644
--- a/project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java
+++ b/project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java
@@ -25,7 +25,7 @@
List<EnforceOrderVo> selectScanList(@Param("companyCode") String companyCode,@Param("userId") Long userId);
- @Select("SELECT COUNT(DISTINCT company_id) FROM enforce_order")
+ @Select("SELECT COUNT(DISTINCT company_id) FROM enforce_order and check_status>=2")
Integer getDistinctCompanyNum();
}
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 79edb73..d53e457 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,15 +50,19 @@
@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")
.ne(SysUser::getUserName,"admin")
+ .eq(SysUser::getStatus,"0")
);
int enforceOrderNum = orderService.count();
- int enforceOrderCheckedNum = orderService.count(orderService.lq().eq(EnforceOrder::getOrderStatus,2));
+ int enforceOrderCheckedNum = orderService.count(orderService.lq().ge(EnforceOrder::getOrderStatus,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