综合评价 教师

src/main/java/com/template/controller/SmartEvaluateTeacherController.java

@@ -57,15 +57,15 @@ public class SmartEvaluateTeacherController implements SmartEvaluateTeacherContr
             return CommonResult.errorMsg("参数格式错误");
         }
         List<SmartScoreManageList> allList = simpleScoreLists.getSimpleScoreList();
-        List<String> mainScoreItems = allList.stream().filter(e -> e.getDeleted() == 0).map(m -> m.getTerm() + m.getScoreItem()).collect(Collectors.toList());
+        List<String> mainScoreItems = allList.stream().filter(e -> e.getDeleted() == 0).map(m -> m.getTermId() + m.getScoreItem()).collect(Collectors.toList());
         Set<String> mainScoreSet = new HashSet<>(mainScoreItems);
         if (mainScoreItems.size() != mainScoreSet.size()) {
             return CommonResult.fail("存在重复主项");
         }
-        String term = allList.get(0).getTerm();
+        Integer term = allList.get(0).getTermId();
         QueryWrapper<SmartEvaluateTdetail> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("deleted", 0);
-        queryWrapper1.eq("term", term);
+        queryWrapper1.eq("term_id", term);
         List<SmartEvaluateTdetail> smartEvaluateTdetails = smartEvaluateTdetailService.getEvaluateTdetailByKey(queryWrapper1);
         if (smartEvaluateTdetails.size() > 0) {
             return CommonResult.fail("该学期已评分，不可再操作");
@@ -78,7 +78,7 @@ public class SmartEvaluateTeacherController implements SmartEvaluateTeacherContr
                 allList.get(i).setId((int) UUIDUtil.generateID());
             }
             mainScoreManage.setId(allList.get(i).getId());
-            mainScoreManage.setTerm(term);
+            mainScoreManage.setTermId(term);
             mainScoreManage.setScoreItem(allList.get(i).getScoreItem());
             mainScoreManage.setParentId(allList.get(i).getParentId());
             mainScoreManage.setDeleted(allList.get(i).getDeleted());
@@ -94,7 +94,7 @@ public class SmartEvaluateTeacherController implements SmartEvaluateTeacherContr
                     childList.get(j).setId((int) UUIDUtil.generateID());
                 }
                 childScoreManage.setId(childList.get(j).getId());
-                childScoreManage.setTerm(term);
+                childScoreManage.setTermId(term);
                 childScoreManage.setScoreItem(childList.get(j).getScoreItem());
                 childScoreManage.setParentId(allList.get(i).getId());
                 childScoreManage.setScoreNum(childList.get(j).getScoreNum());

src/main/java/com/template/model/evaluate/teacher/SmartScoreManageList.java

@@ -21,6 +21,9 @@ public class SmartScoreManageList {
     @ApiModelProperty(value = "学期")
     public String term;
 
+    @ApiModelProperty(value = "学期ID")
+    public Integer termId;
+
     @ApiModelProperty(value = "评分项")
     public String scoreItem;
 

src/main/java/com/template/model/request/operateScoreRequest.java

@@ -0,0 +1,43 @@
+package com.template.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-12-04
+ */
+@Data
+public class operateScoreRequest {
+
+    /**
+     * 数据ID
+     */
+    @NotNull(message = "数据ID不能为空")
+    private Integer id;
+
+    /**
+     * 评分子项
+     */
+    @NotBlank(message = "评分子项不能为空")
+    private String scoreItem;
+
+    /**
+     * 分值
+     */
+    @NotNull(message = "分值不能为空")
+    private Double scoreNum;
+
+    /**
+     * 删除标记
+     */
+    @NotNull(message = "删除标记不能为空")
+    private Integer deleted;
+
+}

src/main/java/com/template/services/impl/SmartScoreManageServiceImpl.java

@@ -98,6 +98,7 @@ public class SmartScoreManageServiceImpl extends ServiceImpl<SmartScoreManageMap
             SmartScoreManageList mainScoreManageList = new SmartScoreManageList();
             mainScoreManageList.setId(mainScore.get(i).getId());
             mainScoreManageList.setTerm(mainScore.get(i).getTerm());
+            mainScoreManageList.setTermId(mainScore.get(i).getTermId());
             mainScoreManageList.setParentId(mainScore.get(i).getParentId());
             mainScoreManageList.setScoreItem(mainScore.get(i).getScoreItem());
             mainScoreManageList.setScoreNum(mainScore.get(i).getScoreNum());
@@ -111,6 +112,7 @@ public class SmartScoreManageServiceImpl extends ServiceImpl<SmartScoreManageMap
                 SmartScoreManageList cs = new SmartScoreManageList();
                 cs.setId(childScore.get(j).getId());
                 cs.setTerm(childScore.get(j).getTerm());
+                cs.setTermId(childScore.get(j).getTermId());
                 cs.setParentId(childScore.get(j).getParentId());
                 cs.setScoreItem(childScore.get(j).getScoreItem());
                 cs.setScoreNum(childScore.get(j).getScoreNum());