Browse Source

考试任务新增字段

master
luogw 2 months ago
parent
commit
d3b3843159
  1. 5
      src/main/java/com/project/task/domain/dto/TaskDTO.java
  2. 14
      src/main/java/com/project/task/domain/service/impl/SearchTaskDomainServiceImpl.java

5
src/main/java/com/project/task/domain/dto/TaskDTO.java

@ -104,6 +104,11 @@ public class TaskDTO extends BaseDTO {
private String examModeTag; private String examModeTag;
/**
* 是否存在待审批的申诉
*/
private Boolean hasPendingAppeal;
// =============== V1.1 新增字段 结束 ============ // =============== V1.1 新增字段 结束 ============
} }

14
src/main/java/com/project/task/domain/service/impl/SearchTaskDomainServiceImpl.java

@ -7,6 +7,9 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.project.appeal.domain.entity.AppealEntity;
import com.project.appeal.domain.enums.AppealStatusEnum;
import com.project.appeal.mapper.AppealMapper;
import com.project.base.domain.exception.MissingParameterException; import com.project.base.domain.exception.MissingParameterException;
import com.project.base.domain.result.PageResult; import com.project.base.domain.result.PageResult;
import com.project.base.domain.result.Result; import com.project.base.domain.result.Result;
@ -61,6 +64,9 @@ public class SearchTaskDomainServiceImpl implements SearchTaskDomainService {
@Autowired @Autowired
private ProductLineMapper productLineMapper; private ProductLineMapper productLineMapper;
@Autowired
private AppealMapper appealMapper;
@Override @Override
public Result<PageResult<TaskDTO>> search(TaskParam param) throws Exception { public Result<PageResult<TaskDTO>> search(TaskParam param) throws Exception {
LambdaQueryWrapper<TaskEntity> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TaskEntity> queryWrapper = new LambdaQueryWrapper<>();
@ -194,6 +200,14 @@ public class SearchTaskDomainServiceImpl implements SearchTaskDomainService {
dto.setParticipantUserDTOList(participantUserDTOList); dto.setParticipantUserDTOList(participantUserDTOList);
dto.setParticipantUserIdList(participantUserDTOList.stream().map(UserDTO::getId).toList()); dto.setParticipantUserIdList(participantUserDTOList.stream().map(UserDTO::getId).toList());
dto.setTotalQuestionNum(dto.getSingleChoiceNum() + dto.getMultipleChoiceNum() + dto.getTrueFalseNum() + dto.getShortAnswerNum()); dto.setTotalQuestionNum(dto.getSingleChoiceNum() + dto.getMultipleChoiceNum() + dto.getTrueFalseNum() + dto.getShortAnswerNum());
// 查询是否存在待审批的申诉
Long pendingAppealCount = appealMapper.selectCount(
new LambdaQueryWrapper<AppealEntity>()
.eq(AppealEntity::getTaskId, dto.getId())
.eq(AppealEntity::getStatus, AppealStatusEnum.PENDING_REVIEW.getValue()));
dto.setHasPendingAppeal(pendingAppealCount > 0);
return dto; return dto;
} }

Loading…
Cancel
Save