From b34f41fe5d510df413077ff9c5846955843f9e94 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 25 十二月 2024 12:02:48 +0800
Subject: [PATCH] 修改bug
---
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java
index fc4b306..336ac3c 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java
@@ -84,7 +84,7 @@
* @param ids
*/
@Override
- public void delTaskDetail(List<Integer> ids) {
+ public void delTaskDetail(List<String> ids) {
this.baseMapper.deleteBatchIds(ids);
List<TaskDetail> taskDetails = this.selectBatchIds(ids);
for (TaskDetail taskDetail : taskDetails) {
@@ -124,12 +124,15 @@
info.setName(patrolTask.getName());
info.setStatus(taskDetail.getStatus());
info.setExecutionTime(taskDetail.getExecutionTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- long offlineNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 3).count();
+ //执行状态（1=待执行，2=执行中，3=成功，4=离线，5=失败）
+ long offlineNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 4).count();
info.setOfflineNum(offlineNum);
- long normalNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 2).count();
+ long normalNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 3).count();
info.setNormalNum(normalNum);
- long abnormalNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 4).count();
+ long abnormalNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 5).count();
info.setAbnormalNum(abnormalNum);
+ long underway = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 2).count();
+ info.setUnderway(underway);
return info;
}
@@ -237,7 +240,7 @@
public ResultUtil manualAudit(ManualAuditVo vo) {
List<TaskDetailVehiclesChannel> taskDetailVehiclesChannels = taskDetailVehiclesChannelService.selectBatchIds(vo.getId());
for (TaskDetailVehiclesChannel taskDetailVehiclesChannel : taskDetailVehiclesChannels) {
- if(1 == taskDetailVehiclesChannel.getArtificialStatus()){
+ if(null != taskDetailVehiclesChannel.getArtificialStatus() && 1 == taskDetailVehiclesChannel.getArtificialStatus()){
return ResultUtil.error("不能重复审核");
}
taskDetailVehiclesChannel.setArtificialStatus(vo.getStatus());
--
Gitblit v1.7.1