From 5ffe34a87c27f73bc92b2ac0c58e6894ec61792b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 22 十月 2025 08:46:32 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
index 8dc8961..31254d5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
@@ -144,13 +144,15 @@
                 throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鏈堝彴缁勪俊鎭笉姝g‘锛�");
             }
             //濡傛灉鏈堝彴鍒嗙粍鍙戠敓鍙樺寲
-            Long count =  platformJobJoinMapper.selectCount(  new QueryWrapper<PlatformJob>().lambda()
+            Long count =  platformJobJoinMapper.selectCount( new QueryWrapper<PlatformJob>().lambda()
                     .eq(PlatformJob::getIsdeleted,Constants.ZERO)
-                    .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.WART_SIGN_IN.getKey()
-                            ,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey()
-                            ,Constants.PlatformJobStatus.DONE.getKey()
-                            ,Constants.PlatformJobStatus.LEAVED.getKey()
-                            ,Constants.PlatformJobStatus.CANCEL.getKey()
+                    .eq(PlatformJob::getPlatformId,model.getId())
+                    .in(PlatformJob::getStatus,Constants.PlatformJobStatus.IN_WAIT.getKey()
+                            ,Constants.PlatformJobStatus.CALLED.getKey()
+                            ,Constants.PlatformJobStatus.WORKING.getKey()
+                            ,Constants.PlatformJobStatus.TRANSFERING.getKey()
+                            ,Constants.PlatformJobStatus.EXCEPTION.getKey()
+                            ,Constants.PlatformJobStatus.OVER_NUMBER.getKey()
                     ));
             if(count!=null && count>0){
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝褰撳墠鏈堝彴鏈夋鍦ㄤ綔涓氱殑浠诲姟锛屼笉鑳借繘琛屾湀鍙扮粍鍒囨崲鎿嶄綔锛�");
@@ -293,6 +295,7 @@
                 .eq(pageWrap.getModel().getWidth() != null, Platform::getWidth, pageWrap.getModel().getWidth())
                 .eq(pageWrap.getModel().getHeight() != null, Platform::getHeight, pageWrap.getModel().getHeight())
                 .eq(pageWrap.getModel().getAngle() != null, Platform::getAngle, pageWrap.getModel().getAngle())
+                .eq(pageWrap.getModel().getType() != null, Platform::getType, pageWrap.getModel().getType())
                 .orderByAsc(Platform::getSortnum)
         ;
         for(PageWrap.SortData sortData: pageWrap.getSorts()) {

--
Gitblit v1.9.3