From b43c133c1e9ba56560d96425d9ca4375b2e44063 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十二月 2024 16:50:44 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index f12bf9b..c5dbbcc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -400,8 +400,14 @@
request.setSorts(new ArrayList<>());
RuleEventFiledOptionsRequest file = new RuleEventFiledOptionsRequest();
file.setFieldName("event_type");
- file.setFieldValue("131588");//瀹夐槻鍛婅
+ file.setFieldValue("131588,131593");//瀹夐槻鍛婅鍜屼汉鍛樺憡璀�
file.setType("in");
+ if(type == 1){
+ file.setFieldValue("131588");//瀹夐槻鍛婅
+ }else if(type == 2){
+
+ file.setFieldValue("131593");//浜哄憳鍛婅
+ }
request.getFiledOptions().add(file);
SortRequest sort = new SortRequest();
sort.setSortField("happen_time");
@@ -1320,12 +1326,15 @@
VisitDataVO result = new VisitDataVO();
result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
.eq(Visits::getIsdeleted,Constants.ZERO)
+ .apply("to_days(create_date)=to_days(now()")
.in(Visits::getStatus,Constants.VisitStatus.pass,Constants.VisitStatus.xfSuccess )));//寰呰闂�
result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
.eq(Visits::getIsdeleted,Constants.ZERO)
+ .apply("to_days(create_date)=to_days(now()")
.in(Visits::getStatus,Constants.VisitStatus.signout,Constants.VisitStatus.signin )));//宸茬櫥璁�
result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
.eq(Visits::getIsdeleted,Constants.ZERO)
+ .apply("to_days(create_date)=to_days(now()")
.in(Visits::getStatus,Constants.VisitStatus.signout )));//宸茬绂�
/*PageWrap<Visits> pageWrap = new PageWrap<>();
pageWrap.setCapacity(10);
--
Gitblit v1.9.3