From 0d94b22d58af8246ba575ae17ce2a64f671b7f64 Mon Sep 17 00:00:00 2001 From: wxc <191104855@qq.com> Date: Wed, 16 Jul 2025 18:37:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=8B=E9=85=92?= =?UTF-8?q?=E8=AD=A6=E5=91=98=E5=A4=B4=E5=83=8F=E6=9C=AA=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20fix:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E4=B8=93=E9=A1=B9=E7=9D=A3?= =?UTF-8?q?=E5=AF=9F=E6=9C=AA=E5=8C=B9=E9=85=8D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InspectionController.java | 5 ++++- .../com/biutag/supervision/job/RiskJob.java | 3 +++ .../dto/TaskInspectionProblemQueryParam.java | 5 +++++ .../supervision/pojo/dto/TaskProblemDto.java | 2 ++ .../service/SupDictProblemTypeService.java | 21 +++++++++++++++++++ .../service/SupRiskPersonalService.java | 4 ++-- .../service/SupTaskProblemService.java | 5 ++++- 7 files changed, 41 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/biutag/supervision/controller/mobileSupervision/InspectionController.java b/src/main/java/com/biutag/supervision/controller/mobileSupervision/InspectionController.java index db9079d..e58617a 100644 --- a/src/main/java/com/biutag/supervision/controller/mobileSupervision/InspectionController.java +++ b/src/main/java/com/biutag/supervision/controller/mobileSupervision/InspectionController.java @@ -42,6 +42,7 @@ import java.net.http.HttpRequest; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; @@ -71,7 +72,6 @@ public class InspectionController { } - @GetMapping("{taskId}") public Result get(@PathVariable Integer taskId) { return Result.success(taskInspectionService.getById(taskId)); @@ -80,6 +80,9 @@ public class InspectionController { public Result> listProblem(@PathVariable Integer taskId, TaskInspectionProblemQueryParam queryParam) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(SupTaskProblem::getTaskId, taskId) + .eq(Objects.nonNull(queryParam.getHasProblem()), SupTaskProblem::getHasProblem, queryParam.getHasProblem()) + .eq(StrUtil.isNotBlank(queryParam.getProblemTypeCode()), SupTaskProblem::getProblemTypeCode, queryParam.getProblemTypeCode()) + .eq(StrUtil.isNotBlank(queryParam.getDepartId()), SupTaskProblem::getDepartId, queryParam.getDepartId()) .orderByDesc(SupTaskProblem::getCreateTime); Page page = taskProblemService.page(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper); List records = page.getRecords().stream().map(item -> { diff --git a/src/main/java/com/biutag/supervision/job/RiskJob.java b/src/main/java/com/biutag/supervision/job/RiskJob.java index be5c071..a5a946b 100644 --- a/src/main/java/com/biutag/supervision/job/RiskJob.java +++ b/src/main/java/com/biutag/supervision/job/RiskJob.java @@ -44,6 +44,9 @@ public class RiskJob { // 4小时、1天、30天 long minutes = duration.toMinutes(); long util = 240; + if ("5分钟".equals(riskPersonal.getControlTimeInterval())) { + util = 5; + } if ("4小时".equals(riskPersonal.getControlTimeInterval())) { util = 240; } diff --git a/src/main/java/com/biutag/supervision/pojo/dto/TaskInspectionProblemQueryParam.java b/src/main/java/com/biutag/supervision/pojo/dto/TaskInspectionProblemQueryParam.java index d94ce71..581536f 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/TaskInspectionProblemQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/dto/TaskInspectionProblemQueryParam.java @@ -12,5 +12,10 @@ import lombok.Setter; @Getter public class TaskInspectionProblemQueryParam extends BasePage { + private Boolean hasProblem; + + private String problemTypeCode; + + private String departId; } diff --git a/src/main/java/com/biutag/supervision/pojo/dto/TaskProblemDto.java b/src/main/java/com/biutag/supervision/pojo/dto/TaskProblemDto.java index 37419d9..5a70917 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/TaskProblemDto.java +++ b/src/main/java/com/biutag/supervision/pojo/dto/TaskProblemDto.java @@ -23,6 +23,8 @@ public class TaskProblemDto { private String problemType; + private String problemTypeCode; + private List peoples; // 具体情况 diff --git a/src/main/java/com/biutag/supervision/service/SupDictProblemTypeService.java b/src/main/java/com/biutag/supervision/service/SupDictProblemTypeService.java index 3efdfba..3788114 100644 --- a/src/main/java/com/biutag/supervision/service/SupDictProblemTypeService.java +++ b/src/main/java/com/biutag/supervision/service/SupDictProblemTypeService.java @@ -1,5 +1,6 @@ package com.biutag.supervision.service; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.biutag.supervision.constants.AppConstants; @@ -49,6 +50,26 @@ public class SupDictProblemTypeService extends ServiceImpl recordPage(SupRiskPersonalSupRecordQueryParam queryParam){ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("t.id_code",queryParam.getIdCode()) - .eq("t.task_id",queryParam.getTaskId()); - + .eq("t.task_id",queryParam.getTaskId()) + .orderByDesc("t.sup_time"); Page page = supRiskPersonalSupRecordMapper.queryPage(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper); page.getRecords().forEach(item -> { diff --git a/src/main/java/com/biutag/supervision/service/SupTaskProblemService.java b/src/main/java/com/biutag/supervision/service/SupTaskProblemService.java index 8b29c29..adc1bfa 100644 --- a/src/main/java/com/biutag/supervision/service/SupTaskProblemService.java +++ b/src/main/java/com/biutag/supervision/service/SupTaskProblemService.java @@ -35,6 +35,8 @@ public class SupTaskProblemService extends ServiceImpl