修改學時審核

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -213,6 +213,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                                 userPeriodQueryBo.setUserId(classPeriodSectionVo.getUserId());
                                 userPeriodQueryBo.setChapterId(classPeriodChapterVo.getId());
                                 userPeriodQueryBo.setModuleId(classPeriodVo.getId());
+                                userPeriodQueryBo.setGradeId(classPeriodVo.getGradeId());
                                 List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
                                 if (!CollectionUtils.isEmpty(userPeriodStatusVos)) {
                                     int numIndex = userPeriodStatusVos.size() - 1;
@@ -241,6 +242,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                                 userPeriodQueryBo.setUserId(classPeriodSectionVo.getUserId());
                                 userPeriodQueryBo.setChapterId(classPeriodChapterVo.getId());
                                 userPeriodQueryBo.setModuleId(classPeriodVo.getId());
+                                userPeriodQueryBo.setGradeId(classPeriodVo.getGradeId());
                                 List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
                                 if (!CollectionUtils.isEmpty(userPeriodStatusVos)) {
                                     int numIndex = userPeriodStatusVos.size() - 1;
@@ -279,6 +281,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     userPeriodQueryBo.setUserId(classPeriodSectionVo.getUserId());
                     userPeriodQueryBo.setChapterId(classPeriodVo.getId());
                     userPeriodQueryBo.setModuleId(0L);
+                    userPeriodQueryBo.setGradeId(classPeriodVo.getGradeId());
                     List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
                     if (!CollectionUtils.isEmpty(userPeriodStatusVos)){
                         int numIndex = userPeriodStatusVos.size() - 1;
@@ -309,6 +312,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     userPeriodQueryBo.setUserId(classPeriodSectionVo.getUserId());
                     userPeriodQueryBo.setChapterId(classPeriodVo.getId());
                     userPeriodQueryBo.setModuleId(0L);
+                    userPeriodQueryBo.setGradeId(classPeriodVo.getGradeId());
                     List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
                     if (!CollectionUtils.isEmpty(userPeriodStatusVos)) {
                         int numIndex = userPeriodStatusVos.size() - 1;
@@ -341,6 +345,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 userPeriodQueryBo.setUserId(classPeriodVo.getUserId());
                 userPeriodQueryBo.setChapterId(0L);
                 userPeriodQueryBo.setModuleId(0L);
+                userPeriodQueryBo.setGradeId(classPeriodVo.getGradeId());
                 List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
                 if (!CollectionUtils.isEmpty(userPeriodStatusVos)){
                     int numIndex = userPeriodStatusVos.size() - 1;

zhongzheng-system/src/main/resources/mapper/modules/grade/UserPeriodStatusMapper.xml

@@ -47,6 +47,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="goodsId != null and goodsId != ''">
             and up.goods_id = #{goodsId}
         </if>
+        <if test="gradeId != null and gradeId != ''">
+            and up.grade_id = #{gradeId}
+        </if>
+
         <if test="userId != null and userId != ''">
             and up.user_id = #{userId}
         </if>