商品新增

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -326,9 +326,9 @@ public class ClassGradeController extends BaseController {
     @ApiOperation("学时审核獲得商品節下面的審核記錄")
     @PreAuthorize("@ss.hasPermi('grade:user:list')")
     @GetMapping("/listPeriodAuditStatus")
-    public AjaxResult<UserPeriodStatusVo> listPeriodAuditStatus(UserPeriodQueryBo bo) {
+    public AjaxResult<ClassPeriodSectionVo> listPeriodAuditStatus(UserPeriodQueryBo bo) {
         startPage();
-        UserPeriodStatusVo list = iClassGradeUserService.listPeriodAuditStatus(bo);
+        ClassPeriodSectionVo list = iClassGradeUserService.listPeriodAuditStatus(bo);
         return AjaxResult.success(list);
     }
 }

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

@@ -42,6 +42,10 @@ public class UserPeriodQueryBo extends BaseEntity {
 	/** 课程ID */
 	@ApiModelProperty("课程ID")
 	private Long courseId;
+	/** 班級ID */
+	@ApiModelProperty("班級ID")
+	private Long gradeId;
+
 	/** 节ID */
 	@ApiModelProperty("节ID")
 	private Long sectionId;

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

@@ -65,5 +65,5 @@ public interface IClassGradeUserService extends IService<ClassGradeUser> {
 
 	List<ClassPeriodSectionVo> listPeriodAuditSection(ClassGradeUserQueryBo bo);
 
-	UserPeriodStatusVo listPeriodAuditStatus(UserPeriodQueryBo bo);
+	ClassPeriodSectionVo listPeriodAuditStatus(UserPeriodQueryBo bo);
 }

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

@@ -364,7 +364,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     }
 
     @Override
-    public UserPeriodStatusVo listPeriodAuditStatus(UserPeriodQueryBo bo) {
+    public ClassPeriodSectionVo listPeriodAuditStatus(UserPeriodQueryBo bo) {
         List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(bo);
         for (UserPeriodStatusVo userPeriodStatusVo : userPeriodStatusVos) {
             LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
@@ -373,9 +373,23 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         }
         int numIndex = Convert.toInt(bo.getNumIndex()) - 1;
         UserPeriodStatusVo userPeriodStatusVo = userPeriodStatusVos.get(numIndex);
-        userPeriodStatusVo.setNumIndex(bo.getNumIndex());
-        userPeriodStatusVo.setNumList(Convert.toLong(userPeriodStatusVos.size()));
-        return userPeriodStatusVo;
+        ClassPeriodSectionVo classPeriodSectionVo = BeanUtil.toBean(bo, ClassPeriodSectionVo.class);
+        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());
+        classPeriodSectionVo.setAuditTime(userPeriodStatusVo.getAuditTime());
+        classPeriodSectionVo.setRealName(userPeriodStatusVo.getRealName());
+        classPeriodSectionVo.setUserStudyRecordPhotoList(userPeriodStatusVo.getUserStudyRecordPhotoList());
+        if (bo.getSectionId() != null) {
+            classPeriodSectionVo.setId(bo.getSectionId());
+        }else {
+            classPeriodSectionVo.setId(bo.getExamId());
+        }
+        return classPeriodSectionVo;
     }
 
     /**

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

@@ -27,7 +27,7 @@ public class UserPeriodStatusVo {
 
 	/** 1通过 0作弊 */
 	@Excel(name = "1通过 0作弊")
-	@ApiModelProperty("1通过 0作弊")
+	@ApiModelProperty("1通过 0作弊 2待審")
 	private Integer status;
 	/** 学习开始时间 */
 	@Excel(name = "学习开始时间")

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

@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="auditTime" column="audit_time"/>
         <result property="type" column="type"/>
         <result property="typeName" column="type_name"/>
-        <result property="realName" column="real_name"/>
+        <result property="realName" column="realname"/>
     </resultMap>
 
     <select id="selectPeriodStatus" parameterType="com.zhongzheng.modules.grade.bo.UserPeriodQueryBo" resultMap="UserPeriodStatusVo">