From 69155f0115473d6c17bb7441bc1c7b06e05173ef Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 27 八月 2024 10:45:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java | 4 +++-
1 files changed, 3 insertions(+), 1 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..361934d 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
@@ -4,6 +4,7 @@
import com.project.enforce.domain.EnforceOrder;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
import com.project.enforce.domain.bo.queryBo.OrderCheckedQueryBo;
+import com.project.enforce.domain.vo.EnforceDistinctVo;
import com.project.enforce.domain.vo.EnforceOrderVo;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -25,7 +26,8 @@
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();
+ List<EnforceDistinctVo> selectDistinctCheckDeptIdAndCompanyId();
}
--
Gitblit v1.9.1