From 69f44acd3567e1c221f44afff13718f982fb7ade Mon Sep 17 00:00:00 2001 From: luoweijian <1329394916@qq.com> Date: Wed, 18 Mar 2026 18:02:27 +0800 Subject: [PATCH] bug --- .../exam/domain/param/ExamRecordParam.java | 3 +++ .../AdminSearchExamRecordDomainServiceImpl.java | 16 +++++++++++++++- .../impl/NotifyExamRecordDomainServiceImpl.java | 6 +++--- .../com/project/task/domain/param/TaskParam.java | 3 +++ .../impl/SearchTaskDomainServiceImpl.java | 16 +++++++++++++++- 5 files changed, 39 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/project/exam/domain/param/ExamRecordParam.java b/src/main/java/com/project/exam/domain/param/ExamRecordParam.java index e43cfff..d8db31f 100644 --- a/src/main/java/com/project/exam/domain/param/ExamRecordParam.java +++ b/src/main/java/com/project/exam/domain/param/ExamRecordParam.java @@ -10,4 +10,7 @@ public class ExamRecordParam extends BaseParam { private Long subLineId; private String taskName; + + private String subLineName; + } diff --git a/src/main/java/com/project/exam/domain/service/impl/AdminSearchExamRecordDomainServiceImpl.java b/src/main/java/com/project/exam/domain/service/impl/AdminSearchExamRecordDomainServiceImpl.java index 7cde09e..2ea1e8b 100644 --- a/src/main/java/com/project/exam/domain/service/impl/AdminSearchExamRecordDomainServiceImpl.java +++ b/src/main/java/com/project/exam/domain/service/impl/AdminSearchExamRecordDomainServiceImpl.java @@ -1,5 +1,6 @@ package com.project.exam.domain.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.BooleanUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -19,7 +20,6 @@ import com.project.exam.domain.service.ExamRecordPictureBaseService; import com.project.information.domain.entity.ProductLineEntity; import com.project.information.domain.service.ProductLineBaseService; import com.project.information.utils.MinIoUtils; -import com.project.task.domain.dto.TaskUserDTO; import com.project.task.domain.entity.TaskUserEntity; import com.project.task.domain.service.TaskUserBaseService; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +48,8 @@ public class AdminSearchExamRecordDomainServiceImpl implements AdminSearchExamRe @Autowired private TaskUserBaseService taskUserBaseService; + + @Override public Result> adminSearch(ExamRecordParam param) throws Exception { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -64,6 +66,18 @@ public class AdminSearchExamRecordDomainServiceImpl implements AdminSearchExamRe queryWrapper.like(ExamRecordEntity::getTaskName , param.getTaskName()); } + if (StrUtil.isNotBlank(param.getSubLineName())) { + List productLineEntityList = productLineBaseService.lambdaQuery().select(ProductLineEntity::getId) + .like(ProductLineEntity::getName, param.getSubLineName()) + .eq(ProductLineEntity::getLeaf, Boolean.TRUE).list() + .stream().map(ProductLineEntity::getId).toList(); + if (CollUtil.isEmpty(productLineEntityList)) { + queryWrapper.in(ExamRecordEntity::getSubLineId , List.of(-1L)); + } else { + queryWrapper.in(ExamRecordEntity::getSubLineId , productLineEntityList); + } + } + queryWrapper.isNotNull(ExamRecordEntity::getSubmitTime); queryWrapper.orderByDesc(ExamRecordEntity::getId); IPage examRecordEntityIPage = examRecordBaseService.page( diff --git a/src/main/java/com/project/exam/domain/service/impl/NotifyExamRecordDomainServiceImpl.java b/src/main/java/com/project/exam/domain/service/impl/NotifyExamRecordDomainServiceImpl.java index b2ea7a4..8963f96 100644 --- a/src/main/java/com/project/exam/domain/service/impl/NotifyExamRecordDomainServiceImpl.java +++ b/src/main/java/com/project/exam/domain/service/impl/NotifyExamRecordDomainServiceImpl.java @@ -44,9 +44,9 @@ public class NotifyExamRecordDomainServiceImpl implements NotifyExamRecordDomain .singleTitle("查看详情") // todo 修改为对应页面 .singleUrl(dingProperties.getNoticeUrlPrefix() + - "/examResult/?" + "dd_nav_translucent=true&dd_full_screen=true&dd_nav_bgcolor=33E0EEFF" + - "&corpid=" + dingProperties.getCorpId() + "&id=" + dto.getId() + "&index=1" - ).build()) + "/examInfo?dd_nav_translucent=true&dd_full_screen=true&dd_nav_bgcolor=33E0EEFF&" + + "corpid=" + dingProperties.getCorpId() + + "&id=" + dto.getTaskDTO().getId()).build()) .build(); DtCorpConversationMsgSendResult result = dtService.getCorpConversationMsgService().send(message); if (result.getErrCode() == 0) { diff --git a/src/main/java/com/project/task/domain/param/TaskParam.java b/src/main/java/com/project/task/domain/param/TaskParam.java index 0583459..bce5633 100644 --- a/src/main/java/com/project/task/domain/param/TaskParam.java +++ b/src/main/java/com/project/task/domain/param/TaskParam.java @@ -18,4 +18,7 @@ public class TaskParam extends BaseParam { private Integer sortType; + + private String subLineName; + } diff --git a/src/main/java/com/project/task/domain/service/impl/SearchTaskDomainServiceImpl.java b/src/main/java/com/project/task/domain/service/impl/SearchTaskDomainServiceImpl.java index 3e7598e..67888a2 100644 --- a/src/main/java/com/project/task/domain/service/impl/SearchTaskDomainServiceImpl.java +++ b/src/main/java/com/project/task/domain/service/impl/SearchTaskDomainServiceImpl.java @@ -1,5 +1,6 @@ package com.project.task.domain.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -7,7 +8,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.project.base.domain.exception.MissingParameterException; import com.project.base.domain.result.PageResult; import com.project.base.domain.result.Result; -import com.project.base.domain.result.ResultCodeEnum; import com.project.base.domain.utils.PageConverter; import com.project.ding.domain.dto.UserDTO; import com.project.information.application.ProductLineApplicationService; @@ -39,6 +39,9 @@ public class SearchTaskDomainServiceImpl implements SearchTaskDomainService { @Autowired private ProductLineApplicationService productLineApplicationService; + @Autowired + private ProductLineBaseService productLineBaseService; + @Override public Result> search(TaskParam param) throws Exception { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -54,6 +57,17 @@ public class SearchTaskDomainServiceImpl implements SearchTaskDomainService { if (Objects.nonNull(param.getBusinessId())) { queryWrapper.eq(TaskEntity::getBusinessId , param.getBusinessId()); } + if (StrUtil.isNotBlank(param.getSubLineName())) { + List productLineEntityList = productLineBaseService.lambdaQuery().select(ProductLineEntity::getId) + .like(ProductLineEntity::getName, param.getSubLineName()) + .eq(ProductLineEntity::getLeaf, Boolean.TRUE).list() + .stream().map(ProductLineEntity::getId).toList(); + if (CollUtil.isEmpty(productLineEntityList)) { + queryWrapper.in(TaskEntity::getSubLineId , List.of(-1L)); + } else { + queryWrapper.in(TaskEntity::getSubLineId , productLineEntityList); + } + } queryWrapper.orderByDesc(TaskEntity::getId); IPage taskEntityPage = taskMapper.selectPage( PageConverter.toMpPage(param),