学生成绩录入

src/main/java/com/xjrsoft/module/xycxedu/controller/ExamSubjectScoreEnterController.java

@@ -1,9 +1,11 @@
 package com.xjrsoft.module.xycxedu.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.support.ExcelTypeEnum;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.model.result.RT;
@@ -57,13 +59,17 @@ import java.util.List;
 public class ExamSubjectScoreEnterController {
 
     private final IExamSubjectScoreEnterService enterService;
-
+    private final IExamSubjectScoreService scoreService;
     private final IBaseClassService classService;
 
     @GetMapping(value = "/page")
     @ApiOperation(value="成绩录入列表(分页)")
     @SaCheckPermission("examsubjectscoreenter:detail")
     public RT<PageOutput<ExamSubjectScoreEnterPageVo>> page(@Valid ExamSubjectScoreEnterPageDto dto){
+        List<String> roleList = StpUtil.getRoleList();
+        if(!roleList.contains("soceManage")){
+            dto.setCreateUserId(StpUtil.getLoginIdAsLong());
+        }
 
         Page<ExamSubjectScoreEnterPageVo> page = enterService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<ExamSubjectScoreEnterPageVo> pageOutput = ConventPage.getPageOutput(page, ExamSubjectScoreEnterPageVo.class);
@@ -110,8 +116,8 @@ public class ExamSubjectScoreEnterController {
     @ApiOperation(value = "删除成绩录入")
     @SaCheckPermission("examsubjectscoreenter:delete")
     public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        scoreService.remove(new QueryWrapper<ExamSubjectScore>().lambda().in(ExamSubjectScore::getExamSubjectScoreEnterId, ids));
         return RT.ok(enterService.removeBatchByIds(ids));
-
     }
     @PostMapping("/import")
     @ApiOperation(value = "导入")

src/main/java/com/xjrsoft/module/xycxedu/dto/ExamSubjectScoreEnterPageDto.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.xycxedu.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,4 +28,8 @@ public class ExamSubjectScoreEnterPageDto extends PageInput {
 
     @ApiModelProperty("考试计划")
     private String examPlanName;
+
+    @JsonIgnore
+    @ApiModelProperty("学期")
+    private Long createUserId;
 }

src/main/resources/mapper/xycxedu/ExamSubjectScoreEnterMappper.xml

@@ -14,6 +14,9 @@
         <if test="dto.semesterId != null">
             and t2.id = #{dto.semesterId}
         </if>
+        <if test="dto.createUserId != null">
+            and t1.create_user_id = #{dto.createUserId}
+        </if>
         <if test="dto.examPlanName != null and dto.examPlanName != ''">
             and t3.name like concat('%', #{dto.examPlanName}, '%')
         </if>