From 9324ada9a0f9a1e0dc2799900611328dadc0ce5d Mon Sep 17 00:00:00 2001 From: luogw <3132758203@qq.com> Date: Sat, 28 Feb 2026 17:30:43 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appeal/domain/param/AppealParam.java | 4 +++- .../Impl/SearchAppealDomainServiceImpl.java | 20 +++++++++-------- .../domain/param/OperationLogParam.java | 4 ++-- .../SearchOperationLogDomainServiceImpl.java | 5 +++-- .../com/project/task/mapper/TaskMapper.java | 22 ++++++++++++++----- 5 files changed, 36 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/project/appeal/domain/param/AppealParam.java b/src/main/java/com/project/appeal/domain/param/AppealParam.java index dc50320..08e93b6 100644 --- a/src/main/java/com/project/appeal/domain/param/AppealParam.java +++ b/src/main/java/com/project/appeal/domain/param/AppealParam.java @@ -5,5 +5,7 @@ import lombok.Data; @Data public class AppealParam extends BaseParam { - public String subLineName; + public Long subLineId; + public Long lineId; + public Long businessId; } diff --git a/src/main/java/com/project/appeal/domain/service/Impl/SearchAppealDomainServiceImpl.java b/src/main/java/com/project/appeal/domain/service/Impl/SearchAppealDomainServiceImpl.java index 449fa78..e02233b 100644 --- a/src/main/java/com/project/appeal/domain/service/Impl/SearchAppealDomainServiceImpl.java +++ b/src/main/java/com/project/appeal/domain/service/Impl/SearchAppealDomainServiceImpl.java @@ -45,8 +45,8 @@ public class SearchAppealDomainServiceImpl implements SearchAppealDomainService QueryWrapper appealEntityQueryWrapper = new QueryWrapper<>(); IPage appealDTOIPage = new Page<>(); Map taskIdToSubLineNameMap = new HashMap<>(); - appealEntityQueryWrapper.orderByDesc("update_time"); - if (StringUtils.isBlank(appealParam.getSubLineName())){ + appealEntityQueryWrapper.orderByDesc("create_time"); + if (appealParam.getBusinessId() == null && appealParam.getLineId() == null && appealParam.getSubLineId() == null) { Page appealEntityPage = appealMapper.selectPage(PageConverter.toMpPage(appealParam), appealEntityQueryWrapper); appealDTOIPage = appealEntityPage.convert(entity -> entity.toDTO(AppealDTO::new)); @@ -58,13 +58,15 @@ public class SearchAppealDomainServiceImpl implements SearchAppealDomainService } }else{ //查询产品线相关的考试任务 - List taskBySubLineName = taskMapper.getTaskBySubLineName(appealParam.getSubLineName()); - taskIdToSubLineNameMap = taskBySubLineName.stream().collect(Collectors.toMap(TaskDTO::getId, TaskDTO::getSubLineName)); - - //查询申诉列表 - appealEntityQueryWrapper.in("task_id",taskBySubLineName.stream().map(TaskDTO::getId).collect(Collectors.toList())); - Page appealEntityPage = appealMapper.selectPage(PageConverter.toMpPage(appealParam), appealEntityQueryWrapper); - appealDTOIPage = appealEntityPage.convert(entity -> entity.toDTO(AppealDTO::new)); + List taskByAppealParam = taskMapper.getTaskByAppealParam(appealParam.getSubLineId(),appealParam.getLineId(),appealParam.getBusinessId()); + taskIdToSubLineNameMap = taskByAppealParam.stream().collect(Collectors.toMap(TaskDTO::getId, TaskDTO::getSubLineName)); + + if (!CollectionUtils.isEmpty(taskByAppealParam)){ + //查询申诉列表 + appealEntityQueryWrapper.in("task_id",taskByAppealParam.stream().map(TaskDTO::getId).collect(Collectors.toList())); + Page appealEntityPage = appealMapper.selectPage(PageConverter.toMpPage(appealParam), appealEntityQueryWrapper); + appealDTOIPage = appealEntityPage.convert(entity -> entity.toDTO(AppealDTO::new)); + } } appealDTOIPage.setRecords(buildDTO(appealDTOIPage.getRecords(),taskIdToSubLineNameMap)); return Result.page(appealDTOIPage); diff --git a/src/main/java/com/project/operation/domain/param/OperationLogParam.java b/src/main/java/com/project/operation/domain/param/OperationLogParam.java index d480888..0ba7a01 100644 --- a/src/main/java/com/project/operation/domain/param/OperationLogParam.java +++ b/src/main/java/com/project/operation/domain/param/OperationLogParam.java @@ -13,9 +13,9 @@ public class OperationLogParam extends BaseParam { //详细信息 public String description; //开始时间 - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd") public Date startTime; //结束时间 - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd") public Date endTime; } diff --git a/src/main/java/com/project/operation/domain/service/impl/SearchOperationLogDomainServiceImpl.java b/src/main/java/com/project/operation/domain/service/impl/SearchOperationLogDomainServiceImpl.java index 103fdae..4f90cd4 100644 --- a/src/main/java/com/project/operation/domain/service/impl/SearchOperationLogDomainServiceImpl.java +++ b/src/main/java/com/project/operation/domain/service/impl/SearchOperationLogDomainServiceImpl.java @@ -1,5 +1,6 @@ package com.project.operation.domain.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.DesensitizedUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -50,10 +51,10 @@ public class SearchOperationLogDomainServiceImpl implements SearchOperationLogDo logQueryWrapper.like("description",param.getDescription()); } if (param.getStartTime() != null) { - logQueryWrapper.ge("create_time",param.getStartTime()); + logQueryWrapper.ge("create_time", DateUtil.beginOfDay(param.getStartTime())); } if (param.getEndTime() != null) { - logQueryWrapper.le("create_time",param.getEndTime()); + logQueryWrapper.le("create_time",DateUtil.endOfDay(param.getEndTime())); } //只查执行成功的日志 logQueryWrapper.eq("result",0); diff --git a/src/main/java/com/project/task/mapper/TaskMapper.java b/src/main/java/com/project/task/mapper/TaskMapper.java index 581e6c5..f2f24e1 100644 --- a/src/main/java/com/project/task/mapper/TaskMapper.java +++ b/src/main/java/com/project/task/mapper/TaskMapper.java @@ -30,10 +30,22 @@ public interface TaskMapper extends BaseMapper { * 查询考试任务 */ @Select({ - "select e.id,l.name as subLineName " + - "FROM evaluator_task e " + - "LEFT join evaluator_product_line l on e.sub_line_id = l.id " + - "where l.leaf = 1 and l.name LIKE CONCAT('%', #{subLineName}, '%')" + "" }) - List getTaskBySubLineName(@Param("subLineName") String subLineName); + List getTaskByAppealParam(@Param("subLineId") Long subLineId,@Param("lineId") Long lineId,@Param("businessId") Long businessId); }