|
|
@@ -133,10 +133,9 @@ public class EvaluateManageController {
|
|
|
.eq(EvaluateManage::getMonth, dto.getMonth())
|
|
|
.eq(EvaluateManage::getEvaluateTemplateId, dto.getEvaluateTemplateId())
|
|
|
.eq(EvaluateManage::getDeleteMark, DeleteMark.NODELETE.getCode())
|
|
|
- .eq(EvaluateManage::getBaseSemesterId, dto.getBaseSemesterId())
|
|
|
);
|
|
|
if(!list.isEmpty()){
|
|
|
- return RT.error("该模板已有同月份的计划");
|
|
|
+ return RT.error("该模板已有同月份的计划,无法添加");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -160,6 +159,20 @@ public class EvaluateManageController {
|
|
|
public RT<Boolean> update(@Valid @RequestBody UpdateEvaluateManageDto dto){
|
|
|
|
|
|
EvaluateManage evaluateManage = BeanUtil.toBean(dto, EvaluateManage.class);
|
|
|
+ EvaluateTemplate evaluateTemplate = templateService.getById(dto.getEvaluateTemplateId());
|
|
|
+ if(evaluateTemplate.getEvaluateType().equals(EvaluateTypeEnum.TEACHER_EVALUATE_CLASS.getCode())){
|
|
|
+ List<EvaluateManage> list = evaluateManageService.list(
|
|
|
+ new QueryWrapper<EvaluateManage>().lambda()
|
|
|
+ .eq(EvaluateManage::getYear, dto.getYear())
|
|
|
+ .eq(EvaluateManage::getMonth, dto.getMonth())
|
|
|
+ .eq(EvaluateManage::getEvaluateTemplateId, dto.getEvaluateTemplateId())
|
|
|
+ .eq(EvaluateManage::getDeleteMark, DeleteMark.NODELETE.getCode())
|
|
|
+ .ne(EvaluateManage::getId, dto.getId())
|
|
|
+ );
|
|
|
+ if(!list.isEmpty()){
|
|
|
+ return RT.error("该模板已有同月份的计划,无法修改");
|
|
|
+ }
|
|
|
+ }
|
|
|
return RT.ok(evaluateManageService.update(evaluateManage));
|
|
|
|
|
|
}
|