luoweijian 1 month ago
parent
commit
69f44acd35
  1. 3
      src/main/java/com/project/exam/domain/param/ExamRecordParam.java
  2. 16
      src/main/java/com/project/exam/domain/service/impl/AdminSearchExamRecordDomainServiceImpl.java
  3. 6
      src/main/java/com/project/exam/domain/service/impl/NotifyExamRecordDomainServiceImpl.java
  4. 3
      src/main/java/com/project/task/domain/param/TaskParam.java
  5. 16
      src/main/java/com/project/task/domain/service/impl/SearchTaskDomainServiceImpl.java

3
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;
}

16
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<PageResult<ExamRecordDTO>> adminSearch(ExamRecordParam param) throws Exception {
LambdaQueryWrapper<ExamRecordEntity> queryWrapper = new LambdaQueryWrapper<>();
@ -64,6 +66,18 @@ public class AdminSearchExamRecordDomainServiceImpl implements AdminSearchExamRe
queryWrapper.like(ExamRecordEntity::getTaskName , param.getTaskName());
}
if (StrUtil.isNotBlank(param.getSubLineName())) {
List<Long> 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<ExamRecordEntity> examRecordEntityIPage = examRecordBaseService.page(

6
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) {

3
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;
}

16
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<PageResult<TaskDTO>> search(TaskParam param) throws Exception {
LambdaQueryWrapper<TaskEntity> 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<Long> 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<TaskEntity> taskEntityPage = taskMapper.selectPage(
PageConverter.toMpPage(param),

Loading…
Cancel
Save