通知列表

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeUserMapper.java

@@ -35,7 +35,7 @@ public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
 
     List<ClassPeriodVo> listPeriodAuditExam(ClassGradeUserQueryBo bo);
 
-    List<ClassPeriodChapterVo> listperiodExam(@Param("moduleId") Long id,@Param("goodsId") Long goodsId,@Param("courseId") Long courseId,@Param("userId") Long userId);
+    List<ClassPeriodSectionVo> listperiodExam(@Param("moduleId") Long id,@Param("goodsId") Long goodsId,@Param("courseId") Long courseId,@Param("userId") Long userId);
 
     List<ClassPeriodSectionVo> listPeriodSectionExam(@Param("chapterId") Long id,@Param("goodsId") Long goodsId,@Param("courseId") Long courseId,@Param("userId") Long userId);
 }

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

@@ -7,6 +7,7 @@ import com.zhongzheng.modules.grade.bo.UserPeriodQueryBo;
 import com.zhongzheng.modules.grade.service.IUserPeriodStatusService;
 import com.zhongzheng.modules.grade.vo.*;
 import com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo;
+import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
 import com.zhongzheng.modules.user.vo.SubjectStudyRecordVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -183,20 +184,10 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     public List<ClassPeriodVo> listPeriodAudit(ClassGradeUserQueryBo bo) {
         List<ClassPeriodVo> classPeriodVos = baseMapper.listPeriodAudit(bo);
         classPeriodVos.addAll(baseMapper.listPeriodAuditSection(bo));
-        classPeriodVos.addAll(baseMapper.listPeriodAuditExam(bo));
         for (ClassPeriodVo classPeriodVo : classPeriodVos) {
             if (classPeriodVo.getType() == 1){
                 List<ClassPeriodChapterVo> classPeriodChapterVos = baseMapper.listperiodChapter(classPeriodVo.getId(), bo.getGoodsId(),classPeriodVo.getCourseId(), bo.getUserId());
-                classPeriodChapterVos.addAll(baseMapper.listperiodExam(classPeriodVo.getId(), bo.getGoodsId(),classPeriodVo.getCourseId(), bo.getUserId()));
                 for (ClassPeriodChapterVo classPeriodChapterVo : classPeriodChapterVos) {
-                    if (classPeriodChapterVo.getType() == 4){
-                        UserPeriodQueryBo userPeriodQueryBo = new UserPeriodQueryBo();
-                        userPeriodQueryBo.setExamId(classPeriodChapterVo.getId());
-                        userPeriodQueryBo.setCourseId(classPeriodChapterVo.getCourseId());
-                        userPeriodQueryBo.setGoodsId(bo.getGoodsId());
-                        userPeriodQueryBo.setUserId(classPeriodChapterVo.getUserId());
-                        classPeriodChapterVo.setUserPeriodStatusVos(userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo));
-                    }
                     if (classPeriodChapterVo.getType() == 2) {
                         List<ClassPeriodSectionVo> classPeriodSectionVos = baseMapper.listPeriodSection(classPeriodChapterVo.getId(), bo.getGoodsId(), classPeriodVo.getCourseId(), bo.getUserId());
                         for (ClassPeriodSectionVo classPeriodSectionVo : classPeriodSectionVos) {
@@ -209,6 +200,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                             userPeriodQueryBo.setModuleId(classPeriodVo.getId());
                             classPeriodSectionVo.setUserPeriodStatusVos(userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo));
                         }
+                        classPeriodSectionVos.addAll(baseMapper.listperiodExam(classPeriodVo.getId(), bo.getGoodsId(),classPeriodVo.getCourseId(), bo.getUserId()));
                         classPeriodChapterVo.setClassPeriodSectionList(classPeriodSectionVos);
                     }
                 }
@@ -247,14 +239,6 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     classPeriodVo.setUserPeriodStatusVos(userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo));
             }
 
-            if (classPeriodVo.getType() == 4){
-                UserPeriodQueryBo userPeriodQueryBo = new UserPeriodQueryBo();
-                userPeriodQueryBo.setExamId(classPeriodVo.getId());
-                userPeriodQueryBo.setCourseId(classPeriodVo.getCourseId());
-                userPeriodQueryBo.setGoodsId(bo.getGoodsId());
-                userPeriodQueryBo.setUserId(classPeriodVo.getUserId());
-                classPeriodVo.setUserPeriodStatusVos(userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo));
-            }
         }
         return classPeriodVos;
     }

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

@@ -2,11 +2,12 @@ package com.zhongzheng.modules.grade.vo;
 
 import com.zhongzheng.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhongzheng.modules.user.vo.UserStudyRecordPhotoVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -49,4 +50,9 @@ public class UserPeriodStatusVo {
 	@Excel(name = "审核时间")
 	@ApiModelProperty("审核时间")
 	private Integer createTime;
+
+	/** 审核时间 */
+	@Excel(name = "审核照片")
+	@ApiModelProperty("审核照片")
+	private List<UserStudyRecordPhotoVo> userStudyRecordPhotoList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserStudyRecordPhotoAddBo.java

@@ -0,0 +1,33 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 学习拍摄照片添加对象 user_study_record_photo
+ *
+ * @author ruoyi
+ * @date 2021-11-30
+ */
+@Data
+@ApiModel("学习拍摄照片添加对象")
+public class UserStudyRecordPhotoAddBo {
+
+    /** 拍摄照片 */
+    @ApiModelProperty("拍摄照片")
+    private String photo;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** 绑定学时 */
+    @ApiModelProperty("绑定学时")
+    private Long periodId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserStudyRecordPhotoEditBo.java

@@ -0,0 +1,37 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 学习拍摄照片编辑对象 user_study_record_photo
+ *
+ * @author ruoyi
+ * @date 2021-11-30
+ */
+@Data
+@ApiModel("学习拍摄照片编辑对象")
+public class UserStudyRecordPhotoEditBo {
+
+    /** 学习记录id */
+    @ApiModelProperty("学习记录id")
+    private Long recordId;
+
+    /** 拍摄照片 */
+    @ApiModelProperty("拍摄照片")
+    private String photo;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+
+    /** 绑定学时 */
+    @ApiModelProperty("绑定学时")
+    private Long periodId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserStudyRecordPhotoQueryBo.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 学习拍摄照片分页查询对象 user_study_record_photo
+ *
+ * @author ruoyi
+ * @date 2021-11-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("学习拍摄照片分页查询对象")
+public class UserStudyRecordPhotoQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 拍摄照片 */
+	@ApiModelProperty("拍摄照片")
+	private String photo;
+	/** 绑定学时 */
+	@ApiModelProperty("绑定学时")
+	private Long periodId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserStudyRecordPhoto.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.user.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 学习拍摄照片对象 user_study_record_photo
+ *
+ * @author ruoyi
+ * @date 2021-11-30
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("user_study_record_photo")
+public class UserStudyRecordPhoto implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 学习记录id */
+    @TableId(value = "record_id")
+    private Long recordId;
+    /** 拍摄照片 */
+    private String photo;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 绑定学时 */
+    private Long periodId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserStudyRecordPhotoMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.user.mapper;
+
+import com.zhongzheng.modules.user.domain.UserStudyRecordPhoto;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 学习拍摄照片Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-11-30
+ */
+public interface UserStudyRecordPhotoMapper extends BaseMapper<UserStudyRecordPhoto> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserStudyRecordPhotoService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.user.service;
+
+import com.zhongzheng.modules.user.domain.UserStudyRecordPhoto;
+import com.zhongzheng.modules.user.vo.UserStudyRecordPhotoVo;
+import com.zhongzheng.modules.user.bo.UserStudyRecordPhotoQueryBo;
+import com.zhongzheng.modules.user.bo.UserStudyRecordPhotoAddBo;
+import com.zhongzheng.modules.user.bo.UserStudyRecordPhotoEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 学习拍摄照片Service接口
+ *
+ * @author ruoyi
+ * @date 2021-11-30
+ */
+public interface IUserStudyRecordPhotoService extends IService<UserStudyRecordPhoto> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	UserStudyRecordPhotoVo queryById(Long recordId);
+
+	/**
+	 * 查询列表
+	 */
+	List<UserStudyRecordPhotoVo> queryList(UserStudyRecordPhotoQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入学习拍摄照片
+	 * @param bo 学习拍摄照片新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(UserStudyRecordPhotoAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改学习拍摄照片
+	 * @param bo 学习拍摄照片编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(UserStudyRecordPhotoEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordPhotoServiceImpl.java

@@ -0,0 +1,100 @@
+package com.zhongzheng.modules.user.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+import com.zhongzheng.modules.user.bo.UserStudyRecordPhotoAddBo;
+import com.zhongzheng.modules.user.bo.UserStudyRecordPhotoQueryBo;
+import com.zhongzheng.modules.user.bo.UserStudyRecordPhotoEditBo;
+import com.zhongzheng.modules.user.domain.UserStudyRecordPhoto;
+import com.zhongzheng.modules.user.mapper.UserStudyRecordPhotoMapper;
+import com.zhongzheng.modules.user.vo.UserStudyRecordPhotoVo;
+import com.zhongzheng.modules.user.service.IUserStudyRecordPhotoService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 学习拍摄照片Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-11-30
+ */
+@Service
+public class UserStudyRecordPhotoServiceImpl extends ServiceImpl<UserStudyRecordPhotoMapper, UserStudyRecordPhoto> implements IUserStudyRecordPhotoService {
+
+    @Override
+    public UserStudyRecordPhotoVo queryById(Long recordId){
+        UserStudyRecordPhoto db = this.baseMapper.selectById(recordId);
+        return BeanUtil.toBean(db, UserStudyRecordPhotoVo.class);
+    }
+
+    @Override
+    public List<UserStudyRecordPhotoVo> queryList(UserStudyRecordPhotoQueryBo bo) {
+        LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getPhoto()), UserStudyRecordPhoto::getPhoto, bo.getPhoto());
+        lqw.eq(bo.getPeriodId() != null, UserStudyRecordPhoto::getPeriodId, bo.getPeriodId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<UserStudyRecordPhotoVo> entity2Vo(Collection<UserStudyRecordPhoto> collection) {
+        List<UserStudyRecordPhotoVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, UserStudyRecordPhotoVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<UserStudyRecordPhoto> page = (Page<UserStudyRecordPhoto>)collection;
+            Page<UserStudyRecordPhotoVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(UserStudyRecordPhotoAddBo bo) {
+        UserStudyRecordPhoto add = BeanUtil.toBean(bo, UserStudyRecordPhoto.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(UserStudyRecordPhotoEditBo bo) {
+        UserStudyRecordPhoto update = BeanUtil.toBean(bo, UserStudyRecordPhoto.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(UserStudyRecordPhoto entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserStudyRecordPhotoVo.java

@@ -0,0 +1,35 @@
+package com.zhongzheng.modules.user.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 学习拍摄照片视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-11-30
+ */
+@Data
+@ApiModel("学习拍摄照片视图对象")
+public class UserStudyRecordPhotoVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 学习记录id */
+	@ApiModelProperty("学习记录id")
+	private Long recordId;
+
+	/** 拍摄照片 */
+	@Excel(name = "拍摄照片")
+	@ApiModelProperty("拍摄照片")
+	private String photo;
+	/** 绑定学时 */
+	@Excel(name = "绑定学时")
+	@ApiModelProperty("绑定学时")
+	private Long periodId;
+}

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

@@ -598,7 +598,7 @@
         </if>
     </select>
 
-    <select id="listperiodExam" parameterType="map" resultMap="ClassPeriodChapterVo">
+    <select id="listperiodExam" parameterType="map" resultMap="ClassPeriodSectionVo">
         SELECT
         cme.exam_id as id,
         cme.course_id,

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordPhotoMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.user.mapper.UserStudyRecordPhotoMapper">
+
+    <resultMap type="com.zhongzheng.modules.user.domain.UserStudyRecordPhoto" id="UserStudyRecordPhotoResult">
+        <result property="recordId" column="record_id"/>
+        <result property="photo" column="photo"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="periodId" column="period_id"/>
+    </resultMap>
+
+
+</mapper>