修改學時審核

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

@@ -182,7 +182,6 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             //classGradeStudentVo.setStudyNum(divide.multiply(new BigDecimal("100")).longValue());
             classPeriodUserVo.setSecAllNum(secLong);
             classPeriodUserVo.setStuAllNum(studyLong);
-
             classPeriodUserVo.setPending(classPeriodUserVo.getExamNum()+classPeriodUserVo.getSecAllNum()-classPeriodUserVo.getPass()-classPeriodUserVo.getCheat());
         }
         return classPeriodUserVos;
@@ -395,7 +394,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         classPeriodSectionVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
         classPeriodSectionVo.setStudyEndTime(userPeriodStatusVo.getRecordEndTime());
         classPeriodSectionVo.setTypeName(userPeriodStatusVo.getTypeName());
-        classPeriodSectionVo.setType(userPeriodStatusVo.getType());
+
         classPeriodSectionVo.setStatus(userPeriodStatusVo.getStatus());
         classPeriodSectionVo.setNumList(Convert.toLong(userPeriodStatusVos.size()));
         classPeriodSectionVo.setNumIndex(bo.getNumIndex());
@@ -406,8 +405,10 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         classPeriodSectionVo.setPeriodId(userPeriodStatusVo.getPeriodId());
         if (bo.getSectionId() != null) {
             classPeriodSectionVo.setId(bo.getSectionId());
+            classPeriodSectionVo.setType(3L);
         }else {
             classPeriodSectionVo.setId(bo.getExamId());
+            classPeriodSectionVo.setType(4L);
         }
         return classPeriodSectionVo;
     }

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

@@ -36,6 +36,11 @@ public class ClassPeriodUserVo {
 	@ApiModelProperty("学员姓名")
 	private String realName;
 
+	/** 学员编码 */
+	@Excel(name = "當前班級學員審核狀態 0待審  1已審核")
+	@ApiModelProperty("當前班級學員審核狀態")
+	private Integer allStatus;
+
 	/** 商品ID */
 	@Excel(name = "商品ID")
 	@ApiModelProperty("商品ID")

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

@@ -33,8 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         ups.*,
         (select realname from `user` u where up.user_id = u.user_id) as  realname,
-        (SELECT name FROM course_section cs where up.section_id= cs.section_id) as type_name,
-               3 as type
+        (SELECT name FROM course_section cs where up.section_id= cs.section_id) as type_name
         FROM
         user_period_status ups
         LEFT JOIN user_period up ON up.id = ups.period_id