From e93c5d64b16a7b3271e81937f1df1b37ff5919cc Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 22 五月 2023 09:07:16 +0800
Subject: [PATCH] BUG修改
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index f1bc1a1..7a85671 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -327,13 +327,13 @@
driverResp.setNotOnlineCount(0);
}else {
Period period = Period.between(DateUtil.dateToLocalDate(tDriverWork.getOffWorkTime()), LocalDate.now());
- driverResp.setNotOnlineCount(Math.abs(period.getDays()));
+ driverResp.setNotOnlineCount(period.getYears()*365 + period.getMonths()*30 + Math.abs(period.getDays()));
}
}else {
if(Objects.nonNull(driverResp.getApprovalTime())){
// 没有上班记录，计算审核时间
Period period = Period.between(DateUtil.dateToLocalDate(driverResp.getApprovalTime()), LocalDate.now());
- driverResp.setNotOnlineCount(Math.abs(period.getDays()));
+ driverResp.setNotOnlineCount(period.getYears()*365 + period.getMonths()*30 + Math.abs(period.getDays()));
}else {
driverResp.setNotOnlineCount(0);
}
@@ -365,7 +365,31 @@
wrapper.eq("isException",2);
wrapper.orderBy("createTime",false);
List<TDriver> tDrivers = tDriverService.selectList(wrapper);
- return tDriverService.getTDriverResp(tDrivers);
+ List<TDriverResp> tDriverResp = tDriverService.getTDriverResp(tDrivers);
+ for (TDriverResp driverResp : tDriverResp) {
+ TDriverWork tDriverWork = tDriverWorkService.selectOne(new EntityWrapper<TDriverWork>()
+ .eq("driverId", driverResp.getId())
+ .orderBy("workTime", false)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(tDriverWork)){
+ // 如果是下班状态，计算未上线天数，，如果为上班状态，则设置为0
+ if(tDriverWork.getStatus() == 1){
+ driverResp.setNotOnlineCount(0);
+ }else {
+ Period period = Period.between(DateUtil.dateToLocalDate(tDriverWork.getOffWorkTime()), LocalDate.now());
+ driverResp.setNotOnlineCount(period.getYears()*365 + period.getMonths()*30 + Math.abs(period.getDays()));
+ }
+ }else {
+ if(Objects.nonNull(driverResp.getApprovalTime())){
+ // 没有上班记录，计算审核时间
+ Period period = Period.between(DateUtil.dateToLocalDate(driverResp.getApprovalTime()), LocalDate.now());
+ driverResp.setNotOnlineCount(period.getYears()*365 + period.getMonths()*30 + Math.abs(period.getDays()));
+ }else {
+ driverResp.setNotOnlineCount(0);
+ }
+ }
+ }
+ return tDriverResp;
}
/**
@@ -558,7 +582,8 @@
tRechargeRecord.setPayTime(new Date());
tRechargeRecord.setPayStatus(2);
tRechargeRecord.setCreateTime(new Date());
- tRechargeRecord.setAgentId(Objects.requireNonNull(ShiroKit.getUser()).getId());
+ Integer id1 = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
+ tRechargeRecord.setAgentId(id1);
tRechargeRecordService.insert(tRechargeRecord);
return SUCCESS_TIP;
}
--
Gitblit v1.7.1