夏文涛 2 роки тому
батько
коміт
1e96e0c19c

+ 10 - 17
src/main/java/com/template/controller/SmartEvaluateStudentController2.java

@@ -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("操作成功");
     }

+ 2 - 0
src/main/java/com/template/services/SmartTemplateRuleService.java

@@ -24,6 +24,8 @@ public interface SmartTemplateRuleService extends IService<SmartTemplateRule> {
 
     PageUtils<SmartTemplateRule> queryPageSmartTemplateRule(int currentPage, int pageCount, QueryWrapper<SmartTemplateRule> queryWrapper);
 
+    int deleteSmartTemplateRuleBytId(int templateid);
+
     int deleteSmartTemplateRuleById(int id);
 
     SmartTemplateRule getSmartTemplateRuleById(int id);

+ 11 - 2
src/main/java/com/template/services/impl/SmartTemplateRuleServiceImpl.java

@@ -44,11 +44,20 @@ public class SmartTemplateRuleServiceImpl extends ServiceImpl<SmartTemplateRuleM
     @Override
     public PageUtils<SmartTemplateRule> queryPageSmartTemplateRule(int currentPage, int pageCount, QueryWrapper<SmartTemplateRule> queryWrapper) {
         Page<SmartTemplateRule> page = new Page<>(currentPage, pageCount);
-        IPage<SmartTemplateRule> result = smartTemplateRuleMapper.selectPage(page,queryWrapper);
+        IPage<SmartTemplateRule> result = smartTemplateRuleMapper.selectPage(page, queryWrapper);
         return new PageUtils<>(result);
     }
 
     @Override
+    public int deleteSmartTemplateRuleBytId(int templateid) {
+        QueryWrapper<SmartTemplateRule> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("template_id", templateid);
+        int result = smartTemplateRuleMapper.delete(queryWrapper2);
+
+        return result;
+    }
+
+    @Override
     public int deleteSmartTemplateRuleById(int id) {
         int result = smartTemplateRuleMapper.deleteById(id);
         return result;
@@ -76,7 +85,7 @@ public class SmartTemplateRuleServiceImpl extends ServiceImpl<SmartTemplateRuleM
 
     @Override
     public List<TemplateRuleVo> queryTemplateRuleByIds(List<Integer> gradeIds, List<Integer> termIds) {
-        List<TemplateRuleVo> result = smartTemplateRuleMapper.queryTemplateRuleByIds(gradeIds,termIds);
+        List<TemplateRuleVo> result = smartTemplateRuleMapper.queryTemplateRuleByIds(gradeIds, termIds);
         return result;
     }