|
|
@@ -166,18 +166,16 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
|
|
|
if (levels.size() != levelSet.size()) {
|
|
|
return CommonResult.fail("存在重复等级");
|
|
|
}
|
|
|
+ smartTemplateRuleService.deleteSmartTemplateRuleBytId(smartSubjectTemplate.getId());
|
|
|
+
|
|
|
+ List<SmartTemplateRule> rules = new ArrayList<>();
|
|
|
for (int i = 0; i < ruleList.size(); i++) {
|
|
|
SmartTemplateRule rule = ruleList.get(i);
|
|
|
- if (rule.getId() == null) {
|
|
|
- rule.setId((int) UUIDUtil.generateID());
|
|
|
- }
|
|
|
rule.setTemplateId(smartSubjectTemplate.getId());
|
|
|
- SmartTemplateRule ruleListc = smartTemplateRuleService.getSmartTemplateRuleById(rule.getId());
|
|
|
- if (ruleListc == null) {
|
|
|
- smartTemplateRuleService.insertSmartTemplateRule(rule);
|
|
|
- } else {
|
|
|
- smartTemplateRuleService.updateSmartTemplateRule(rule);
|
|
|
- }
|
|
|
+ rules.add(rule);
|
|
|
+ }
|
|
|
+ if(rules != null && rules.size() > 0){
|
|
|
+ smartTemplateRuleService.saveBatch(rules);
|
|
|
}
|
|
|
|
|
|
smartSubjectTemplateService.updateSmartSubjectTemplate(smartSubjectTemplate);
|
|
|
@@ -202,14 +200,9 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
|
|
|
if (!evaluateData.isEmpty()) {
|
|
|
return CommonResult.fail("该评分项已评测,不可删除");
|
|
|
}
|
|
|
- QueryWrapper<SmartTemplateRule> queryWrapper2 = new QueryWrapper<>();
|
|
|
- queryWrapper2.eq("template_id", smartSubjectTemplate.getId());
|
|
|
- List<SmartTemplateRule> listc = smartTemplateRuleService.getSmartTemplateRuleByKey(queryWrapper2);
|
|
|
- if (!listc.isEmpty()) {
|
|
|
- SmartTemplateRule sr = new SmartTemplateRule();
|
|
|
- sr.setDeleted(1);
|
|
|
- smartTemplateRuleService.update(sr, queryWrapper2);
|
|
|
- }
|
|
|
+
|
|
|
+ int listc = smartTemplateRuleService.deleteSmartTemplateRuleBytId(smartSubjectTemplate.getId());
|
|
|
+
|
|
|
smartSubjectTemplateService.deleteSmartSubjectTemplateById(id);
|
|
|
return CommonResult.ok("操作成功");
|
|
|
}
|