OA 讯息添加文件传阅 模板排序

src/main/java/cn/timer/api/bean/qyxx/CmsContent.java

@@ -146,4 +146,7 @@ public class CmsContent extends Model<CmsContent>{
 	
 	
 	@ApiModelProperty(value = "定时发布时间", example = "101")
 	@ApiModelProperty(value = "定时发布时间", example = "101")
 	private Long fixedTime;// 定时发布时间
 	private Long fixedTime;// 定时发布时间
+
+	@ApiModelProperty(value = "是否公开：0否，1是", example = "1")
+	private Integer openStatus;
 }
 }

src/main/java/cn/timer/api/bean/qyxx/CmsContentModular.java

@@ -54,4 +54,7 @@ public class CmsContentModular extends Model<CmsContentModular> {
 	@ApiModelProperty(value = "0- 开启  1-关闭", example = "0")
 	@ApiModelProperty(value = "0- 开启  1-关闭", example = "0")
 	private Integer isOpen;
 	private Integer isOpen;
 
 
+	@ApiModelProperty(value = "排序:升序", example = "0")
+	private Integer sort;
+
 }
 }

src/main/java/cn/timer/api/bean/qyxx/CmsContentRead.java

+package cn.timer.api.bean.qyxx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * 文件传阅表
+ *
+ * @author wuqingjun
+ * @email 284718418@qq.com
+ * @date 2022-06-23
+ */
+@Entity
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "cms_content_read")
+@ApiModel("文件传阅表")
+public class CmsContentRead extends Model<CmsContentRead>{
+
+	private static final long serialVersionUID = -5904257321968702198L;
+
+	@Id
+	@GeneratedValue
+	@TableId(type = IdType.AUTO)
+	@ApiModelProperty(value = "编号", example = "1")
+	private Integer id;
+	
+	@ApiModelProperty(value = "企业讯息主表ID", example = "101")
+	private Integer cmsContentId;
+
+	@ApiModelProperty(value = "留言/意见反馈", example = "")
+	private String reviewContent;
+	
+	@ApiModelProperty(value = "留言/意见反馈时间", example = "")
+	private Date reviewTime;
+
+	@ApiModelProperty(value = "组织机构代码", example = "1")
+	private Integer orgCode;
+
+	@ApiModelProperty(value = "用户ID", example = "1")
+	private Integer userId;
+
+	@ApiModelProperty(value = "用户姓名", example = "张三")
+	private String userName;
+
+	@ApiModelProperty(value = "阅读标记0.未读 1.已读", example = "0")
+	private Integer readStatus;
+
+	@ApiModelProperty(value = "逻辑删除标记0.未删除 1.删除", example = "0")
+	private Integer deleteFlag;
+
+	@ApiModelProperty(value = "创建时间", example = "")
+	private Date createTime;
+
+	@ApiModelProperty(value = "更新时间", example = "")
+	private Date updateTime;
+	
+
+}

src/main/java/cn/timer/api/dao/qyxx/CmsContentMapper.java

 package cn.timer.api.dao.qyxx;
 package cn.timer.api.dao.qyxx;
 
 
+import com.github.yulichang.base.MPJBaseMapper;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
 
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 import cn.timer.api.bean.qyxx.CmsContent;
 import cn.timer.api.bean.qyxx.CmsContent;
 
 
@@ -12,6 +12,6 @@ import cn.timer.api.bean.qyxx.CmsContent;
  * @author dsc 2019-12-10
  * @author dsc 2019-12-10
  */
  */
 @Repository
 @Repository
-public interface CmsContentMapper extends BaseMapper<CmsContent> {
+public interface CmsContentMapper extends MPJBaseMapper<CmsContent> {
 
 
 }
 }

src/main/java/cn/timer/api/dao/qyxx/CmsContentReadMapper.java

+package cn.timer.api.dao.qyxx;
+
+import cn.timer.api.bean.qyxx.CmsContentRead;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 文件传阅表
+ *
+ * @author wuqingjun
+ * @email 284718418@qq.com
+ * @date 2022-06-23
+ */
+@Repository
+public interface CmsContentReadMapper extends BaseMapper<CmsContentRead> {
+
+}

src/main/java/cn/timer/api/dto/qyxx/CmsContentDto.java

 package cn.timer.api.dto.qyxx;
 package cn.timer.api.dto.qyxx;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
+import java.util.List;
 
 
 import javax.persistence.GeneratedValue;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Id;
 
 
+import cn.timer.api.bean.qyxx.CmsContentRead;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
@@ -137,4 +139,12 @@ public class CmsContentDto extends Page implements Serializable{
 	
 	
 	@ApiModelProperty(value = "定时发布时间", example = "101")
 	@ApiModelProperty(value = "定时发布时间", example = "101")
 	private Long fixedTime;// 定时发布时间
 	private Long fixedTime;// 定时发布时间
+
+	@ApiModelProperty(value = "是否公开：0否，1是", example = "1")
+	private Integer openStatus;
+	/**
+	 * 文件传阅人员
+	 */
+	@ApiModelProperty(value = "文件传阅人员")
+	private List<CmsContentRead> cmsContentReads;
 }
 }
\ No newline at end of file

src/main/java/cn/timer/api/dto/qyxx/CmsContentReadDto.java

+package cn.timer.api.dto.qyxx;
+
+import cn.timer.api.utils.Page;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CmsContentReadDto extends Page implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "编号", example = "1")
+    private Integer id;
+
+    @ApiModelProperty(value = "企业讯息主表ID", example = "101")
+    private Integer cmsContentId;
+
+    @ApiModelProperty(value = "留言/意见反馈", example = "")
+    private String reviewContent;
+
+    @ApiModelProperty(value = "留言/意见反馈时间", example = "")
+    private Date reviewTime;
+
+    @ApiModelProperty(value = "组织机构代码", example = "1")
+    private Integer orgCode;
+
+    @ApiModelProperty(value = "用户ID", example = "1")
+    private Integer userId;
+
+    @ApiModelProperty(value = "用户姓名", example = "张三")
+    private String userName;
+
+    @ApiModelProperty(value = "阅读标记0.未读 1.已读", example = "0")
+    private Integer readStatus;
+
+    @ApiModelProperty(value = "逻辑删除标记0.未删除 1.删除", example = "0")
+    private Integer deleteFlag;
+
+    @ApiModelProperty(value = "创建时间", example = "")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间", example = "")
+    private Date updateTime;
+}