|
@@ -123,7 +123,7 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
|
|
|
.eq(EvaluateObject::getEvaluateManageId, dto.getEvaluateManageId())
|
|
.eq(EvaluateObject::getEvaluateManageId, dto.getEvaluateManageId())
|
|
|
.eq((dto.getBaseGradeId() != null && dto.getBaseGradeId() > 0), BaseClass::getGradeId, dto.getBaseGradeId())
|
|
.eq((dto.getBaseGradeId() != null && dto.getBaseGradeId() > 0), BaseClass::getGradeId, dto.getBaseGradeId())
|
|
|
.eq((dto.getClassId() != null && dto.getClassId() > 0), BaseClass::getId, dto.getClassId())
|
|
.eq((dto.getClassId() != null && dto.getClassId() > 0), BaseClass::getId, dto.getClassId())
|
|
|
- .eq(!ObjectUtil.isNotNull(dto.getTeacherId()), EvaluateObject::getObjectId, dto.getTeacherId())
|
|
|
|
|
|
|
+ .eq(ObjectUtil.isNotNull(dto.getTeacherId()), EvaluateObject::getObjectId, dto.getTeacherId())
|
|
|
.like((dto.getName() != null && !("").equals(dto.getName())), XjrUser::getName, dto.getName())
|
|
.like((dto.getName() != null && !("").equals(dto.getName())), XjrUser::getName, dto.getName())
|
|
|
.disableSubLogicDel();
|
|
.disableSubLogicDel();
|
|
|
List<ResultViewingPageVo> list = evaluateObjectMapper.selectJoinList(ResultViewingPageVo.class, evaluateObjectMPJLambdaWrapper);
|
|
List<ResultViewingPageVo> list = evaluateObjectMapper.selectJoinList(ResultViewingPageVo.class, evaluateObjectMPJLambdaWrapper);
|