From ea2f787b6148c3e06d945339e1b0c1a97bc28f58 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期三, 11 十二月 2024 18:28:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 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..af2e92e 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 @@ -402,6 +402,11 @@ file.setFieldName("event_type"); file.setFieldValue("131588");//瀹夐槻鍛婅 file.setType("in"); + if(type == 1){ + + }else if(type == 1){ + + } request.getFiledOptions().add(file); SortRequest sort = new SortRequest(); sort.setSortField("happen_time"); @@ -1320,12 +1325,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