From 15fb0231e41bf688834c754c6ae3ded5b54d1f97 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 10 十月 2024 14:37:03 +0800
Subject: [PATCH] ll

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java |    5 ++++-
 1 files changed, 4 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 191e785..6b1dbb8 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
@@ -693,6 +693,7 @@
                         .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey(),
                                 Constants.PlatformJobStatus.IN_WAIT.getKey(),
                                 Constants.PlatformJobStatus.CALLED.getKey())
+                        .orderByDesc(PlatformJob::getStatus)
                         .orderByAsc(PlatformJob::getSignDate)
         );
         //鑾峰彇鎵�鏈夋湀鍙扮粍
@@ -720,6 +721,7 @@
                             .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey(),
                                     Constants.PlatformJobStatus.IN_WAIT.getKey(),
                                     Constants.PlatformJobStatus.CALLED.getKey())
+                            .orderByDesc(PlatformJob::getStatus)
                             .orderByDesc(PlatformJob::getSignDate));
             platformGroup.setSignJobList(platformJobSignInList);
             //鏌ヨ褰撳墠鏈堝彴缁勪笅
@@ -1376,7 +1378,8 @@
             }
         }else if(Constants.equalsInteger(objType,Constants.PlatformJobLogType.WORKING.getKey())){
             platformLog.setParam1(DateUtil.dateTypeToString(platformLog.getCreateDate(),"yyyy-MM-dd HH:mm:ss"));
-            platformLog.setParam3("0");
+            platformLog.setParam3("0"); 
+            platformLog.setRemark(platformJobBefor.getPlatformId().toString());
         }else{
             platformLog.setParam3("0");
         }

--
Gitblit v1.9.3