From 14f37814a441d795ae7a15dfe4b7be05aa49f96f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 23 一月 2025 16:30:28 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 168daf3..9a84710 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
@@ -1776,6 +1776,7 @@
.selectAll(Retention.class)
.selectAs(Company::getType,Retention::getCompanyType)
.leftJoin(Company.class,Company::getId,Retention::getCompanyId)
+ .eq(Retention::getIsdeleted,Constants.ZERO)
);
//浠婃棩鍦ㄥ洯浜烘暟
@@ -1888,9 +1889,13 @@
}else{
platformDurationVO.setWorkType(Constants.ZERO);//濡傛灉鏄嵏璐�
}
- Integer workMinute = Constants.formatBigdecimal(job.getWorkNum()).multiply(new BigDecimal(60)).divide(model.getWorkRate(),0,BigDecimal.ROUND_HALF_UP).intValue();
- Date overDate = DateUtil.getXMinuteAfterDate(job.getNewStartDate(),workMinute + model.getWorkTimeoutAlarmTime());//棰勮瀹屾垚鏃堕棿
- platformDurationVO.setFinishTimeStr(DateUtil.DateToStr(overDate,"HH:mm"));
+ Integer workMinute = 0;
+ Date overDate =null;
+ if(model.getWorkRate()!=null && model.getWorkRate().compareTo(new BigDecimal(0)) !=0){
+ workMinute = Constants.formatBigdecimal(job.getWorkNum()).multiply(new BigDecimal(60)).divide(model.getWorkRate(),0,BigDecimal.ROUND_HALF_UP).intValue();
+ overDate = DateUtil.getXMinuteAfterDate(job.getNewStartDate(),workMinute + model.getWorkTimeoutAlarmTime());//棰勮瀹屾垚鏃堕棿
+ platformDurationVO.setFinishTimeStr(DateUtil.DateToStr(overDate,"HH:mm"));
+ }
platformDurationVO.setWorkNum(Constants.formatBigdecimal(job.getWorkNum()).intValue());
platformDurationVO.setCarNo(job.getCarCodeFront());//杞︾墝鍙�
@@ -1899,7 +1904,7 @@
}else{
platformDurationVO.setStatus(Constants.ZERO); //浣滀笟涓�
platformDurationVO.setWorkTime(PlatformJobServiceImpl.getWorkTime(job,platformLogMapper));//宸插伐浣滄椂闂�
- if(overDate.getTime() < System.currentTimeMillis() ){
+ if(overDate!=null && overDate.getTime() < System.currentTimeMillis() ){
model.setStatus(Constants.TWO); //浣滀笟宸茶秴鏃�
}
}
@@ -2042,7 +2047,7 @@
.select("count(id)" ,PlatformJob::getCountum)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.apply("to_days(create_date) = to_days(now())" )
- .groupBy(PlatformJob::getStatus )
+ .groupBy(PlatformJob::getStatus)
);
if(jobList!=null){
--
Gitblit v1.9.3