change 3 年之前
父節點
當前提交
0e9f1a820b

+ 81 - 0
zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserNoteController.java

@@ -0,0 +1,81 @@
+package com.zhongzheng.controller.user;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.user.vo.UserDateNoteVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.modules.user.vo.UserNoteVo;
+import com.zhongzheng.modules.user.bo.UserNoteQueryBo;
+import com.zhongzheng.modules.user.bo.UserNoteAddBo;
+import com.zhongzheng.modules.user.bo.UserNoteEditBo;
+import com.zhongzheng.modules.user.service.IUserNoteService;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 用户笔记记录Controller
+ * 
+ * @author ruoyi
+ * @date 2021-12-14
+ */
+@Api(value = "用户笔记记录控制器", tags = {"用户笔记记录管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/user/note")
+public class UserNoteController extends BaseController {
+
+    private final IUserNoteService iUserNoteService;
+
+    /**
+     * 查询用户笔记记录列表
+     */
+    @ApiOperation("查询用户笔记记录列表")
+    @PreAuthorize("@ss.hasPermi('system:note:list')")
+    @GetMapping("/listDate")
+    public TableDataInfo<UserDateNoteVo> listDate(UserNoteQueryBo bo) {
+        startPage();
+        List<UserDateNoteVo> list = iUserNoteService.listDate(bo);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 新增用户笔记记录
+     */
+    @ApiOperation("新增用户笔记记录")
+    @PreAuthorize("@ss.hasPermi('system:note:add')")
+    @Log(title = "用户笔记记录", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody UserNoteAddBo bo) {
+        return toAjax(iUserNoteService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改用户笔记记录
+     */
+    @ApiOperation("修改用户笔记记录")
+    @PreAuthorize("@ss.hasPermi('system:note:edit')")
+    @Log(title = "用户笔记记录", businessType = BusinessType.UPDATE)
+    @PostMapping("edit")
+    public AjaxResult<Void> edit(@RequestBody UserNoteEditBo bo) {
+        return toAjax(iUserNoteService.updateByEditBo(bo) ? 1 : 0);
+    }
+    
+}

+ 58 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserNoteAddBo.java

@@ -0,0 +1,58 @@
+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_note
+ *
+ * @author ruoyi
+ * @date 2021-12-14
+ */
+@Data
+@ApiModel("用户笔记记录添加对象")
+public class UserNoteAddBo {
+
+    /** 笔记内容 */
+    @ApiModelProperty("笔记内容")
+    private String noteText;
+    /** 笔记日期 */
+    @ApiModelProperty("笔记日期(只需要当天日期 时间为 00:00)")
+    private Long noteDate;
+    /** 课程ID */
+    @ApiModelProperty("课程ID")
+    private Long courseId;
+    /** 节ID */
+    @ApiModelProperty("节ID")
+    private Long sectionId;
+    /** 商品Id */
+    @ApiModelProperty("商品Id")
+    private Long goodsId;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+    /** 模块ID */
+    @ApiModelProperty("模块ID")
+    private Long moduleId;
+    /** 章ID */
+    @ApiModelProperty("章ID")
+    private Long chapterId;
+    /** 班级ID */
+    @ApiModelProperty("班级ID")
+    private Long gradeId;
+
+    /** 秒数 */
+    @ApiModelProperty("秒数")
+    private Long noteSecond;
+    /** 1有效 */
+    @ApiModelProperty("1有效")
+    private Integer status;
+}

+ 68 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserNoteEditBo.java

@@ -0,0 +1,68 @@
+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_note
+ *
+ * @author ruoyi
+ * @date 2021-12-14
+ */
+@Data
+@ApiModel("用户笔记记录编辑对象")
+public class UserNoteEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long noteId;
+
+    /** 笔记内容 */
+    @ApiModelProperty("笔记内容")
+    private String noteText;
+
+    /** 笔记日期 */
+    @ApiModelProperty("笔记日期")
+    private Long noteDate;
+
+    /** 课程ID */
+    @ApiModelProperty("课程ID")
+    private Long courseId;
+
+    /** 节ID */
+    @ApiModelProperty("节ID")
+    private Long sectionId;
+
+    /** 商品Id */
+    @ApiModelProperty("商品Id")
+    private Long goodsId;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+
+
+    /** 模块ID */
+    @ApiModelProperty("模块ID")
+    private Long moduleId;
+
+    /** 章ID */
+    @ApiModelProperty("章ID")
+    private Long chapterId;
+
+    /** 班级ID */
+    @ApiModelProperty("班级ID")
+    private Long gradeId;
+    /** 秒数 */
+    @ApiModelProperty("秒数")
+    private Long noteSecond;
+
+    /** 1有效 */
+    @ApiModelProperty("1有效")
+    private Integer status;
+
+}

+ 71 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserNoteQueryBo.java

@@ -0,0 +1,71 @@
+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.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 用户笔记记录分页查询对象 user_note
+ *
+ * @author ruoyi
+ * @date 2021-12-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("用户笔记记录分页查询对象")
+public class UserNoteQueryBo 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 noteText;
+	/** 笔记日期 */
+	@ApiModelProperty("笔记日期")
+	private Long noteDate;
+	/** 课程ID */
+	@ApiModelProperty("课程ID")
+	private Long courseId;
+	/** 节ID */
+	@ApiModelProperty("节ID")
+	private Long sectionId;
+	/** 商品Id */
+	@ApiModelProperty("商品Id")
+	private Long goodsId;
+	/** 模块ID */
+	@ApiModelProperty("模块ID")
+	private Long moduleId;
+	/** 章ID */
+	@ApiModelProperty("章ID")
+	private Long chapterId;
+	/** 班级ID */
+	@ApiModelProperty("班级ID")
+	private Long gradeId;
+
+	/** 秒数 */
+	@ApiModelProperty("秒数")
+	private Long noteSecond;
+	/** 1有效 */
+	@ApiModelProperty("1有效")
+	private List<Integer> status;
+}

+ 56 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserNote.java

@@ -0,0 +1,56 @@
+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_note
+ *
+ * @author ruoyi
+ * @date 2021-12-14
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("user_note")
+public class UserNote implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "note_id")
+    private Long noteId;
+    /** 笔记内容 */
+    private String noteText;
+    /** 笔记日期 */
+    private Long noteDate;
+    /** 课程ID */
+    private Long courseId;
+    /** 节ID */
+    private Long sectionId;
+    /** 商品Id */
+    private Long goodsId;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** $column.columnComment */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 模块ID */
+    private Long moduleId;
+    /** 章ID */
+    private Long chapterId;
+    /** 班级ID */
+    private Long gradeId;
+    /** 秒数 */
+    private Long noteSecond;
+
+    /** 1有效 */
+    private Integer status;
+}

+ 19 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserNoteMapper.java

@@ -0,0 +1,19 @@
+package com.zhongzheng.modules.user.mapper;
+
+import com.zhongzheng.modules.user.bo.UserNoteQueryBo;
+import com.zhongzheng.modules.user.domain.UserNote;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.user.vo.UserDateNoteVo;
+
+import java.util.List;
+
+/**
+ * 用户笔记记录Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-12-14
+ */
+public interface UserNoteMapper extends BaseMapper<UserNote> {
+
+    List<UserDateNoteVo> listDate(UserNoteQueryBo bo);
+}

+ 55 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserNoteService.java

@@ -0,0 +1,55 @@
+package com.zhongzheng.modules.user.service;
+
+import com.zhongzheng.modules.user.domain.UserNote;
+import com.zhongzheng.modules.user.vo.UserDateNoteVo;
+import com.zhongzheng.modules.user.vo.UserNoteVo;
+import com.zhongzheng.modules.user.bo.UserNoteQueryBo;
+import com.zhongzheng.modules.user.bo.UserNoteAddBo;
+import com.zhongzheng.modules.user.bo.UserNoteEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 用户笔记记录Service接口
+ *
+ * @author ruoyi
+ * @date 2021-12-14
+ */
+public interface IUserNoteService extends IService<UserNote> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	UserNoteVo queryById(Long noteId);
+
+	/**
+	 * 查询列表
+	 */
+	List<UserNoteVo> queryList(UserNoteQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入用户笔记记录
+	 * @param bo 用户笔记记录新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(UserNoteAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改用户笔记记录
+	 * @param bo 用户笔记记录编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(UserNoteEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<UserDateNoteVo> listDate(UserNoteQueryBo bo);
+}

+ 126 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserNoteServiceImpl.java

@@ -0,0 +1,126 @@
+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 com.zhongzheng.modules.user.vo.UserDateNoteVo;
+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.UserNoteAddBo;
+import com.zhongzheng.modules.user.bo.UserNoteQueryBo;
+import com.zhongzheng.modules.user.bo.UserNoteEditBo;
+import com.zhongzheng.modules.user.domain.UserNote;
+import com.zhongzheng.modules.user.mapper.UserNoteMapper;
+import com.zhongzheng.modules.user.vo.UserNoteVo;
+import com.zhongzheng.modules.user.service.IUserNoteService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 用户笔记记录Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-12-14
+ */
+@Service
+public class UserNoteServiceImpl extends ServiceImpl<UserNoteMapper, UserNote> implements IUserNoteService {
+
+    @Override
+    public UserNoteVo queryById(Long noteId){
+        UserNote db = this.baseMapper.selectById(noteId);
+        return BeanUtil.toBean(db, UserNoteVo.class);
+    }
+
+    @Override
+    public List<UserNoteVo> queryList(UserNoteQueryBo bo) {
+        LambdaQueryWrapper<UserNote> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getNoteText()), UserNote::getNoteText, bo.getNoteText());
+        lqw.eq(bo.getNoteDate() != null, UserNote::getNoteDate, bo.getNoteDate());
+        lqw.eq(bo.getCourseId() != null, UserNote::getCourseId, bo.getCourseId());
+        lqw.eq(bo.getSectionId() != null, UserNote::getSectionId, bo.getSectionId());
+        lqw.eq(bo.getGoodsId() != null, UserNote::getGoodsId, bo.getGoodsId());
+        lqw.eq(bo.getModuleId() != null, UserNote::getModuleId, bo.getModuleId());
+        lqw.eq(bo.getChapterId() != null, UserNote::getChapterId, bo.getChapterId());
+        lqw.eq(bo.getGradeId() != null, UserNote::getGradeId, bo.getGradeId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<UserNoteVo> entity2Vo(Collection<UserNote> collection) {
+        List<UserNoteVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, UserNoteVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<UserNote> page = (Page<UserNote>)collection;
+            Page<UserNoteVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(UserNoteAddBo bo) {
+        UserNote add = BeanUtil.toBean(bo, UserNote.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(UserNoteEditBo bo) {
+        UserNote update = BeanUtil.toBean(bo, UserNote.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(UserNote entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    @Override
+    public List<UserDateNoteVo> listDate(UserNoteQueryBo bo) {
+        List<UserDateNoteVo> userDateVos = baseMapper.listDate(bo);
+        for (UserDateNoteVo userDateVo : userDateVos) {
+            LambdaQueryWrapper<UserNote> lqw = Wrappers.lambdaQuery();
+            lqw.eq(userDateVo.getDateNote() != null, UserNote::getNoteDate, userDateVo.getDateNote());
+            lqw.eq(bo.getCourseId() != null, UserNote::getCourseId, bo.getCourseId());
+            lqw.eq(bo.getSectionId() != null, UserNote::getSectionId, bo.getSectionId());
+            lqw.eq(bo.getGoodsId() != null, UserNote::getGoodsId, bo.getGoodsId());
+            lqw.eq(bo.getModuleId() != null, UserNote::getModuleId, bo.getModuleId());
+            lqw.eq(bo.getChapterId() != null, UserNote::getChapterId, bo.getChapterId());
+            lqw.eq(bo.getGradeId() != null, UserNote::getGradeId, bo.getGradeId());
+            lqw.in(bo.getStatus() != null, UserNote::getStatus, bo.getStatus());
+            List<UserNoteVo> userNoteVos = entity2Vo(this.list(lqw));
+            userDateVo.setUserNotes(userNoteVos);
+        }
+        return userDateVos;
+    }
+}

+ 32 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserDateNoteVo.java

@@ -0,0 +1,32 @@
+package com.zhongzheng.modules.user.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.zhongzheng.modules.user.domain.UserNote;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 用户笔记记录视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-12-14
+ */
+@Data
+@ApiModel("用户笔记记录视图对象")
+public class UserDateNoteVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 笔记内容 */
+	@Excel(name = "笔记内容")
+	@ApiModelProperty("笔记内容")
+	private Long dateNote;
+
+	/** 笔记内容 */
+	@Excel(name = "笔记内容")
+	@ApiModelProperty("笔记内容")
+	private List<UserNoteVo> userNotes;
+}

+ 71 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserNoteVo.java

@@ -0,0 +1,71 @@
+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-12-14
+ */
+@Data
+@ApiModel("用户笔记记录视图对象")
+public class UserNoteVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long noteId;
+
+	/** 笔记内容 */
+	@Excel(name = "笔记内容")
+	@ApiModelProperty("笔记内容")
+	private String noteText;
+	/** 笔记日期 */
+	@Excel(name = "笔记日期")
+	@ApiModelProperty("笔记日期")
+	private Long noteDate;
+	/** 课程ID */
+	@Excel(name = "课程ID")
+	@ApiModelProperty("课程ID")
+	private Long courseId;
+	/** 节ID */
+	@Excel(name = "节ID")
+	@ApiModelProperty("节ID")
+	private Long sectionId;
+
+	/** 节ID */
+	@Excel(name = "节ID")
+	@ApiModelProperty("节ID")
+	private Long sectionName;
+	/** 商品Id */
+	@Excel(name = "商品Id")
+	@ApiModelProperty("商品Id")
+	private Long goodsId;
+	/** 模块ID */
+	@Excel(name = "模块ID")
+	@ApiModelProperty("模块ID")
+	private Long moduleId;
+	/** 章ID */
+	@Excel(name = "章ID")
+	@ApiModelProperty("章ID")
+	private Long chapterId;
+	/** 班级ID */
+	@Excel(name = "班级ID")
+	@ApiModelProperty("班级ID")
+	private Long gradeId;
+	/** 秒数 */
+	@ApiModelProperty("秒数")
+	private Long noteSecond;
+	/** 1有效 */
+	@ApiModelProperty("1有效")
+	private Integer status;
+
+}

+ 52 - 0
zhongzheng-system/src/main/resources/mapper/modules/user/UserNoteMapper.xml

@@ -0,0 +1,52 @@
+<?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.UserNoteMapper">
+
+    <resultMap type="com.zhongzheng.modules.user.domain.UserNote" id="UserNoteResult">
+        <result property="noteId" column="note_id"/>
+        <result property="noteText" column="note_text"/>
+        <result property="noteDate" column="note_date"/>
+        <result property="courseId" column="course_id"/>
+        <result property="sectionId" column="section_id"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="moduleId" column="module_id"/>
+        <result property="chapterId" column="chapter_id"/>
+        <result property="gradeId" column="grade_id"/>
+    </resultMap>
+
+    <resultMap type="com.zhongzheng.modules.user.vo.UserDateNoteVo" id="UserDateNoteVo">
+        <result property="dateNote" column="date_note"/>
+    </resultMap>
+
+    <select id="listDate" parameterType="com.zhongzheng.modules.user.bo.UserNoteQueryBo" resultMap="UserDateNoteVo">
+        SELECT
+            DISTINCT un.note_date as date_note
+        FROM
+            user_note un
+        WHERE 1=1
+            AND un.status = 1
+        <if test="goodsId != null and goodsId !='' ">
+            AND un.goods_id=#{goodsId}
+        </if>
+        <if test="moduleId != null and moduleId !='' ">
+            AND un.module_id=#{moduleId}
+        </if>
+        <if test="courseId != null and courseId !='' ">
+            AND un.course_id =#{courseId}
+        </if>
+        <if test="sectionId != null and sectionId !='' ">
+            AND un.section_id =#{sectionId}
+        </if>
+        <if test="chapterId != null and chapterId !='' ">
+            AND un.chapter_id =#{chapterId}
+        </if>
+        <if test="gradeId != null and gradeId !='' ">
+            AND un.grade_id =#{gradeId}
+        </if>
+        order by un.note_date desc
+    </select>
+</mapper>