From 0843f9b1526b7680f5cd419cf1f2d2fff44562ee Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 25 十二月 2024 18:39:39 +0800
Subject: [PATCH] 代码初始化

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index 01c5d7b..a5e76bf 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -517,6 +517,14 @@
                 .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
                 .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                 .eq(PlatformJob::getDrivierPhone,loginUserInfo.getMobile())
+                .and(i->i.like(PlatformJob::getDoneDate,DateUtil.getCurrDate())
+                        .or().in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey()
+                                ,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey(),
+                                Constants.PlatformJobStatus.WART_SIGN_IN.getKey(),
+                                Constants.PlatformJobStatus.IN_WAIT.getKey(),
+                                Constants.PlatformJobStatus.CALLED.getKey(),
+                                Constants.PlatformJobStatus.WORKING.getKey())
+                )
                 .orderByDesc(PlatformJob::getId)
         );
         for (PlatformJob platformJob:platformJobList) {
@@ -527,7 +535,6 @@
         }
 
         driverHomeVO.setPlatformJobList(platformJobList);
-
         // 鍥尯瀵艰鍥�  鍥剧墖
         driverHomeVO.setReservationMap(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.PLATFORM_GUIDEMAP).getCode());
         // 棰勭害鎸囧崡 鏂囨湰
@@ -737,6 +744,7 @@
                                 ,PlatformJob::getId,lineUpDetailDTO.getJobId())
                         .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey(),
                                 Constants.PlatformJobStatus.IN_WAIT.getKey(),
+                                Constants.PlatformJobStatus.WORKING.getKey(),
                                 Constants.PlatformJobStatus.CALLED.getKey())
                         .orderByDesc(PlatformJob::getStatus)
                         .orderByAsc(PlatformJob::getSignDate)
@@ -909,6 +917,9 @@
         }
     }
 
+
+
+
     private Logger logger = LoggerFactory.getLogger(PlatformJobServiceImpl.class);
 
     @Override

--
Gitblit v1.9.3