From c8df02a7b07086e17bacda6cdc015d76ac1f82fe Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 04 九月 2024 17:16:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-pojo/src/main/java/com/ycl/platform/base/CheckIndex.java | 53 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 45 insertions(+), 8 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/base/CheckIndex.java b/ycl-pojo/src/main/java/com/ycl/platform/base/CheckIndex.java index b6485cc..31e99cf 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/base/CheckIndex.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/base/CheckIndex.java @@ -1,27 +1,39 @@ package com.ycl.platform.base; import annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; +import java.util.List; public abstract class CheckIndex { + @TableField("id") public Long id; - //鏌ヨ鏉′欢锛屾棩鏈� + //鏌ヨ鏉′欢锛屾湀浠� + @TableField(exist = false) public String date; + //鏌ヨ鏉′欢锛屾棩鏈� + @TableField(exist = false) + public String day; @Excel(name = "鏃ユ湡",dateFormat = "yyyy-MM-dd") + @TableField("create_time") public Date createTime; - + @TableField("dept_id") public Long deptId; @Excel(name = "鍖哄幙") + @TableField(exist = false) public String deptName; /** 鑰冩牳鏍囩锛堢渷鍘�/甯傚眬锛� */ - @Excel(name = "鑰冩牳鏍囩", dictType = "platform_examine_tag") - public Long examineTag; - - + @TableField("examine_tag") + public Short examineTag; + @Excel(name = "鑰冩牳鏍囩") + @TableField(exist = false) + public String examineTagStr; + @TableField(exist = false) + public List<Integer> deptIds; public Long getId() { return id; } @@ -62,11 +74,36 @@ this.deptName = deptName; } - public Long getExamineTag() { + public Short getExamineTag() { return examineTag; } - public void setExamineTag(Long examineTag) { + public void setExamineTag(Short examineTag) { this.examineTag = examineTag; } + + public List<Integer> getDeptIds() { + return deptIds; + } + + + public String getDay() { + return day; + } + + public void setDay(String day) { + this.day = day; + } + + public void setDeptIds(List<Integer> deptIds) { + this.deptIds = deptIds; + } + + public String getExamineTagStr() { + return examineTagStr; + } + + public void setExamineTagStr(String examineTagStr) { + this.examineTagStr = examineTagStr; + } } -- Gitblit v1.8.0