Merge remote-tracking branch 'origin/master'

school-paper/src/main/java/com/ruoyi/school/paper/controller/DbTestPaperRecordController.java

@@ -12,6 +12,7 @@ import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.school.paper.domain.DbTestPaperRecord;
 import com.ruoyi.school.paper.domain.bo.DbTestPaperBo;
 import com.ruoyi.school.paper.domain.bo.DbTestPaperRecordBo;
 import com.ruoyi.school.paper.domain.vo.DbTestPaperRecordVo;
@@ -60,6 +61,14 @@ public class DbTestPaperRecordController extends BaseController {
     }
 
     /**
+     * 【PC】 完成批卷完成批卷
+     */
+    @PostMapping("/completeReadOver")
+    public R<Void> completeReadOver(DbTestPaperRecordBo bo) {
+        return iDbTestPaperRecordService.completeReadOver(bo);
+    }
+
+    /**
      * 【小程序】查询答题记录列表
      */
     @GetMapping("/testPaperlist")

school-paper/src/main/java/com/ruoyi/school/paper/controller/DbTestPaperRecordDetailController.java

@@ -97,7 +97,7 @@ public class DbTestPaperRecordDetailController extends BaseController {
     }
 
     /**
-     * 修改答题记录详情
+     * [PC]修改答题记录详情
      */
     @Log(title = "答题记录详情", businessType = BusinessType.UPDATE)
     @RepeatSubmit()

school-paper/src/main/java/com/ruoyi/school/paper/domain/DbTestPaperRecord.java

@@ -7,6 +7,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+
 /**
  * 答题记录对象 db_test_paper_record
  *
@@ -46,7 +48,7 @@ public class DbTestPaperRecord extends BaseEntity {
     /**
      * 总得分
      */
-    private Long totalPoints;
+    private BigDecimal totalPoints;
     /**
      * 备注
      */

school-paper/src/main/java/com/ruoyi/school/paper/domain/bo/DbTestPaperRecordBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import javax.validation.constraints.*;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import com.ruoyi.common.core.domain.BaseEntity;
@@ -49,7 +50,7 @@ public class DbTestPaperRecordBo extends BaseEntity {
      * 总得分
      */
     @NotNull(message = "总得分不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long totalPoints;
+    private BigDecimal totalPoints;
 
     /**
      * 备注

school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/DbTestPaperRecordVo.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
+import java.math.BigDecimal;
 
 
 /**
@@ -47,7 +48,7 @@ public class DbTestPaperRecordVo {
      * 总得分
      */
     @ExcelProperty(value = "总得分")
-    private Long totalPoints;
+    private BigDecimal totalPoints;
 
     /**
      * 备注

school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/DbTestPaperVo.java

@@ -86,4 +86,8 @@ public class DbTestPaperVo {
      * 用户id
      */
     private Long userId;
+    /**
+     * 答题记录id
+     */
+    private Long recordId;
 }

school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/GoodsAnswersVo.java

@@ -13,5 +13,7 @@ public class GoodsAnswersVo {
 
     private String nickName;
 
+    private String goodsAnswerPic;
+
     private Long count;
 }

school-paper/src/main/java/com/ruoyi/school/paper/mapper/DbTestPaperRecordDetailMapper.java

@@ -11,6 +11,8 @@ import com.ruoyi.school.paper.domain.vo.MyErrorTopicListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
+
 /**
  * 答题记录详情Mapper接口
  *
@@ -23,4 +25,6 @@ public interface DbTestPaperRecordDetailMapper extends BaseMapperPlus<DbTestPape
     Page<MyErrorTopicListVo> queryPageList(Page<Object> build, @Param("bo") DbTestPaperRecordDetailBo bo);
 
     Page<GoodsAnswersVo> getGoodsAnserList(Page<Object> build, @Param("bo") DbTestPaperRecordDetailBo bo);
+
+    BigDecimal getTotalPoints(@Param("bo") DbTestPaperRecordBo bo);
 }

school-paper/src/main/java/com/ruoyi/school/paper/service/IDbTestPaperRecordService.java

@@ -2,6 +2,7 @@ package com.ruoyi.school.paper.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.school.paper.domain.DbTestPaperRecord;
 import com.ruoyi.school.paper.domain.bo.DbTestPaperBo;
@@ -69,4 +70,9 @@ public interface IDbTestPaperRecordService {
      * 【PC】 审批阅卷班级列表
      */
     TableDataInfo<DbTestPaperVo> getClassList(DbTestPaperBo bo, PageQuery pageQuery);
+
+    /**
+     * 完成批卷
+     */
+    R<Void> completeReadOver(DbTestPaperRecordBo bo);
 }

school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbTestPaperRecordServiceImpl.java

@@ -6,17 +6,20 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.school.paper.domain.DbTestPaperRecord;
 import com.ruoyi.school.paper.domain.bo.DbTestPaperBo;
 import com.ruoyi.school.paper.domain.bo.DbTestPaperRecordBo;
 import com.ruoyi.school.paper.domain.vo.DbTestPaperRecordVo;
 import com.ruoyi.school.paper.domain.vo.DbTestPaperVo;
+import com.ruoyi.school.paper.mapper.DbTestPaperRecordDetailMapper;
 import com.ruoyi.school.paper.mapper.DbTestPaperRecordMapper;
 import com.ruoyi.school.paper.service.IDbTestPaperRecordService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -32,6 +35,7 @@ import java.util.Map;
 public class DbTestPaperRecordServiceImpl implements IDbTestPaperRecordService {
 
     private final DbTestPaperRecordMapper baseMapper;
+    private final DbTestPaperRecordDetailMapper recordDetailMapper;
 
     /**
      * 查询答题记录
@@ -153,4 +157,20 @@ public class DbTestPaperRecordServiceImpl implements IDbTestPaperRecordService {
         Page<DbTestPaperVo> result = baseMapper.getClassList(pageQuery.build(), bo);
         return TableDataInfo.build(result);
     }
+
+    /**
+     * 完成批卷
+     */
+    @Override
+    public R<Void> completeReadOver(DbTestPaperRecordBo bo) {
+        BigDecimal totalPoints = recordDetailMapper.getTotalPoints(bo);
+        DbTestPaperRecord record = baseMapper.selectById(bo.getId());
+        record.setTotalPoints(totalPoints);
+        record.setStatus(3);
+        int update = baseMapper.updateById(record);
+        if (update > 0){
+            return R.ok();
+        }
+        return R.fail();
+    }
 }

school-paper/src/main/resources/mapper/school-paper/DbTestPaperRecordDetailMapper.xml

@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="queryPageList" resultMap="TestPaperRecordDetailResult">
         SELECT
+            dtprd.id,
             dqbatp.topic,
             dtprd.record_id,
             dtprd.question_bank_id,
@@ -73,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getGoodsAnserList" resultType="com.ruoyi.school.paper.domain.vo.GoodsAnswersVo">
         SELECT
         a.answer as goods_answer,
+        a.answers_pic as goodsAnswerPic,
         su.nick_name
         FROM
         db_test_paper_record_detail a
@@ -83,5 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND good = 0 and a.record_id = #{bo.recordId}
     </select>
 
-
+    <select id="getTotalPoints" resultType="java.math.BigDecimal">
+        select sum(score) from db_test_paper_record_detail where record_id = #{bo.id} and `status` = 0
+    </select>
 </mapper>

school-paper/src/main/resources/mapper/school-paper/DbTestPaperRecordMapper.xml

@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getClassList" resultType="com.ruoyi.school.paper.domain.vo.DbTestPaperVo">
-        select dtpr.id,
+        select dtpr.id as recordId,
                SU.user_id,
                su.nick_name,
                dtp.total_points,