From b28058e0a850fe3c2653316750ab5964acf8e6cf Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Mon, 6 May 2024 19:47:14 +0800 Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B45=E6=9C=886=E6=97=A5=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0=E5=86=B2=E7=AA=81?= =?UTF-8?q?,=E4=BF=AE=E5=A4=8D=E7=BC=BA=E5=B0=91ID=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=9A=84=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/kc/KcBdgxbcopy/entity/KcBdgxbcopy.java | 1 + .../org/jeecg/modules/kc/grab/exports/entity/TBks.java | 3 +++ .../org/jeecg/modules/kc/grab/exports/entity/TDw.java | 3 +++ .../modules/kc/grab/exports/entity/TFwdtBkjxtkpj.java | 3 +++ .../modules/kc/grab/exports/entity/TFwdtShryxx.java | 3 +++ .../modules/kc/grab/exports/entity/TJwJsjbxx.java | 7 +++---- .../modules/kc/grab/exports/entity/TJwJxljbxx.java | 7 +++---- .../modules/kc/grab/exports/entity/TJwKcapzb.java | 3 +++ .../jeecg/modules/kc/grab/exports/entity/TJwKckb.java | 3 +++ .../jeecg/modules/kc/grab/exports/entity/TJwKcxxb.java | 3 +++ .../jeecg/modules/kc/grab/exports/entity/TJwTkkcb.java | 3 +++ .../jeecg/modules/kc/grab/exports/entity/TJwTkxx.java | 3 +++ .../jeecg/modules/kc/grab/exports/entity/TJwXsxkb.java | 3 +++ .../jeecg/modules/kc/grab/exports/entity/TJzgXskc.java | 3 +++ .../jeecg/modules/kc/grab/exports/entity/TZzbLdxx.java | 3 +++ .../modules/kc/grab/exports/entity/Tdmjzgdqzt.java | 5 ++--- .../modules/kc/grab/imports/entity/Xxhbbkjxtkpj.java | 1 + .../modules/kc/grab/imports/entity/Xxhbjsjbxx.java | 1 + .../modules/kc/grab/imports/entity/Xxhbjxljbxx.java | 1 + .../modules/kc/grab/imports/entity/Xxhbshryxx.java | 2 ++ .../kc/grab/log/entity/KcOldEvaluationansBad.java | 1 + .../kc/grab/log/entity/KcOldEvaluationansGood.java | 1 + .../modules/kc/jiaoshi/entity/KcJiaoshixinxibiao.java | 1 + .../entity/KcEvaluationsHisrecord.java | 1 + .../kc/kcEvaluationsStat/entity/KcEvaluationsStat.java | 1 + .../jeecg/modules/kc/qa/entity/KcOldEvaluationans.java | 7 +++---- .../modules/kc/tksf/kctkcstj/entity/KcTkcstj.java | 1 + .../modules/kc/tksf/kctksfrzb/entity/KcTksfrzb.java | 1 + pom.xml | 10 ++++++++++ 29 files changed, 70 insertions(+), 15 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/KcBdgxbcopy/entity/KcBdgxbcopy.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/KcBdgxbcopy/entity/KcBdgxbcopy.java index 177aee28..a1658930 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/KcBdgxbcopy/entity/KcBdgxbcopy.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/KcBdgxbcopy/entity/KcBdgxbcopy.java @@ -37,6 +37,7 @@ public class KcBdgxbcopy implements Serializable { /**userid*/ @Excel(name = "userid", width = 15) @ApiModelProperty(value = "userid") + @TableId private java.lang.String userid; /**bdtime*/ @Excel(name = "bdtime", width = 15, format = "yyyy-MM-dd") diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TBks.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TBks.java index c2e7cbef..19b25e00 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TBks.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TBks.java @@ -1,5 +1,7 @@ package org.jeecg.modules.kc.grab.exports.entity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -26,6 +28,7 @@ public class TBks { /**xh*/ @Excel(name = "xh", width = 15) @ApiModelProperty(value = "xh") + @TableId private java.lang.String xh; /**xm*/ @Excel(name = "xm", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TDw.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TDw.java index d4e5d2ec..ee341408 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TDw.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TDw.java @@ -1,5 +1,7 @@ package org.jeecg.modules.kc.grab.exports.entity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -26,6 +28,7 @@ public class TDw { /**dwh*/ @Excel(name = "dwh", width = 15) @ApiModelProperty(value = "dwh") + @TableId private java.lang.String dwh; /**sfyxm*/ @Excel(name = "sfyxm", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TFwdtBkjxtkpj.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TFwdtBkjxtkpj.java index 3ae8e87d..3d29d87b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TFwdtBkjxtkpj.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TFwdtBkjxtkpj.java @@ -1,5 +1,7 @@ package org.jeecg.modules.kc.grab.exports.entity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -30,6 +32,7 @@ public class TFwdtBkjxtkpj implements Serializable { /**编号*/ @Excel(name = "编号", width = 15) @ApiModelProperty(value = "编号") + @TableId private String bh; /**轮次编号*/ @Excel(name = "轮次编号", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TFwdtShryxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TFwdtShryxx.java index 88dcc5e6..82961cce 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TFwdtShryxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TFwdtShryxx.java @@ -2,6 +2,8 @@ package org.jeecg.modules.kc.grab.exports.entity; import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; @@ -29,6 +31,7 @@ public class TFwdtShryxx implements Serializable { /**工号*/ @Excel(name = "工号", width = 15) @ApiModelProperty(value = "工号") + @TableId private java.lang.String gh; /**姓名*/ @Excel(name = "姓名", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwJsjbxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwJsjbxx.java index b0ce70e7..1d97e17f 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwJsjbxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwJsjbxx.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -115,6 +113,7 @@ public class TJwJsjbxx implements Serializable { /**教室号(关联视图T_JW_KCKB里的JSBH)*/ @Excel(name = "教室号(关联视图T_JW_KCKB里的JSBH)", width = 15) @ApiModelProperty(value = "教室号(关联视图T_JW_KCKB里的JSBH)") + @TableId private java.lang.String jsh; /**timestamps*/ @Excel(name = "timestamps", width = 15, format = "yyyy-MM-dd") diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwJxljbxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwJxljbxx.java index 2ea530b8..28ab5917 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwJxljbxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwJxljbxx.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -43,6 +41,7 @@ public class TJwJxljbxx implements Serializable { /**编号*/ @Excel(name = "编号", width = 15) @ApiModelProperty(value = "编号") + @TableId private java.lang.String bh; /**状态*/ @Excel(name = "状态", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwKcapzb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwKcapzb.java index 8b9b13a1..c3f3e160 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwKcapzb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwKcapzb.java @@ -1,5 +1,7 @@ package org.jeecg.modules.kc.grab.exports.entity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -26,6 +28,7 @@ public class TJwKcapzb { /**xnxqbh*/ @Excel(name = "xnxqbh", width = 15) @ApiModelProperty(value = "xnxqbh") + @TableId private java.lang.String xnxqbh; /**cjlrbz*/ @Excel(name = "cjlrbz", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwKckb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwKckb.java index 5f0e571a..555b885c 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwKckb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwKckb.java @@ -1,5 +1,7 @@ package org.jeecg.modules.kc.grab.exports.entity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -24,6 +26,7 @@ public class TJwKckb { /**kcbh*/ @Excel(name = "kcbh", width = 15) @ApiModelProperty(value = "kcbh") + @TableId private java.lang.String kcbh; /**kcmc*/ @Excel(name = "kcmc", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwKcxxb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwKcxxb.java index 0510b58d..1fb94712 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwKcxxb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwKcxxb.java @@ -1,5 +1,7 @@ package org.jeecg.modules.kc.grab.exports.entity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -34,6 +36,7 @@ public class TJwKcxxb { /**khfsdm*/ @Excel(name = "khfsdm", width = 15) @ApiModelProperty(value = "khfsdm") + @TableId private java.lang.String khfsdm; /**kkdwh*/ @Excel(name = "kkdwh", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwTkkcb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwTkkcb.java index d917af14..26c88f6f 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwTkkcb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwTkkcb.java @@ -1,5 +1,7 @@ package org.jeecg.modules.kc.grab.exports.entity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -34,6 +36,7 @@ public class TJwTkkcb { /**jzwh*/ @Excel(name = "jzwh", width = 15) @ApiModelProperty(value = "jzwh") + @TableId private java.lang.String jzwh; /**jzwmc*/ @Excel(name = "jzwmc", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwTkxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwTkxx.java index 9ea13344..da31d4f0 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwTkxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwTkxx.java @@ -1,5 +1,7 @@ package org.jeecg.modules.kc.grab.exports.entity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -34,6 +36,7 @@ public class TJwTkxx { /**lcjgbh*/ @Excel(name = "lcjgbh", width = 15) @ApiModelProperty(value = "lcjgbh") + @TableId private java.lang.String lcjgbh; /**bkjh*/ @Excel(name = "bkjh", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwXsxkb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwXsxkb.java index d5442066..0d22512c 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwXsxkb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwXsxkb.java @@ -1,5 +1,7 @@ package org.jeecg.modules.kc.grab.exports.entity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -26,6 +28,7 @@ public class TJwXsxkb { /**hbmxbh*/ @Excel(name = "hbmxbh", width = 15) @ApiModelProperty(value = "hbmxbh") + @TableId private java.lang.String hbmxbh; /**xh*/ @Excel(name = "xh", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJzgXskc.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJzgXskc.java index 949df949..91b180fc 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJzgXskc.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJzgXskc.java @@ -1,5 +1,7 @@ package org.jeecg.modules.kc.grab.exports.entity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -26,6 +28,7 @@ public class TJzgXskc { /**gh*/ @Excel(name = "gh", width = 15) @ApiModelProperty(value = "gh") + @TableId private java.lang.String gh; /**xm*/ @Excel(name = "xm", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TZzbLdxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TZzbLdxx.java index f5f6fe7d..e555aa3f 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TZzbLdxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TZzbLdxx.java @@ -1,5 +1,7 @@ package org.jeecg.modules.kc.grab.exports.entity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -26,6 +28,7 @@ public class TZzbLdxx { /**gh*/ @Excel(name = "gh", width = 15) @ApiModelProperty(value = "gh") + @TableId private java.lang.String gh; /**xm*/ @Excel(name = "xm", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/Tdmjzgdqzt.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/Tdmjzgdqzt.java index 41599fe9..399b2ac2 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/Tdmjzgdqzt.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/Tdmjzgdqzt.java @@ -1,14 +1,12 @@ package org.jeecg.modules.kc.grab.exports.entity; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; /** * @Description: T_BKS-抓取 @@ -25,6 +23,7 @@ public class Tdmjzgdqzt { /**xh*/ @ApiModelProperty(value = "dm") + @TableId private String dm; /**xm*/ @ApiModelProperty(value = "mc") diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbbkjxtkpj.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbbkjxtkpj.java index 86f68830..2d9caf54 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbbkjxtkpj.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbbkjxtkpj.java @@ -33,6 +33,7 @@ public class Xxhbbkjxtkpj implements Serializable { /**编号*/ @Excel(name = "编号", width = 15) @ApiModelProperty(value = "编号") + @TableId private java.lang.String bh; /**轮次编号*/ @Excel(name = "轮次编号", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbjsjbxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbjsjbxx.java index ea5f47ac..95db1fc4 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbjsjbxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbjsjbxx.java @@ -105,6 +105,7 @@ public class Xxhbjsjbxx implements Serializable { /**编号*/ @Excel(name = "编号", width = 15) @ApiModelProperty(value = "编号") + @TableId private java.lang.String bh; /**座位数*/ @Excel(name = "座位数", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbjxljbxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbjxljbxx.java index 171e0f9e..615e2e92 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbjxljbxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbjxljbxx.java @@ -33,6 +33,7 @@ public class Xxhbjxljbxx implements Serializable { /**院系号*/ @Excel(name = "院系号", width = 15) @ApiModelProperty(value = "院系号") + @TableId private java.lang.String yxh; /**建筑物状况码*/ @Excel(name = "建筑物状况码", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbshryxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbshryxx.java index 25cffe6d..a4986dfa 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbshryxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbshryxx.java @@ -1,6 +1,7 @@ package org.jeecg.modules.kc.grab.imports.entity; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -30,6 +31,7 @@ public class Xxhbshryxx implements Serializable { /**工号*/ @Excel(name = "工号", width = 15) @ApiModelProperty(value = "工号") + @TableId private java.lang.String gh; /**姓名*/ @Excel(name = "姓名", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/log/entity/KcOldEvaluationansBad.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/log/entity/KcOldEvaluationansBad.java index 1b104cf1..d9b119d8 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/log/entity/KcOldEvaluationansBad.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/log/entity/KcOldEvaluationansBad.java @@ -43,6 +43,7 @@ public class KcOldEvaluationansBad implements Serializable { /**上课教师工号*/ @Excel(name = "上课教师工号", width = 15) @ApiModelProperty(value = "上课教师工号") + @TableId private java.lang.String jgh; /**上课教师*/ @Excel(name = "上课教师", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/log/entity/KcOldEvaluationansGood.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/log/entity/KcOldEvaluationansGood.java index 2ad51b0a..33afc056 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/log/entity/KcOldEvaluationansGood.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/log/entity/KcOldEvaluationansGood.java @@ -43,6 +43,7 @@ public class KcOldEvaluationansGood implements Serializable { /**上课教师工号*/ @Excel(name = "上课教师工号", width = 15) @ApiModelProperty(value = "上课教师工号") + @TableId private java.lang.String jgh; /**上课教师*/ @Excel(name = "上课教师", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcJiaoshixinxibiao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcJiaoshixinxibiao.java index b704bbe7..c0b398ad 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcJiaoshixinxibiao.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcJiaoshixinxibiao.java @@ -35,6 +35,7 @@ public class KcJiaoshixinxibiao implements Serializable { /**教室编号*/ @Excel(name = "教室编号", width = 15) @ApiModelProperty(value = "教室编号") + @TableId private java.lang.String jsbh; /**教室名称*/ @Excel(name = "教室名称", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsHisrecord/entity/KcEvaluationsHisrecord.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsHisrecord/entity/KcEvaluationsHisrecord.java index ae01f03c..9b834788 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsHisrecord/entity/KcEvaluationsHisrecord.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsHisrecord/entity/KcEvaluationsHisrecord.java @@ -39,6 +39,7 @@ public class KcEvaluationsHisrecord implements Serializable { /**课程编号*/ @Excel(name = "课程编号", width = 15) @ApiModelProperty(value = "课程编号") + @TableId private java.lang.String kcbh; /**课程名称*/ @Excel(name = "课程名称", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java index d230ec49..d5e11429 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java @@ -32,6 +32,7 @@ public class KcEvaluationsStat implements Serializable { /**主键*/ @ApiModelProperty(value = "主键") + @TableId private java.lang.String col00; /**学期*/ @Excel(name = "学期", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcOldEvaluationans.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcOldEvaluationans.java index b046350b..8cb656bb 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcOldEvaluationans.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcOldEvaluationans.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -43,6 +41,7 @@ public class KcOldEvaluationans implements Serializable { /**上课教师工号*/ @Excel(name = "上课教师工号", width = 15) @ApiModelProperty(value = "上课教师工号") + @TableId private java.lang.String jgh; /**上课教师*/ @Excel(name = "上课教师", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tksf/kctkcstj/entity/KcTkcstj.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tksf/kctkcstj/entity/KcTkcstj.java index 5c2e4d95..e2babec6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tksf/kctkcstj/entity/KcTkcstj.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tksf/kctkcstj/entity/KcTkcstj.java @@ -39,6 +39,7 @@ public class KcTkcstj implements Serializable { /**教师工号*/ @Excel(name = "教师工号", width = 15) @ApiModelProperty(value = "教师工号") + @TableId private java.lang.String jgh; /**教师姓名*/ @Excel(name = "教师姓名", width = 15) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tksf/kctksfrzb/entity/KcTksfrzb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tksf/kctksfrzb/entity/KcTksfrzb.java index 05ce8e58..fda77c78 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tksf/kctksfrzb/entity/KcTksfrzb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tksf/kctksfrzb/entity/KcTksfrzb.java @@ -33,6 +33,7 @@ public class KcTksfrzb implements Serializable { /**工号*/ @Excel(name = "工号", width = 15) @ApiModelProperty(value = "工号") + @TableId private java.lang.String gh; /**姓名*/ @Excel(name = "姓名", width = 15) diff --git a/pom.xml b/pom.xml index c442bb66..2352fcbb 100644 --- a/pom.xml +++ b/pom.xml @@ -147,6 +147,16 @@ com.baidu.aip java-sdk 4.16.18 + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-simple + +