更新成绩统计问题

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/score/ScoreDataController.java

@@ -86,7 +86,7 @@ public class ScoreDataController extends BaseController {
      *
      * @param scoreId 主键
      */
-    @SaCheckPermission("score:data:query")
+    //@SaCheckPermission("score:data:query")
     @GetMapping("/{scoreId}")
     public R<ScoreDataVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long scoreId) {

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/score/ScoreDataStudentMapper.java

@@ -30,7 +30,7 @@ public interface ScoreDataStudentMapper extends BaseMapperPlus<ScoreDataStudent,
     public List<ScoreDataStudentVo> selectScoreDataByScoreClassId(String scoreClassId);
     @InterceptorIgnore(tenantLine = "true")
 
-    public List<ScoreDataStudentVo> selectScoreDataForParents(Long scoreId);
+    public List<ScoreDataStudentVo> selectScoreDataForParents(ScoreData scoreData);
     @InterceptorIgnore(tenantLine = "true")
     public List<ScoreDataStudentVo> selectScoreByScoreId(Long scoreId);
     public List<ScoreDataStudentVo> selectScoreByScoreIds(long[] scoreIds);

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/record/RecordLeaveServiceImpl.java

@@ -141,6 +141,7 @@ public class RecordLeaveServiceImpl implements IRecordLeaveService {
     public Boolean insertByBo(RecordLeaveBo bo) {
         RecordLeave add = MapstructUtils.convert(bo, RecordLeave.class);
         validEntityBeforeSave(add);
+        add.setDeptId(LoginHelper.getDeptId());
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setRecordId(add.getRecordId());

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

@@ -181,7 +181,9 @@ public class ScoreDataServiceImpl implements IScoreDataService {
         lqw.like(StringUtils.isNotBlank(bo.getScoreClassName()), ScoreData::getScoreClassName, bo.getScoreClassName());
         lqw.eq(StringUtils.isNotBlank(bo.getPrivacyType()), ScoreData::getPrivacyType, bo.getPrivacyType());
         lqw.eq(StringUtils.isNotBlank(bo.getAvg()), ScoreData::getAvg, bo.getAvg());
-        lqw.apply("find_in_set(score_class_id,'"+bo.getScoreClassId()+"')");
+        if (bo.getScoreClassId() != null){
+            lqw.apply("find_in_set(score_class_id,'"+bo.getScoreClassId()+"')");
+        }
         return lqw;
     }
 
@@ -789,7 +791,7 @@ public class ScoreDataServiceImpl implements IScoreDataService {
             //查询成绩家长查询自己的孩子
 
             //查询考试对应的学生和成绩
-            List<ScoreDataStudentVo> scoreDataStudentVos = scoreDataStudentMapper.selectScoreDataForParents(scoreData.getScoreId());
+            List<ScoreDataStudentVo> scoreDataStudentVos = scoreDataStudentMapper.selectScoreDataForParents(scoreData);
             scoreDataVo.setScoreDataStudentVoList(scoreDataStudentVos);
             return scoreDataVo;
         }

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

@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="selectScoreDataForParents" parameterType="Long" resultMap="ScoreDataStudentResult">
+    <select id="selectScoreDataForParents" parameterType="org.dromara.system.domain.score.ScoreData" resultMap="ScoreDataStudentResult">
         SELECT
             b.zongfen ,
             b.score_sort ,
@@ -118,8 +118,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        ( SELECT
         dd.score_data_name ,
         dd.score_data_name_id,
-        dd.xueke as sdd_xueke,
-        dd.score as sdd_score
+        dd.xueke as xueke,
+        dd.score as score
         FROM
         score_data_detail dd
         WHERE

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/FormalParentsStudentMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.system.mapper.FormalParentsStudentMapper">
-    <resultMap type="org.dromara.system.domain.vo.FormalParentsStudentVo" id="FormalParentsStudentResult">
+    <resultMap type="org.dromara.system.domain.FormalParentsStudent" id="FormalParentsStudentResult">
         <result property="id"    column="id"    />
         <result property="parentsId"    column="parents_id"    />
         <result property="schoolId"    column="school_id"    />
@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, parents_id, school_id, school_name, class_id, class_name, student_name, student_number, create_by, create_time, update_by, update_time, remark from formal_parents_student
     </sql>
 
-    <select id="selectFormalParentsStudentList" parameterType="FormalParentsStudent" resultMap="FormalParentsStudentResult">
+    <select id="selectFormalParentsStudentList" parameterType="org.dromara.system.domain.FormalParentsStudent" resultMap="FormalParentsStudentResult">
         <include refid="selectFormalParentsStudentVo"/>
         <where>
             <if test="parentsId != null  and parentsId != ''"> and parents_id = #{parentsId}</if>
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where parents_id =  #{parentsId}
     </select>
 
-    <insert id="insertFormalParentsStudent" parameterType="FormalParentsStudent" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertFormalParentsStudent" parameterType="org.dromara.system.domain.FormalParentsStudent" useGeneratedKeys="true" keyProperty="id">
         insert into formal_parents_student
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="parentsId != null">parents_id,</if>
@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
     </insert>
 
-    <update id="updateFormalParentsStudent" parameterType="FormalParentsStudent">
+    <update id="updateFormalParentsStudent" parameterType="org.dromara.system.domain.FormalParentsStudent">
         update formal_parents_student
         <trim prefix="SET" suffixOverrides=",">
             <if test="parentsId != null">parents_id = #{parentsId},</if>