|
|
@@ -65,24 +65,20 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
|
|
|
if (!listc.isEmpty()){
|
|
|
return CommonResult.fail("该评分项已存在");
|
|
|
}
|
|
|
- smartSubjectTemplate.setId((int) UUIDUtil.generateID());
|
|
|
List<SmartTemplateRule> ruleList = smartTemplateRuleList.getRuleList();
|
|
|
List<String> levels = ruleList.stream().map(SmartTemplateRule::getLevel).collect(Collectors.toList());
|
|
|
Set<String> levelSet = new HashSet<>(levels);
|
|
|
if (levels.size() != levelSet.size()) {
|
|
|
return CommonResult.fail("存在重复等级");
|
|
|
}
|
|
|
+ smartSubjectTemplate.setDeleted(0);
|
|
|
+ smartSubjectTemplateService.insertSmartSubjectTemplate(smartSubjectTemplate);
|
|
|
for (int i = 0; i < ruleList.size(); i++) {
|
|
|
SmartTemplateRule rule = ruleList.get(i);
|
|
|
rule.setTemplateId(smartSubjectTemplate.getId());
|
|
|
rule.setDeleted(0);
|
|
|
- if (rule.getId()==null){
|
|
|
- rule.setId((int) UUIDUtil.generateID());
|
|
|
- }
|
|
|
smartTemplateRuleService.insertSmartTemplateRule(rule);
|
|
|
}
|
|
|
- smartSubjectTemplate.setDeleted(0);
|
|
|
- smartSubjectTemplateService.insertSmartSubjectTemplate(smartSubjectTemplate);
|
|
|
return CommonResult.ok("操作成功");
|
|
|
}
|
|
|
|