From 55fefdfac9a281cc57a1b3bad1fd061eec4b066d Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期四, 27 六月 2024 09:52:05 +0800
Subject: [PATCH] 统计状态过滤
---
project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java | 2 +-
project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java | 2 +-
project-report/src/main/resources/mapper/report/ReportMapper.xml | 5 +++++
3 files changed, 7 insertions(+), 2 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 2c34a04..459a525 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 and check_status>=2")
+ @Select("SELECT COUNT(DISTINCT company_id) FROM enforce_order where 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 d53e457..a42435d 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
@@ -62,7 +62,7 @@
.eq(SysUser::getStatus,"0")
);
int enforceOrderNum = orderService.count();
- int enforceOrderCheckedNum = orderService.count(orderService.lq().ge(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));
diff --git a/project-report/src/main/resources/mapper/report/ReportMapper.xml b/project-report/src/main/resources/mapper/report/ReportMapper.xml
index c68d466..880b521 100644
--- a/project-report/src/main/resources/mapper/report/ReportMapper.xml
+++ b/project-report/src/main/resources/mapper/report/ReportMapper.xml
@@ -13,6 +13,7 @@
IFNULL(count(order_id),0) as v
from enforce_order
where 1=1
+ and check_status>=2
<if test="deptId != null ">
AND check_dept_id = #{deptId}
</if>
@@ -34,6 +35,7 @@
IFNULL(count(order_id),0) as v
from enforce_order
where 1=1
+ and check_status>=2
<if test="beginTime!=null and beginTime!=''">
AND apply_time >= #{beginTime}
</if>
@@ -54,7 +56,9 @@
from sys_company sc
left join enforce_order eo on sc.company_id=eo.company_id
where 1=1
+ and sc.company_status=0
and sc.check_status=2
+ and eo.check_status>=2
<if test="beginTime!=null and beginTime!=''">
AND eo.apply_time >= #{beginTime}
</if>
@@ -73,6 +77,7 @@
IFNULL(count(order_id),0) as v
from enforce_order
where 1=1
+ and check_status>=2
<if test="beginTime!=null and beginTime!=''">
AND apply_time >= #{beginTime}
</if>
--
Gitblit v1.9.1