From 29fbb07e30eab4b8092a7600a0ef0e39db1de1f2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 25 九月 2024 14:35:00 +0800
Subject: [PATCH] 工单号生成修改
---
ycl-server/src/main/java/com/ycl/utils/MongoUtil.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/utils/MongoUtil.java b/ycl-server/src/main/java/com/ycl/utils/MongoUtil.java
index dfff3aa..3cff535 100644
--- a/ycl-server/src/main/java/com/ycl/utils/MongoUtil.java
+++ b/ycl-server/src/main/java/com/ycl/utils/MongoUtil.java
@@ -76,6 +76,14 @@
// 鏃堕棿
Criteria time = Criteria.where(timeFiled).gte(params.getStartTime()).lte(params.getEndTime());
+ // 鏁版嵁绫诲瀷
+ Criteria dType = null;
+ if (params.getDataType().equals(1)) {
+ dType = Criteria.where("provinceTag").is(Boolean.TRUE);
+ }else if(params.getDataType().equals(2)){
+ dType = Criteria.where("deptTag").is(Boolean.TRUE);
+ }
+
// 灏嗘煡璇㈡潯浠禷nd璧锋潵
Criteria and = new Criteria();
List<Criteria> qList = new ArrayList<>(3);
@@ -86,6 +94,9 @@
if (Objects.nonNull(or)) {
qList.add(or);
}
+ if (Objects.nonNull(dType)) {
+ qList.add(dType);
+ }
and.andOperator(qList);
// 杩斿洖鏌ヨ
return Query.query(and);
--
Gitblit v1.8.0