From b882510e16aad7e84d1f50c58831b54ebb5bae22 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 11 三月 2025 17:19:16 +0800
Subject: [PATCH] 代码初始化

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 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 15945db..62f7ce3 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
@@ -132,6 +132,7 @@
                         .select(PlatformJob::getTotalNum)
                         .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                         .eq(PlatformJob::getOrigin,Constants.ONE)
+                        .in(PlatformJob::getType,new Integer[]{0,2,4})
                         .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
                                 , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
                                 , Constants.PlatformJobStatus.LEAVED.getKey())
@@ -801,11 +802,13 @@
                         .selectAll(PlatformJob.class)
                         .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                         .eq(PlatformJob::getCarCodeFront,param.getCarCode())
-                        .in(PlatformJob::getStatus,
+                        .notIn(PlatformJob::getStatus,
                                 Constants.PlatformJobStatus.DONE.getKey(),
                                 Constants.PlatformJobStatus.LEAVED.getKey(),
                                 Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(),
-                                Constants.PlatformJobStatus.CALLED.getKey())
+                                Constants.PlatformJobStatus.CANCEL.getKey()
+                        )
+                        .orderByAsc(PlatformJob::getId)
                         .last("limit 1"));
 
         dealJobDetailAndContractBiz(job,data);
@@ -951,6 +954,7 @@
                         .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
                         .select(PlatformJob::getStatus,PlatformJob::getStatus)
                         .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+                        .in(PlatformJob::getType,Constants.ONE,Constants.THREE)
                         .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),
                                 Constants.PlatformJobStatus.LEAVED.getKey(),
                                 Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
@@ -1971,7 +1975,7 @@
         List<PlatformJob> jobList = platformJobMapper.selectJoinList(PlatformJob.class, new MPJLambdaWrapper<PlatformJob>()
                 .selectAll( PlatformJob.class)
 //                .select("(select sum(ifnull(a.io_qty,0)) from platform_wms_detail a where a.isdeleted=0 and a.job_id =t.id )", create_date)
-                .apply("to_days(t.create_date) = to_days(now())")
+                .apply("to_days(t.done_date) = to_days(now())")
                 .eq(Platform::getIsdeleted, Constants.ZERO)
                 .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
                         , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()

--
Gitblit v1.9.3