新增平时成绩和期末成绩列表

distributed-print/src/main/java/com/qmth/distributed/print/api/TCFinalScoreController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.excel.ExcelField;
 import com.qmth.distributed.print.business.bean.result.EditResult;
+import com.qmth.distributed.print.business.entity.TCFinalScore;
 import com.qmth.distributed.print.business.service.PrintCommonService;
 import com.qmth.distributed.print.business.service.TCFinalScoreService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
@@ -16,16 +17,20 @@ import com.qmth.teachcloud.mark.service.MarkQuestionService;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -38,6 +43,7 @@ import java.util.List;
 @Api(tags = "课程目标达成度-成绩管理-期末考试成绩Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_COURSE_DEGREE)
+@Validated
 public class TCFinalScoreController {
     private final static Logger log = LoggerFactory.getLogger(TCFinalScoreController.class);
 
@@ -91,7 +97,7 @@ public class TCFinalScoreController {
     @ApiOperation(value = "期末成绩列表")
     @RequestMapping(value = "/final_score/list", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.SEARCH)
-    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = EditResult.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = TCFinalScore.class)})
     public Object finalScoreList(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
                                  @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
                                  @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber,
@@ -103,18 +109,19 @@ public class TCFinalScoreController {
     @ApiOperation(value = "期末成绩编辑")
     @RequestMapping(value = "/final_score/edit", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
-    @ApiResponses({@ApiResponse(code = 200, message = "编辑", response = EditResult.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "编辑", response = TCFinalScore.class)})
     public Object finalScoreEdit(@ApiParam(value = "主键", required = true) @RequestParam Long id) throws IOException {
-        return ResultUtil.ok(true);
+        TCFinalScore tcFinalScore = tcFinalScoreService.getById(id);
+        Objects.requireNonNull(tcFinalScore, "未找到期末成绩信息");
+        return ResultUtil.ok(tcFinalScoreService.getById(id));
     }
 
     @ApiOperation(value = "期末成绩保存")
     @RequestMapping(value = "/final_score/save", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
     @ApiResponses({@ApiResponse(code = 200, message = "保存", response = EditResult.class)})
-    public Object finalScoreSave(@ApiParam(value = "主键", required = true) @RequestParam Long id,
-                                 @ApiParam(value = "期末成绩", required = true) @RequestParam Double score,
-                                 @ApiParam(value = "期末成绩明细", required = true) @RequestParam String scoreDetail) throws IOException {
+    @Transactional
+    public Object finalScoreSave(@ApiParam(value = "期末考试成绩信息", required = true) @Valid @RequestBody TCFinalScore tcFinalScore) throws IOException {
         return ResultUtil.ok(true);
     }
 
@@ -122,15 +129,20 @@ public class TCFinalScoreController {
     @RequestMapping(value = "/final_score/enable", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
     @ApiResponses({@ApiResponse(code = 200, message = "编辑", response = EditResult.class)})
+    @Transactional
     public Object finalScoreEnable(@ApiParam(value = "主键", required = true) @RequestParam Long id,
                                    @ApiParam(value = "启用/禁用", required = true) @RequestParam Boolean enable) throws IOException {
-        return ResultUtil.ok(true);
+        TCFinalScore tcFinalScore = tcFinalScoreService.getById(id);
+        Objects.requireNonNull(tcFinalScore, "未找到期末成绩信息");
+        tcFinalScore.setEnable(enable);
+        return ResultUtil.ok(tcFinalScoreService.updateById(tcFinalScore));
     }
 
     @ApiOperation(value = "期末成绩试卷蓝图保存")
     @RequestMapping(value = "/final_score/paper_struct/save", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
     @ApiResponses({@ApiResponse(code = 200, message = "试卷蓝图保存", response = Object.class)})
+    @Transactional
     public Object finalScorePaperStructSave(@ApiParam(value = "试卷蓝图结构", required = true) @RequestBody Object body) throws IOException {
         return ResultUtil.ok(true);
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/TCUsualScoreController.java

@@ -5,6 +5,7 @@ import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.excel.ExcelField;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.bean.result.ScoreResult;
+import com.qmth.distributed.print.business.entity.TCUsualScore;
 import com.qmth.distributed.print.business.service.PrintCommonService;
 import com.qmth.distributed.print.business.service.TCUsualScoreService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
@@ -14,18 +15,19 @@ import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -38,6 +40,7 @@ import java.util.List;
 @Api(tags = "课程目标达成度-成绩管理-平常作业成绩Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_COURSE_DEGREE)
+@Validated
 public class TCUsualScoreController {
     private final static Logger log = LoggerFactory.getLogger(TCUsualScoreController.class);
 
@@ -92,7 +95,7 @@ public class TCUsualScoreController {
     @ApiOperation(value = "平时成绩列表")
     @RequestMapping(value = "/usual_score/list", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.SEARCH)
-    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = EditResult.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = TCUsualScore.class)})
     public Object usualScoreList(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
                                  @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
                                  @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber,
@@ -104,17 +107,19 @@ public class TCUsualScoreController {
     @ApiOperation(value = "平时成绩编辑")
     @RequestMapping(value = "/usual_score/edit", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
-    @ApiResponses({@ApiResponse(code = 200, message = "编辑", response = EditResult.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "编辑", response = TCUsualScore.class)})
     public Object usualScoreEdit(@ApiParam(value = "主键", required = true) @RequestParam Long id) throws IOException {
-        return ResultUtil.ok(true);
+        TCUsualScore tcUsualScore = tcUsualScoreService.getById(id);
+        Objects.requireNonNull(tcUsualScore, "未找到平时成绩信息");
+        return ResultUtil.ok(tcUsualScore);
     }
 
     @ApiOperation(value = "平时成绩保存")
     @RequestMapping(value = "/usual_score/save", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
     @ApiResponses({@ApiResponse(code = 200, message = "保存", response = EditResult.class)})
-    public Object usualScoreSave(@ApiParam(value = "主键", required = true) @RequestParam Long id,
-                                 @ApiParam(value = "平时成绩json", required = true) @RequestParam String socreNormal) throws IOException {
+    @Transactional
+    public Object usualScoreSave(@ApiParam(value = "平时成绩信息", required = true) @Valid @RequestBody TCUsualScore tcUsualScore) throws IOException {
         return ResultUtil.ok(true);
     }
 
@@ -122,8 +127,12 @@ public class TCUsualScoreController {
     @RequestMapping(value = "/usual_score/enable", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
     @ApiResponses({@ApiResponse(code = 200, message = "编辑", response = EditResult.class)})
+    @Transactional
     public Object usualScoreEnable(@ApiParam(value = "主键", required = true) @RequestParam Long id,
                                    @ApiParam(value = "启用/禁用", required = true) @RequestParam Boolean enable) throws IOException {
-        return ResultUtil.ok(true);
+        TCUsualScore tcUsualScore = tcUsualScoreService.getById(id);
+        Objects.requireNonNull(tcUsualScore, "未找到平时成绩信息");
+        tcUsualScore.setEnable(enable);
+        return ResultUtil.ok(tcUsualScoreService.updateById(tcUsualScore));
     }
 }