From cdbd21ea73eef5d7cf4024654e1f31ab7be1ed81 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 10 十月 2024 09:57:00 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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..9b704bc 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");
}
@@ -1567,9 +1570,12 @@
);
platformDataListResponse.setWorkStatus(Constants.ONE);
//鏌ヨ浣滀笟鏃堕暱
+// Long workTime = this.getWorkTime(platformJob);
+ Long min = (System.currentTimeMillis() - platformJob.getNewStartDate().getTime())/1000/60;
platformDataListResponse.setWorkTime(
- this.getWorkTime(platformJob)
+ min
);
+
//璁＄畻宸蹭綔涓氭椂闀� 鏍规嵁鏈堝彴宸ヤ綔鏁堢巼 璁＄畻浠诲姟閲忛渶瑕佹椂闂�
if (Objects.isNull(platformJob.getWorkNum()) || Objects.isNull(platformJob.getWorkRate())) {
platformDataListResponse.setFinishTime(null);
--
Gitblit v1.9.3