商品新增

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

@@ -282,4 +282,53 @@ public class ClassGradeController extends BaseController {
     public AjaxResult<Void> remove(@PathVariable Long[] classIds) {
         return toAjax(iClassGradeService.deleteWithValidByIds(Arrays.asList(classIds), true) ? 1 : 0);
     }*/
+
+
+    /**
+     * 学时审核
+     */
+    @ApiOperation("学时审核第一次請求獲得商品的章節")
+    @PreAuthorize("@ss.hasPermi('grade:user:list')")
+    @GetMapping("/listPeriodAuditOne")
+    public TableDataInfo<ClassPeriodVo> listPeriodAuditOne(ClassGradeUserQueryBo bo) {
+        startPage();
+        List<ClassPeriodVo> list = iClassGradeUserService.listPeriodAuditOne(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 学时审核
+     */
+    @ApiOperation("学时审核獲得商品模塊下的章")
+    @PreAuthorize("@ss.hasPermi('grade:user:list')")
+    @GetMapping("/listPeriodAuditChapter")
+    public TableDataInfo<ClassPeriodChapterVo> listPeriodAuditChapter(ClassGradeUserQueryBo bo) {
+        startPage();
+        List<ClassPeriodChapterVo> list = iClassGradeUserService.listPeriodAuditChapter(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 学时审核
+     */
+    @ApiOperation("学时审核獲得商品章下面的節")
+    @PreAuthorize("@ss.hasPermi('grade:user:list')")
+    @GetMapping("/listPeriodAuditSection")
+    public TableDataInfo<ClassPeriodSectionVo> listPeriodAuditSection(ClassGradeUserQueryBo bo) {
+        startPage();
+        List<ClassPeriodSectionVo> list = iClassGradeUserService.listPeriodAuditSection(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 学时审核
+     */
+    @ApiOperation("学时审核獲得商品節下面的審核記錄")
+    @PreAuthorize("@ss.hasPermi('grade:user:list')")
+    @GetMapping("/listPeriodAuditStatus")
+    public AjaxResult<UserPeriodStatusVo> listPeriodAuditStatus(ClassGradeUserQueryBo bo) {
+        startPage();
+        UserPeriodStatusVo list = iClassGradeUserService.listPeriodAuditStatus(bo);
+        return AjaxResult.success(list);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.grade.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -41,6 +42,23 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 	@ApiModelProperty("学员ID")
 	private Long userId;
 
+	/** 模塊ID */
+	@ApiModelProperty("模塊ID")
+	private Long moduleId;
+
+	/** 章ID */
+	@ApiModelProperty("章ID")
+	private Long chapterId;
+
+	/** 節ID */
+	@ApiModelProperty("節ID")
+	private Long sectionId;
+
+	/** 学员ID */
+	@Excel(name = "课程id")
+	@ApiModelProperty("课程id")
+	private Long courseId;
+
 	/** 商品id */
 	@ApiModelProperty("商品id")
 	private Long goodsId;
@@ -68,4 +86,9 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 	/** 官方学习账号推送状态 0否 1是 */
 	@ApiModelProperty("官方学习账号推送状态 0否 1是")
 	private Integer learnStatus;
+
+	/** 獲得第幾條審核記錄 */
+	@Excel(name = "獲得第幾條審核記錄")
+	@ApiModelProperty("獲得第幾條審核記錄")
+	private Long numIndex;
 }

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

@@ -57,4 +57,12 @@ public interface IClassGradeUserService extends IService<ClassGradeUser> {
     List<ClassPeriodUserVo> listPeriod(ClassGradeUserQueryBo bo);
 
 	List<ClassPeriodVo> listPeriodAudit(ClassGradeUserQueryBo bo);
+
+    List<ClassPeriodVo> listPeriodAuditOne(ClassGradeUserQueryBo bo);
+
+	List<ClassPeriodChapterVo> listPeriodAuditChapter(ClassGradeUserQueryBo bo);
+
+	List<ClassPeriodSectionVo> listPeriodAuditSection(ClassGradeUserQueryBo bo);
+
+	UserPeriodStatusVo listPeriodAuditStatus(ClassGradeUserQueryBo bo);
 }

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

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.grade.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.grade.bo.UserPeriodQueryBo;
@@ -206,12 +207,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                             userPeriodQueryBo.setChapterId(classPeriodChapterVo.getId());
                             userPeriodQueryBo.setModuleId(classPeriodVo.getId());
                             List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
-                            for (UserPeriodStatusVo userPeriodStatusVo : userPeriodStatusVos) {
-                                LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
-                                lqw.eq(UserStudyRecordPhoto::getPeriodId,userPeriodStatusVo.getId());
-                                userPeriodStatusVo.setUserStudyRecordPhotoList(entity2PhotoVo(userStudyRecordPhotoService.list(lqw)));
-                            }
-                            classPeriodSectionVo.setUserPeriodStatusVos(userPeriodStatusVos);
+
                         }
                         classPeriodSectionVos.addAll(baseMapper.listperiodExam(classPeriodVo.getId(), bo.getGoodsId(),classPeriodVo.getCourseId(), bo.getUserId()));
                         classPeriodChapterVo.setClassPeriodSectionList(classPeriodSectionVos);
@@ -229,12 +225,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     userPeriodQueryBo.setUserId(classPeriodSectionVo.getUserId());
                     userPeriodQueryBo.setChapterId(classPeriodVo.getId());
                     List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
-                    for (UserPeriodStatusVo userPeriodStatusVo : userPeriodStatusVos) {
-                        LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
-                        lqw.eq(UserStudyRecordPhoto::getPeriodId,userPeriodStatusVo.getId());
-                        userPeriodStatusVo.setUserStudyRecordPhotoList(entity2PhotoVo(userStudyRecordPhotoService.list(lqw)));
-                    }
-                    classPeriodSectionVo.setUserPeriodStatusVos(userPeriodStatusVos);
+
                 }
                 List<ClassPeriodSectionVo> classPeriodSectionVos1 = baseMapper.listPeriodSectionExam(classPeriodVo.getId(), bo.getGoodsId(), classPeriodVo.getCourseId(), bo.getUserId());
                 for (ClassPeriodSectionVo classPeriodSectionVo : classPeriodSectionVos1) {
@@ -245,12 +236,6 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     userPeriodQueryBo.setGoodsId(bo.getGoodsId());
                     userPeriodQueryBo.setChapterId(classPeriodVo.getId());
                     List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
-                    for (UserPeriodStatusVo userPeriodStatusVo : userPeriodStatusVos) {
-                        LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
-                        lqw.eq(UserStudyRecordPhoto::getPeriodId,userPeriodStatusVo.getId());
-                        userPeriodStatusVo.setUserStudyRecordPhotoList(entity2PhotoVo(userStudyRecordPhotoService.list(lqw)));
-                    }
-                    classPeriodSectionVo.setUserPeriodStatusVos(userPeriodStatusVos);
                 }
                 classPeriodSectionVos.addAll(classPeriodSectionVos1);
                 classPeriodVo.setClassPeriodSectionList(classPeriodSectionVos);
@@ -261,19 +246,54 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     userPeriodQueryBo.setGoodsId(bo.getGoodsId());
                     userPeriodQueryBo.setUserId(classPeriodVo.getUserId());
                     userPeriodQueryBo.setSectionId(classPeriodVo.getId());
-                List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
-                for (UserPeriodStatusVo userPeriodStatusVo : userPeriodStatusVos) {
-                    LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
-                    lqw.eq(UserStudyRecordPhoto::getPeriodId,userPeriodStatusVo.getId());
-                    userPeriodStatusVo.setUserStudyRecordPhotoList(entity2PhotoVo(userStudyRecordPhotoService.list(lqw)));
-                }
-                    classPeriodVo.setUserPeriodStatusVos(userPeriodStatusVos);
+                    List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
+
+                classPeriodVo.setUserPeriodStatusVos(userPeriodStatusVos);
             }
 
         }
         return classPeriodVos;
     }
 
+    @Override
+    public List<ClassPeriodVo> listPeriodAuditOne(ClassGradeUserQueryBo bo) {
+        List<ClassPeriodVo> classPeriodVos = baseMapper.listPeriodAudit(bo);
+        classPeriodVos.addAll(baseMapper.listPeriodAuditSection(bo));
+        return classPeriodVos;
+    }
+
+    @Override
+    public List<ClassPeriodChapterVo> listPeriodAuditChapter(ClassGradeUserQueryBo bo) {
+        List<ClassPeriodChapterVo> classPeriodChapterVos = baseMapper.listperiodChapter(bo.getModuleId(), bo.getGoodsId(),bo.getCourseId(), bo.getUserId());
+        return classPeriodChapterVos;
+    }
+
+    @Override
+    public List<ClassPeriodSectionVo> listPeriodAuditSection(ClassGradeUserQueryBo bo) {
+        List<ClassPeriodSectionVo> classPeriodSectionVos = baseMapper.listPeriodSection(bo.getChapterId(), bo.getGoodsId(), bo.getCourseId(), bo.getUserId());
+        return classPeriodSectionVos;
+    }
+
+    @Override
+    public UserPeriodStatusVo listPeriodAuditStatus(ClassGradeUserQueryBo bo) {
+        UserPeriodQueryBo userPeriodQueryBo = new UserPeriodQueryBo();
+        userPeriodQueryBo.setCourseId(bo.getCourseId());
+        userPeriodQueryBo.setGoodsId(bo.getGoodsId());
+        userPeriodQueryBo.setUserId(bo.getUserId());
+        userPeriodQueryBo.setSectionId(bo.getSectionId());
+        List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
+        for (UserPeriodStatusVo userPeriodStatusVo : userPeriodStatusVos) {
+            LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
+            lqw.eq(UserStudyRecordPhoto::getPeriodId,userPeriodStatusVo.getId());
+            userPeriodStatusVo.setUserStudyRecordPhotoList(entity2PhotoVo(userStudyRecordPhotoService.list(lqw)));
+        }
+        int numIndex = Convert.toInt(bo.getNumIndex()) - 1;
+        UserPeriodStatusVo userPeriodStatusVo = userPeriodStatusVos.get(numIndex);
+        userPeriodStatusVo.setNumIndex(bo.getNumIndex());
+        userPeriodStatusVo.setNumList(Convert.toLong(userPeriodStatusVos.size()));
+        return userPeriodStatusVo;
+    }
+
     /**
      * 实体类转化成视图对象
      *

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

@@ -35,7 +35,7 @@ public class ClassPeriodSectionVo {
 
 	/** 学员编码 */
 	@Excel(name = "標題")
-	@ApiModelProperty("学员编码")
+	@ApiModelProperty("標題")
 	private String typeName;
 
 	/** 学员编码 */

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

@@ -49,7 +49,33 @@ public class UserPeriodStatusVo {
 	/** 审核时间 */
 	@Excel(name = "审核时间")
 	@ApiModelProperty("审核时间")
-	private Integer createTime;
+	private Long auditTime;
+
+	/** 1模块 2章 3节 4卷 */
+	@Excel(name = "1模块 2章 3节 4卷")
+	@ApiModelProperty("1模块 2章 3节 4卷")
+	private Long type;
+
+	/** 當前位置 */
+	@Excel(name = "當前位置")
+	@ApiModelProperty("當前位置")
+	private Long numIndex;
+
+	/** 审核时间 */
+	@Excel(name = "共有多少條")
+	@ApiModelProperty("共有多少條")
+	private Long numList;
+
+
+	/** 学员编码 */
+	@Excel(name = "標題")
+	@ApiModelProperty("標題")
+	private String typeName;
+
+	/** 学员编码 */
+	@Excel(name = "学员姓名")
+	@ApiModelProperty("学员姓名")
+	private String realName;
 
 	/** 审核时间 */
 	@Excel(name = "审核照片")

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

@@ -23,15 +23,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id" column="id"/>
         <result property="periodId" column="period_id"/>
         <result property="periodStatus" column="period_status"/>
-        <result property="createTime" column="create_time"/>
+        <result property="auditTime" column="audit_time"/>
+        <result property="type" column="type"/>
+        <result property="typeName" column="type_name"/>
+        <result property="realName" column="real_name"/>
     </resultMap>
 
     <select id="selectPeriodStatus" parameterType="com.zhongzheng.modules.grade.bo.UserPeriodQueryBo" resultMap="UserPeriodStatusVo">
         SELECT
-            ups.*
+        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
         FROM
-            user_period_status ups
-                LEFT JOIN user_period up ON up.id = ups.period_id
+        user_period_status ups
+        LEFT JOIN user_period up ON up.id = ups.period_id
         WHERE 1=1
         <if test="goodsId != null and goodsId != ''">
             and up.goods_id = #{goodsId}
@@ -56,6 +62,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and up.exam_id = #{examId}
         </if>
         ORDER BY
-            ups.create_time asc
+            ups.create_time desc
     </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/system/SysUserMapper.xml

@@ -84,7 +84,7 @@
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
         select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex,
         u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,
-        r.role_id,
+        r.role_id,u.code,
         r.role_name from
         sys_user u
         left join sys_dept d on u.dept_id = d.dept_id