From b1740c80205d9584738b1150f4122784c70bbe57 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 08 四月 2025 14:55:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 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 6225033..aeb499d 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
@@ -1014,11 +1014,11 @@
.select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
- .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey()
- ,Constants.PlatformJobStatus.LEAVED.getKey()
- ,Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
- ,Constants.PlatformJobStatus.CALLED.getKey())
- .apply(" to_days(create_date) <to_days(now())"));
+ .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),
+ Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
+ ,Constants.PlatformJobStatus.CANCEL.getKey())
+ .apply(" to_days(create_date) < to_days(now()) ")
+ );
//==========浠婂ぉ鍑哄叆搴撳畬鎴愰噺
List<PlatformJob> currentDoneNum = platformJobMapper.selectJoinList(PlatformJob.class,
@@ -1029,9 +1029,10 @@
.select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
- .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())
+ .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.CANCEL.getKey())
.apply(" to_days(done_date) = to_days(now())"));
- //==========浠婂ぉ涓嬪彂鍑哄叆搴撲换鍔�----
+
+ //==========浠婂ぉ涓嬪彂鍑哄叆搴撲换鍔� 鏈畬鎴愮殑----
List<PlatformJob> currentNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAs(PlatformJob::getId,PlatformJob::getId)
@@ -1040,17 +1041,17 @@
.select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
- .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())
- .apply(" to_days(create_date) = to_days(now())"));
+ .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.CANCEL.getKey())
+ .apply(" to_days(create_date) = to_days(now()) and done_date is null "));
BigDecimal beforeOutNum = (getSumTotalByList(beforeJobNum,0,null));//浠婂ぉ涔嬪墠鏈畬鎴愬嚭搴撲换鍔�
BigDecimal currentOutNum = (getSumTotalByList(currentNum,0,null));//浠婂ぉ涓嬪彂鍑哄簱浠诲姟
BigDecimal beforeInNum = (getSumTotalByList(beforeJobNum,1,null));//浠婂ぉ涔嬪墠鏈畬鎴愬叆搴撲换鍔�
BigDecimal currentInNum = (getSumTotalByList(currentNum,1,null));//浠婂ぉ涓嬪彂鍏ュ簱浠诲姟
- data.setCurrentInNum(beforeInNum.add(currentInNum));//褰撳墠鍏ュ簱鎬讳换鍔℃垚閲�
- data.setCurrentOutNum(beforeOutNum.add(currentOutNum));//褰撳墠鍑哄簱鎬讳换鍔℃垚閲�
data.setCurrentInDoneNum(getSumTotalByList(currentDoneNum,1,1));//浠婃棩瀹屾垚閲�
data.setCurrentOutDoneNum(getSumTotalByList(currentDoneNum,0,1));//浠婃棩瀹屾垚閲�
+ data.setCurrentInNum(beforeInNum.add(data.getCurrentInDoneNum()).add(currentInNum));//褰撳墠鍏ュ簱鎬讳换鍔℃垚閲�
+ data.setCurrentOutNum(beforeOutNum.add(data.getCurrentOutDoneNum()).add(currentOutNum));//褰撳墠鍑哄簱鎬讳换鍔℃垚閲�
//------------浠婃棩鍑哄叆搴撴晥鐜�----------------
BigDecimal outHours = getTotalDoneTimes(currentDoneNum,0);//
@@ -1745,11 +1746,10 @@
@Override
public VisitDataVO visitSecurityData(){
//寰呰闂�佸凡鐧昏銆佸凡绂诲紑
-
VisitDataVO result = new VisitDataVO();
result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
.eq(Visits::getIsdeleted,Constants.ZERO)
- .apply("to_days(create_date)=to_days(now())")
+ .apply(" now() > STARTTIME and now() < ENDTIME")
.in(Visits::getStatus,Constants.VisitStatus.pass,Constants.VisitStatus.xfSuccess )));//寰呰闂�
result.setRegisterVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
.eq(Visits::getIsdeleted,Constants.ZERO)
--
Gitblit v1.9.3