fix 选班

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -250,11 +250,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         validEntityBeforeUpdate(update);
         update.setUpdateTime(DateUtils.getNowTime());
         UserUpdateAddBo userUpdateAddBo = new UserUpdateAddBo();
-        userUpdateAddBo.setUserId(bo.getUserId());
+
         if (!StringUtils.isBlank(update.getRealname())){
+            userUpdateAddBo.setUserId(bo.getUserId());
             userUpdateAddBo.setRealname(update.getRealname());
         }
         if (!StringUtils.isBlank(update.getTelphone())){
+            userUpdateAddBo.setUserId(bo.getUserId());
             userUpdateAddBo.setTelphone(update.getTelphone());
         }
         if (!StringUtils.isBlank(update.getIdCard())){
@@ -262,6 +264,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
            if (list > 0){
                throw new IllegalAccessException("身份证已经被使用注册为学员");
            }
+            userUpdateAddBo.setUserId(bo.getUserId());
             userUpdateAddBo.setIdCard(update.getIdCard());
         }
         if (userUpdateAddBo != null) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseChapterSectionMapper.java

@@ -31,4 +31,7 @@ public interface CourseChapterSectionMapper extends BaseMapper<CourseChapterSect
 
     Integer learningCheck(@Param("typeId") Long typeId,@Param("gradeId") Long gradeId,
                           @Param("userId") Long userId,@Param("moduleId") Long moduleId,@Param("chapterId") Long chapterId,@Param("examId") Long examId);
+
+    Integer auditCheck(@Param("typeId") Long typeId,@Param("gradeId") Long gradeId,
+                       @Param("userId") Long userId,@Param("moduleId") Long moduleId,@Param("chapterId") Long chapterId,@Param("examId") Long examId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseMenuMapper.java

@@ -28,4 +28,6 @@ public interface CourseMenuMapper extends BaseMapper<CourseMenu> {
     Integer rebuildModuleCheck(@Param("moduleId")Long id,@Param("gradeId") Long gradeId,@Param("userId") Long userId);
 
     Integer learningCheck(@Param("sectionId") Long id,@Param("gradeId") Long gradeId,@Param("userId")Long userId);
+
+    Integer auditCheck(@Param("sectionId") Long id,@Param("gradeId") Long gradeId,@Param("userId")Long userId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseChapterSectionServiceImpl.java

@@ -145,6 +145,10 @@ public class CourseChapterSectionServiceImpl extends ServiceImpl<CourseChapterSe
                     if (rebuild > 0) {
                         courseMenuVo.setRebuild(1);
                     }
+                    Integer audit = baseMapper.auditCheck(courseMenuVo.getTypeId(), courseMenuVo.getGradeId(), bo.getUserId(), bo.getModuleId(), bo.getChapterId(), 0L);
+                    if (audit > 0) {
+                        courseMenuVo.setAudit(1L);
+                    }
                     Integer learning = baseMapper.learningCheck(courseMenuVo.getTypeId(), courseMenuVo.getGradeId(), bo.getUserId(), bo.getModuleId(), bo.getChapterId(), 0L);
                     if (learning > 0) {
                         courseMenuVo.setLearning(1L);
@@ -154,6 +158,10 @@ public class CourseChapterSectionServiceImpl extends ServiceImpl<CourseChapterSe
                     if (rebuild > 0) {
                         courseMenuVo.setRebuild(1);
                     }
+                    Integer audit = baseMapper.auditCheck(0L, courseMenuVo.getGradeId(), bo.getUserId(), bo.getModuleId(), bo.getChapterId(), courseMenuVo.getTypeId());
+                    if (rebuild > 0) {
+                        courseMenuVo.setAudit(1L);
+                    }
                     Integer learning = baseMapper.learningCheck(0L, courseMenuVo.getGradeId(), bo.getUserId(), bo.getModuleId(), bo.getChapterId(), courseMenuVo.getTypeId());
                     if (learning > 0) {
                         courseMenuVo.setLearning(1L);

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseMenuServiceImpl.java

@@ -179,6 +179,10 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
                     if (rebuild > 0) {
                         courseMenuVo.setRebuild(1);
                     }
+                    Integer audit = baseMapper.auditCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId());
+                    if (audit > 0) {
+                        courseMenuVo.setAudit(1L);
+                    }
                     Integer learning = baseMapper.learningCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId());
                     if (learning > 0) {
                         courseMenuVo.setLearning(1L);

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseUserChapterSectionVo.java

@@ -101,6 +101,9 @@ public class CourseUserChapterSectionVo {
 	@ApiModelProperty("1已学习")
 	private Long learning;
 
+	@ApiModelProperty("1审核已通过")
+	private Long audit;
+
 	@ApiModelProperty("直播url地址")
 	private String liveUrl;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseUserMenuVo.java

@@ -75,6 +75,9 @@ public class CourseUserMenuVo {
 
 	@ApiModelProperty("直播url地址")
 	private String liveUrl;
+
+	@ApiModelProperty("1审核已通过")
+	private Long audit;
 	/** 章模块关系 */
 	@Excel(name = "章模块关系")
 	@ApiModelProperty("章模块关系")

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodStudentVo.java

@@ -70,7 +70,7 @@ public class ClassPeriodStudentVo {
 	private Long classHours;
 
 	/** 学时审批状态 0 未通过 1通过 */
-	@ApiModelProperty("学时审批状态 0 未通过 1通过")
+	@ApiModelProperty("学时审批状态 0 未通过 1通过 2待审核 -1 不可审核")
 	private Long periodStatus;
 
 	/** 结业状态 0 未结业 1结业 */

zhongzheng-system/src/main/resources/mapper/modules/course/CourseChapterSectionMapper.xml

@@ -188,4 +188,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND ups.period_status =1
           and ups.record_end_time is not null
     </select>
+
+    <select id="auditCheck" parameterType="map"  resultType="integer">
+        SELECT
+            COUNT(up.id)
+        FROM
+            user_period up
+                LEFT JOIN user_period_status ups ON up.id = ups.period_id
+        WHERE
+            up.grade_id =#{gradeId}
+          AND up.user_id = #{userId}
+          AND up.module_id= #{moduleId}
+          and up.chapter_id=#{chapterId}
+          and up.section_id=#{typeId}
+          and up.exam_id=#{examId}
+          AND ups.period_status =1
+          and ups.`status` = 1
+    </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMenuMapper.xml

@@ -162,6 +162,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and (ups.`status` = 0 or ups.`status` = 3)
     </select>
 
+    <select id="auditCheck" parameterType="map"  resultType="Integer">
+        SELECT
+            COUNT(up.id)
+        FROM
+            user_period up
+                LEFT JOIN user_period_status ups ON up.id = ups.period_id
+        WHERE
+            up.grade_id =#{gradeId}
+          AND up.user_id = #{userId}
+          AND up.module_id= 0
+          and up.chapter_id=0
+          and up.section_id=#{sectionId}
+          AND ups.period_status =1
+          and ups.`status` = 1
+    </select>
+
     <select id="rebuildChapterCheck" parameterType="map"  resultType="Integer">
         SELECT
             COUNT(up.id)

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

@@ -130,6 +130,7 @@
         <result property="typeName" column="type_name"/>
         <result property="realName" column="realname"/>
         <result property="classHours" column="class_hours"/>
+        <result property="durationTime" column="duration_time"/>
         <result property="studyStartTime" column="study_start_time"/>
         <result property="status" column="status"/>
         <result property="auditTime" column="audit_time"/>
@@ -615,6 +616,7 @@
         and u.user_id = #{userId}
     </if>  ) AS user_id,
         cs.NAME AS type_name,
+        cs.duration_time,
         NULL AS class_hours,
         3 AS type
         FROM