待审核列表

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/vo/UserProfileVo.java

@@ -46,9 +46,9 @@ public class UserProfileVo {
 	@Excel(name = "商品ID")
 	@ApiModelProperty("商品ID")
 	private Long goodsId;
-	/** 审核状态  1通过 0不通过 2待审 */
-	@Excel(name = "审核状态  1通过 0不通过 2待审")
-	@ApiModelProperty("审核状态  1通过 0不通过 2待审")
+	/** 审核状态  1通过 3不通过 2待审 */
+	@Excel(name = "审核状态  1通过 3不通过 2待审")
+	@ApiModelProperty("审核状态  1通过 3不通过 2待审")
 	private Integer status;
 	/** 第一次提交时间 */
 	@Excel(name = "第一次提交时间")

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

@@ -30,11 +30,11 @@ public interface CourseChapterSectionMapper extends BaseMapper<CourseChapterSect
                          @Param("userId") Long userId,@Param("moduleId") Long moduleId,@Param("chapterId") Long chapterId,@Param("examId") Long examId);
 
     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);
+                          @Param("userId") Long userId,@Param("moduleId") Long moduleId,@Param("chapterId") Long chapterId,@Param("examId") Long examId,@Param("courseId") Long courseId);
 
     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);
 
     Integer learningExamCheck(@Param("typeId") Long typeId,@Param("gradeId") Long gradeId,
-                          @Param("userId") Long userId,@Param("moduleId") Long moduleId,@Param("chapterId") Long chapterId,@Param("examId") Long examId);
+                          @Param("userId") Long userId,@Param("moduleId") Long moduleId,@Param("chapterId") Long chapterId,@Param("examId") Long examId,@Param("courseId") Long courseId);
 }

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

@@ -27,7 +27,7 @@ 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 learningCheck(@Param("sectionId") Long id,@Param("gradeId") Long gradeId,@Param("userId")Long userId,@Param("courseId")Long courseId);
 
     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

@@ -150,7 +150,7 @@ public class CourseChapterSectionServiceImpl extends ServiceImpl<CourseChapterSe
                     if (audit > 0) {
                         courseMenuVo.setAudit(1L);
                     }
-                    Integer learning = baseMapper.learningCheck(courseMenuVo.getTypeId(), courseMenuVo.getGradeId(), bo.getUserId(), bo.getModuleId(), bo.getChapterId(), 0L);
+                    Integer learning = baseMapper.learningCheck(courseMenuVo.getTypeId(), courseMenuVo.getGradeId(), bo.getUserId(), bo.getModuleId(), bo.getChapterId(), 0L,bo.getCourseId());
                     if (learning > 0) {
                         courseMenuVo.setLearning(1L);
                     }
@@ -163,7 +163,7 @@ public class CourseChapterSectionServiceImpl extends ServiceImpl<CourseChapterSe
                     if (rebuild > 0) {
                         courseMenuVo.setAudit(1L);
                     }
-                    Integer learning = baseMapper.learningExamCheck(0L, courseMenuVo.getGradeId(), bo.getUserId(), bo.getModuleId(), bo.getChapterId(), courseMenuVo.getTypeId());
+                    Integer learning = baseMapper.learningExamCheck(0L, courseMenuVo.getGradeId(), bo.getUserId(), bo.getModuleId(), bo.getChapterId(), courseMenuVo.getTypeId(),bo.getCourseId());
                    if(Validator.isNotEmpty(learning)){
                        courseMenuVo.setLearning(new Long(learning));
                    }

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

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

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserQueryBo.java

@@ -107,4 +107,18 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 	private Long classEndTime;
 	@ApiModelProperty("0剩余0 ，1 非商品下大于0 2商品下大于0")
 	private Integer studyCountMore;
+	/** 教育类型id */
+	@ApiModelProperty("教育类型id")
+	private Long educationTypeId;
+	/** 业务层次id */
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
+	/** 所属院校 */
+	@ApiModelProperty("所属院校")
+	private Long schoolId;
+	/** 所属专业 */
+	@ApiModelProperty("所属专业")
+	private Long majorId;
+	@ApiModelProperty("审核状态  1通过 3不通过 2待审")
+	private Integer profileStatus;
 }

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

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 
 /**
  * 学员记录视图对象 mall_package
@@ -142,4 +144,16 @@ public class ClassPeriodStudentVo {
 
 	@ApiModelProperty("审核状态  1通过 3不通过 2待审")
 	private Integer profileStatus;
+
+	@ApiModelProperty("班级名称")
+	private String className;
+
+	@ApiModelProperty("商品名称")
+	private String goodsName;
+
+	@ApiModelProperty("标准价格")
+	private BigDecimal standPrice;
+
+	@ApiModelProperty("编码")
+	private String goodsCode;
 }

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

@@ -194,6 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND up.user_id = #{userId}
           AND up.module_id= #{moduleId}
           and up.chapter_id=#{chapterId}
+          and up.course_id=#{courseId}
           and up.section_id=#{typeId}
           and up.exam_id=#{examId}
           AND ups.period_status =1
@@ -209,6 +210,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ubr.grade_id = #{gradeId}
           AND ubr.user_id = #{userId}
           AND ubr.module_id = #{moduleId}
+          AND ubr.course_id=#{courseId}
           AND ubr.chapter_id = #{chapterId}
           AND ubr.exam_id = #{examId}
         ORDER BY

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

@@ -218,6 +218,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND up.module_id= 0
           and up.chapter_id=0
           and up.section_id=#{sectionId}
+          and up.course_id=#{courseId}
           AND ups.period_status =1
           and ups.record_end_time is not null
     </select>

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

@@ -73,6 +73,10 @@
         <result property="studyEndTime" column="study_end_time"/>
         <result property="rebuildNum" column="rebuild_num"/>
         <result property="profileStatus" column="profile_status"/>
+        <result property="className" column="class_name"/>
+        <result property="goodsName" column="goods_name"/>
+        <result property="standPrice" column="stand_price"/>
+        <result property="goodsCode" column="goods_code"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassPeriodUserVo" id="ClassPeriodUserVo">
@@ -221,15 +225,16 @@
         cgu.grade_id,
         u.telphone,
         up.`status` as profile_status,
-        (SELECT g.class_hours FROM goods g LEFT JOIN class_grade_goods cgg on cgg.goods_id = g.goods_id where
-        cg.grade_id = cgg.grade_id) as class_hours,
-        (SELECT g.study_start_time FROM goods g LEFT JOIN class_grade_goods cgg on cgg.goods_id = g.goods_id where
-        cg.grade_id = cgg.grade_id) as study_start_time,
-        (SELECT g.study_end_time FROM goods g LEFT JOIN class_grade_goods cgg on cgg.goods_id = g.goods_id where
-        cg.grade_id = cgg.grade_id) as study_end_time,
+        g.class_hours as class_hours,
+        g.study_start_time as study_start_time,
+        g.study_end_time as study_end_time,
+        g.goods_name,
+        g.code as goods_code,
+        g.stand_price,
         cgu.period_status,
         cg.class_start_time,
         cg.class_end_time,
+        cg.class_name,
         cgu.period_plush,
         (SELECT COUNT(m.id) FROM course_menu_exam m LEFT JOIN goods_course c on m.course_id=c.course_id LEFT JOIN
         class_grade_goods cgg on cgg.goods_id = c.goods_id where cg.grade_id=cgg.grade_id and m.type = 1 ) as exam_num,
@@ -244,14 +249,33 @@
         LEFT JOIN class_grade_goods cgg on cg.grade_id=cgg.grade_id
         LEFT JOIN `user` u ON u.user_id = cgu.user_id
         LEFT JOIN user_profile up on u.user_id =up.user_id and up.goods_id = cgg.goods_id and up.type_status=1 and up.current_status = 1
+        LEFT JOIN goods g on cgg.goods_id = g.goods_id
         where 1=1
         and cgu.`status` =1
+        <if test="profileStatus != null and profileStatus != ''">
+            AND up.status = #{profileStatus}
+        </if>
         <if test="gradeId != null and gradeId !='' ">
             and cgu.grade_id = #{gradeId}
         </if>
+        <if test="businessId != null and businessId != ''">
+            AND g.business_id = #{businessId}
+        </if>
+        <if test="schoolId != null and schoolId != ''">
+            AND g.school_id = #{schoolId}
+        </if>
+        <if test="majorId != null and majorId != ''">
+            AND g.major_id = #{majorId}
+        </if>
         <if test="periodStatus != null ">
             and cgu.period_status = #{periodStatus}
         </if>
+        <if test="classStartTime != null and classStartTime != '' ">
+            AND cg.class_start_time > #{classStartTime}
+        </if>
+        <if test="classEndTime != null and classEndTime != '' ">
+            AND #{classEndTime} >  cg.class_end_time
+        </if>
         <if test="periodStatus == 2 ">
             order by cgu.period_wait_time,cgu.update_time desc
         </if>