更新成绩相关

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/score/vo/ScoreDataStudentVo.java

@@ -11,6 +11,7 @@ import org.dromara.system.domain.score.bo.ScoreDataDetailBo;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 
@@ -91,6 +92,8 @@ public class ScoreDataStudentVo implements Serializable {
      */
     @ExcelProperty(value = "备注")
     private String remark;
+    private Date createTime;
+
     @TableField(exist = false)
     private List<ScoreDataDetailVo> scoreDataDetailVoList;
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/score/vo/ScoreDataVo.java

@@ -48,6 +48,10 @@ public class ScoreDataVo implements Serializable {
     @ExcelProperty(value = "考试时间")
     //@JsonFormat(pattern = "yyyy-MM-dd")
     private String scoreTime;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
 
     /**
      * 接收班级id

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/score/ScoreDataServiceImpl.java

@@ -134,6 +134,7 @@ public class ScoreDataServiceImpl implements IScoreDataService {
             String percent = "0.00%";
             List<ScoreDataVo> records = result.getRecords();
             for (ScoreDataVo data : records) {
+                percent = "0.00%";
                 //全部人数
                 double chaKanAll = 0D;
                 double chaKanCount = 0D;
@@ -190,6 +191,7 @@ public class ScoreDataServiceImpl implements IScoreDataService {
         if (bo.getScoreClassId() != null) {
             lqw.apply("find_in_set(score_class_id,'" + bo.getScoreClassId() + "')");
         }
+        lqw.orderByDesc(ScoreData::getCreateTime);
         return lqw;
     }
 
@@ -824,24 +826,25 @@ public class ScoreDataServiceImpl implements IScoreDataService {
             Map<String, Object> map = new HashMap<>();
             map.put("stdId", stdId.toString());
             scoreData.setParams(map);
-            //获取查看人数
-            Object chaKanCount = RedisUtils.getCacheObject(SCORE_PEOPLE_CHAKAN_COUNT + scoreId);
-            if (ObjectUtils.isEmpty(chaKanCount)) {
-                RedisUtils.setCacheObject(SCORE_PEOPLE_CHAKAN_COUNT + scoreId, 1);
-            } else {
-                //判断该家长是否查看过
-                Object cacheObject = RedisUtils.getCacheObject(SCORE_PEOPLE_CHAKAN + scoreId + ":" + userId);
-                if (ObjectUtils.isEmpty(cacheObject)) {
-                    RedisUtils.setCacheObject(SCORE_PEOPLE_CHAKAN_COUNT + scoreId, Integer.parseInt(String.valueOf(chaKanCount)) + 1);
-                }
-            }
-            //如果是家长要记录到redis中
-            RedisUtils.setCacheObject(SCORE_PEOPLE_CHAKAN + scoreId + ":" + userId, userId);
             //查询成绩家长查询自己的孩子
-
             //查询考试对应的学生和成绩
             List<ScoreDataStudentVo> scoreDataStudentVos = scoreDataStudentMapper.selectScoreDataForParents(scoreData);
-            scoreDataVo.setScoreDataStudentVoList(scoreDataStudentVos);
+            if (scoreDataStudentVos != null && scoreDataStudentVos.size() >0){
+                //获取查看人数
+                Object chaKanCount = RedisUtils.getCacheObject(SCORE_PEOPLE_CHAKAN_COUNT + scoreId);
+                if (ObjectUtils.isEmpty(chaKanCount)) {
+                    RedisUtils.setCacheObject(SCORE_PEOPLE_CHAKAN_COUNT + scoreId, 1);
+                } else {
+                    //判断该家长是否查看过
+                    Object cacheObject = RedisUtils.getCacheObject(SCORE_PEOPLE_CHAKAN + scoreId + ":" + userId);
+                    if (ObjectUtils.isEmpty(cacheObject)) {
+                        RedisUtils.setCacheObject(SCORE_PEOPLE_CHAKAN_COUNT + scoreId, Integer.parseInt(String.valueOf(chaKanCount)) + 1);
+                    }
+                }
+                //如果是家长要记录到redis中
+                RedisUtils.setCacheObject(SCORE_PEOPLE_CHAKAN + scoreId + ":" + userId, userId);
+                scoreDataVo.setScoreDataStudentVoList(scoreDataStudentVos);
+            }
             return scoreDataVo;
         }
         //查询考试所有的学生和成绩

ruoyi-modules/ruoyi-system/src/main/resources/mapper/score/ScoreDataStudentMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="studentNumber"    column="student_number"    />
         <result property="zongfen"    column="zongfen"    />
         <result property="avg"    column="avg"    />
+        <result property="createTime"    column="create_time"    />
         <collection property="scoreDataDetailVoList"   javaType="java.util.List"           resultMap="ScoreDataDetailResult"   />
     </resultMap>
 
@@ -51,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             b.score_data_name ,
             b.score_data_name_id ,
             b.student_number ,
+            b.create_time,
             d.xueke as sdd_xueke,
             d.score as sdd_score,
             d.score_sort as sdd_score_sort,
@@ -70,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             b.score_data_name ,
             b.score_data_name_id ,
             b.student_number ,
+            b.create_time,
             d.xueke as sdd_xueke,
             d.score as sdd_score,
             d.score_data_name as sdd_score_data_name