diff --git a/backend/roomroot-admin/src/main/java/com/roomroot/web/controller/jwgl/ClassRoomCalendarController.java b/backend/roomroot-admin/src/main/java/com/roomroot/web/controller/jwgl/ClassRoomCalendarController.java
index b31295e72..ada6bd465 100644
--- a/backend/roomroot-admin/src/main/java/com/roomroot/web/controller/jwgl/ClassRoomCalendarController.java
+++ b/backend/roomroot-admin/src/main/java/com/roomroot/web/controller/jwgl/ClassRoomCalendarController.java
@@ -5,6 +5,8 @@ import com.roomroot.jwgl.service.ClassRoomCalendarService;
import com.roomroot.jwgl.unit.PageQuery;
import com.roomroot.jwgl.unit.PageResult;
import com.roomroot.jwgl.unit.Result;
+import com.roomroot.jwgl.vo.classroom.VenueLessonVO;
+import com.roomroot.jwgl.vo.classroom.VenueScheduleItemVO;
import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.*;
@@ -86,4 +88,60 @@ public class ClassRoomCalendarController {
public Result> listByRq(@RequestParam("rq") String rq) {
return Result.success(calendarService.listByRq(rq));
}
+
+ /**
+ * 批量保存场地历事件(拖选区域写入,按 教室编号+日期+节次 判重覆盖)
+ */
+ @PostMapping("/batchSave")
+ public Result
> listByJsbhAndRange(@RequestParam("jsbh") String jsbh,
+ @RequestParam(value = "start", required = false) String start,
+ @RequestParam(value = "end", required = false) String end) {
+ return Result.success(calendarService.listByJsbhAndRange(jsbh, start, end));
+ }
+
+ /**
+ * 查询场地在日期范围内已排课次(编辑器蓝格数据源)
+ */
+ @GetMapping("/lessons")
+ public Result
> listVenueLessons(@RequestParam("jsbh") String jsbh,
+ @RequestParam(value = "start", required = false) String start,
+ @RequestParam(value = "end", required = false) String end,
+ @RequestParam(value = "nd", required = false) Integer nd) {
+ return Result.success(calendarService.listVenueLessons(jsbh, start, end, nd));
+ }
+
+ /**
+ * 查询指定本场地为专用教室的班次(编辑器顶部横幅数据源)
+ */
+ @GetMapping("/designatedTeams")
+ public Result
> listDesignatedTeams(@RequestParam("jsbh") String jsbh) {
+ return Result.success(calendarService.listDesignatedTeams(jsbh));
+ }
+
+ /**
+ * 场地占用总览:某日期+节次全部场地的占用状态
+ */
+ @GetMapping("/venueSchedule")
+ public Result
> venueSchedule(@RequestParam("rq") String rq,
+ @RequestParam("jc") Integer jc) {
+ return Result.success(calendarService.venueSchedule(rq, jc));
+ }
}
\ No newline at end of file
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BCKTJXRZSKJY.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BCKTJXRZSKJY.java
index 19d46f034..247ae6725 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BCKTJXRZSKJY.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BCKTJXRZSKJY.java
@@ -1,7 +1,6 @@
package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.*;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import java.time.LocalDateTime;
* 班次课堂教学日志_授课教员
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("班次课堂教学日志_授课教员")
-public class BCKTJXRZSKJY extends BaseEntity {
+public class BCKTJXRZSKJY {
@TableId(value = "编号", type = IdType.INPUT)
private String bh;
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BCXQJCXQB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BCXQJCXQB.java
index a4ac0bff4..32af229b0 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BCXQJCXQB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BCXQJCXQB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 班次学期教材需求表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("班次学期教材需求表")
-public class BCXQJCXQB extends BaseEntity {
+public class BCXQJCXQB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BK.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BK.java
index 363ac7b07..d974ed66c 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BK.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BK.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 补考
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("补考")
-public class BK extends BaseEntity {
+public class BK {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BKDDB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BKDDB.java
index 27fc2192b..3bc616c62 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BKDDB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BKDDB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 补考地点表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("补考地点表")
-public class BKDDB extends BaseEntity {
+public class BKDDB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BKJKB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BKJKB.java
index d2a0a2c68..2c505b5ed 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BKJKB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BKJKB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 补考监考表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("补考监考表")
-public class BKJKB extends BaseEntity {
+public class BKJKB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BKXY.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BKXY.java
index 94e99949e..a0fd642df 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BKXY.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BKXY.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 补考学员
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("补考学员")
-public class BKXY extends BaseEntity {
+public class BKXY {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BZMX.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BZMX.java
index a9b177d99..4fd04afc3 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BZMX.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BZMX.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 保障明细
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("保障明细")
-public class BZMX extends BaseEntity {
+public class BZMX {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BZTGMX.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BZTGMX.java
index 402b95068..95ae4988a 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BZTGMX.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/BZTGMX.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 保障提供明细
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("保障提供明细")
-public class BZTGMX extends BaseEntity {
+public class BZTGMX {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CJGGRZ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CJGGRZ.java
index 07f967295..855d02635 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CJGGRZ.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CJGGRZ.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 成绩更改日志
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("成绩更改日志")
-public class CJGGRZ extends BaseEntity {
+public class CJGGRZ {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPCPRYB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPCPRYB.java
index 0f421e02e..335d098a8 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPCPRYB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPCPRYB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 测评_参评人员表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("测评_参评人员表")
-public class CPCPRYB extends BaseEntity {
+public class CPCPRYB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPCPYWJGB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPCPYWJGB.java
index 57f5044b1..e07efe37a 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPCPYWJGB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPCPYWJGB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 测评_参评业务机关表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("测评_参评业务机关表")
-public class CPCPYWJGB extends BaseEntity {
+public class CPCPYWJGB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPJGPJJLB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPJGPJJLB.java
index 3c6f6e65e..728a7b1ba 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPJGPJJLB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPJGPJJLB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 测评_机关评价记录表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("测评_机关评价记录表")
-public class CPJGPJJLB extends BaseEntity {
+public class CPJGPJJLB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPNDCPB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPNDCPB.java
index a8880c130..764db5831 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPNDCPB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPNDCPB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 测评_年度测评表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("测评_年度测评表")
-public class CPNDCPB extends BaseEntity {
+public class CPNDCPB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPPCDJB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPPCDJB.java
index 781539588..463adc8fa 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPPCDJB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPPCDJB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 测评_评测登记表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("测评_评测登记表")
-public class CPPCDJB extends BaseEntity {
+public class CPPCDJB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPTXPJJLB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPTXPJJLB.java
index 7a5327778..b456200ad 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPTXPJJLB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CPTXPJJLB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 测评_同行评价记录表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("测评_同行评价记录表")
-public class CPTXPJJLB extends BaseEntity {
+public class CPTXPJJLB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CZRZB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CZRZB.java
index d55e56b3f..9aeb7ec05 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CZRZB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/CZRZB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 操作日志表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("操作日志表")
-public class CZRZB extends BaseEntity {
+public class CZRZB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DBVersion.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DBVersion.java
index 39afe0967..2e6fe64e2 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DBVersion.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DBVersion.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* DBVersion
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("DBVersion")
-public class DBVersion extends BaseEntity {
+public class DBVersion {
/**
* ID
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DDDLTBB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DDDLTBB.java
index 23d753d3a..08b7aadcf 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DDDLTBB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DDDLTBB.java
@@ -1,7 +1,6 @@
package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import java.time.LocalDateTime;
* 单点登录同步表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("单点登录同步表")
-public class DDDLTBB extends BaseEntity {
+public class DDDLTBB {
/**
* 统一账号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DKSQBZMX.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DKSQBZMX.java
index d009e03bd..d5dbe325f 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DKSQBZMX.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DKSQBZMX.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -14,9 +13,8 @@ import java.time.LocalDateTime;
* 调课申请_保障明细
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("调课申请_保障明细")
-public class DKSQBZMX extends BaseEntity {
+public class DKSQBZMX {
@TableId(value = "编号", type = IdType.INPUT)
private String bh;
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DKSQFZJY.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DKSQFZJY.java
index 48fbf05e5..93f9924f0 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DKSQFZJY.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DKSQFZJY.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -14,9 +13,8 @@ import java.time.LocalDateTime;
* 调课申请_辅助教员
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("调课申请_辅助教员")
-public class DKSQFZJY extends BaseEntity {
+public class DKSQFZJY {
@TableId(value = "编号", type = IdType.INPUT)
private String bh;
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DKSQJS.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DKSQJS.java
index 6b3241405..77e641cac 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DKSQJS.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DKSQJS.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -14,9 +13,8 @@ import java.time.LocalDateTime;
* 调课申请_教室
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("调课申请_教室")
-public class DKSQJS extends BaseEntity {
+public class DKSQJS {
@TableId(value = "编号", type = IdType.INPUT)
private String bh;
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DKSQXYD.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DKSQXYD.java
index 9a4ccf559..271deb6a7 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DKSQXYD.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DKSQXYD.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -14,9 +13,8 @@ import java.time.LocalDateTime;
* 调课申请_学员队
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("调课申请_学员队")
-public class DKSQXYD extends BaseEntity {
+public class DKSQXYD {
@TableId(value = "编号", type = IdType.INPUT)
private String bh;
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DLJLB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DLJLB.java
index f60bdf717..ce925eae5 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DLJLB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DLJLB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 登录记录表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("登录记录表")
-public class DLJLB extends BaseEntity {
+public class DLJLB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DLXXB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DLXXB.java
index 114740f54..0e59e0cb6 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DLXXB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DLXXB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 登录信息表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("登录信息表")
-public class DLXXB extends BaseEntity {
+public class DLXXB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DXJSGZ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DXJSGZ.java
index b38e59fe9..c2f375294 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DXJSGZ.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/DXJSGZ.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 单项计算规则
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("单项计算规则")
-public class DXJSGZ extends BaseEntity {
+public class DXJSGZ {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FWBDRWB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FWBDRWB.java
index df82cd09f..5b3912faa 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FWBDRWB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FWBDRWB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 服务部队任务表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("服务部队任务表")
-public class FWBDRWB extends BaseEntity {
+public class FWBDRWB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FWBDWPRYB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FWBDWPRYB.java
index 2dbfdc93a..301baf5e9 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FWBDWPRYB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FWBDWPRYB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 服务部队外派人员表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("服务部队外派人员表")
-public class FWBDWPRYB extends BaseEntity {
+public class FWBDWPRYB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FWBDWPRYSCFJB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FWBDWPRYSCFJB.java
index 3cc1a2172..961c6af83 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FWBDWPRYSCFJB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FWBDWPRYSCFJB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 服务部队外派人员上传附件表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("服务部队外派人员上传附件表")
-public class FWBDWPRYSCFJB extends BaseEntity {
+public class FWBDWPRYSCFJB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FWBDXQB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FWBDXQB.java
index 248435ad3..f30176f12 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FWBDXQB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FWBDXQB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 服务部队需求表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("服务部队需求表")
-public class FWBDXQB extends BaseEntity {
+public class FWBDXQB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FWBDXQFJB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FWBDXQFJB.java
index af1c5da1b..ccb9db856 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FWBDXQFJB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FWBDXQFJB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 服务部队需求附件表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("服务部队需求附件表")
-public class FWBDXQFJB extends BaseEntity {
+public class FWBDXQFJB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSSSXXM.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSSSXXM.java
index 845f731e2..c2dbb68e5 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSSSXXM.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSSSXXM.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 方向课题师生双选项目
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("方向课题师生双选项目")
-public class FXKTSSSXXM extends BaseEntity {
+public class FXKTSSSXXM {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSXXMBC.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSXXMBC.java
index 66282c04b..010a68046 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSXXMBC.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSXXMBC.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 方向课题双选项目_班次
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("方向课题双选项目_班次")
-public class FXKTSXXMBC extends BaseEntity {
+public class FXKTSXXMBC {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSXXMDS.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSXXMDS.java
index 1e0cde2f6..90541dce9 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSXXMDS.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSXXMDS.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 方向课题双选项目_导师
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("方向课题双选项目_导师")
-public class FXKTSXXMDS extends BaseEntity {
+public class FXKTSXXMDS {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSXXMFXKT.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSXXMFXKT.java
index 03e9fa078..6e6c1fdfb 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSXXMFXKT.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSXXMFXKT.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 方向课题双选项目_方向课题
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("方向课题双选项目_方向课题")
-public class FXKTSXXMFXKT extends BaseEntity {
+public class FXKTSXXMFXKT {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSXXMSXJGB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSXXMSXJGB.java
index 6bc9ab7ef..fad938118 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSXXMSXJGB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSXXMSXJGB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 方向课题双选项目_双选结果表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("方向课题双选项目_双选结果表")
-public class FXKTSXXMSXJGB extends BaseEntity {
+public class FXKTSXXMSXJGB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSXXMXY.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSXXMXY.java
index e4b255b12..d28f9f0f4 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSXXMXY.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FXKTSXXMXY.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 方向课题双选项目_学员
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("方向课题双选项目_学员")
-public class FXKTSXXMXY extends BaseEntity {
+public class FXKTSXXMXY {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FZQZBZ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FZQZBZ.java
index 749f6822f..801265bf3 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FZQZBZ.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FZQZBZ.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 分值权重标准
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("分值权重标准")
-public class FZQZBZ extends BaseEntity {
+public class FZQZBZ {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FZQZBZQZGZ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FZQZBZQZGZ.java
index 9bff3e6f6..7b72d5d3e 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FZQZBZQZGZ.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FZQZBZQZGZ.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 分值权重标准_权重规则
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("分值权重标准_权重规则")
-public class FZQZBZQZGZ extends BaseEntity {
+public class FZQZBZQZGZ {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FZZHGZBZCPJGYS.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FZZHGZBZCPJGYS.java
index b8718e2fc..8850de4e5 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FZZHGZBZCPJGYS.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FZZHGZBZCPJGYS.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 分值转换规则标准_测评结果样式
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("分值转换规则标准_测评结果样式")
-public class FZZHGZBZCPJGYS extends BaseEntity {
+public class FZZHGZBZCPJGYS {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FZZHGZBZZHGZ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FZZHGZBZZHGZ.java
index d3c2a9d10..e0c804823 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FZZHGZBZZHGZ.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/FZZHGZBZZHGZ.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 分值转换规则标准_转换规则
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("分值转换规则标准_转换规则")
-public class FZZHGZBZZHGZ extends BaseEntity {
+public class FZZHGZBZZHGZ {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKJL.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKJL.java
index 8486f0e3d..56bf44258 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKJL.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKJL.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 跟查课记录
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("跟查课记录")
-public class GCKJL extends BaseEntity {
+public class GCKJL {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKJLPJJY.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKJLPJJY.java
index 877d2b294..a18313d8c 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKJLPJJY.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKJLPJJY.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 跟查课记录_评价教员
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("跟查课记录_评价教员")
-public class GCKJLPJJY extends BaseEntity {
+public class GCKJLPJJY {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKLDJL.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKLDJL.java
index 78ff08fce..80e5cee1e 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKLDJL.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKLDJL.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 跟查课领导记录
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("跟查课领导记录")
-public class GCKLDJL extends BaseEntity {
+public class GCKLDJL {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKLDJLPJJY.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKLDJLPJJY.java
index 211a905b9..9e4b616e5 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKLDJLPJJY.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKLDJLPJJY.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 跟查课领导记录_评价教员
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("跟查课领导记录_评价教员")
-public class GCKLDJLPJJY extends BaseEntity {
+public class GCKLDJLPJJY {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKZJ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKZJ.java
index 1f695fb32..714cdfed5 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKZJ.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKZJ.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,9 +12,8 @@ import java.time.LocalDateTime;
* 跟查课专家
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("跟查课专家")
-public class GCKZJ extends BaseEntity {
+public class GCKZJ {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKZJPJJY.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKZJPJJY.java
index 283f6fc97..16d988c8f 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKZJPJJY.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GCKZJPJJY.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 跟查课专家_评价教员
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("跟查课专家_评价教员")
-public class GCKZJPJJY extends BaseEntity {
+public class GCKZJPJJY {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GKLDCKB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GKLDCKB.java
index c4b505a32..b2af31cac 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GKLDCKB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GKLDCKB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 跟课领导参考表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("跟课领导参考表")
-public class GKLDCKB extends BaseEntity {
+public class GKLDCKB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GKLDLBZBB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GKLDLBZBB.java
index ceef9f6aa..e42388559 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GKLDLBZBB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GKLDLBZBB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 跟课领导类别指标表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("跟课领导类别指标表")
-public class GKLDLBZBB extends BaseEntity {
+public class GKLDLBZBB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GKZJCKB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GKZJCKB.java
index 1bc25dc21..3e1dea70f 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GKZJCKB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GKZJCKB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 跟课专家参考表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("跟课专家参考表")
-public class GKZJCKB extends BaseEntity {
+public class GKZJCKB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GZTKJGRY.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GZTKJGRY.java
index 3f9e72372..1589182b6 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GZTKJGRY.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GZTKJGRY.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 关注听课机关人员
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("关注听课机关人员")
-public class GZTKJGRY extends BaseEntity {
+public class GZTKJGRY {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GZTKJY.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GZTKJY.java
index 461e9e158..91c1c299b 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GZTKJY.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/GZTKJY.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 关注听课教员
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("关注听课教员")
-public class GZTKJY extends BaseEntity {
+public class GZTKJY {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JCSJB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JCSJB.java
index 4e5ea0f95..4c565d733 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JCSJB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JCSJB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 节次时间表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("节次时间表")
-public class JCSJB extends BaseEntity {
+public class JCSJB {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JG.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JG.java
index 800fedd5f..9f4162449 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JG.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JG.java
@@ -1,7 +1,6 @@
package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -9,9 +8,8 @@ import lombok.EqualsAndHashCode;
* 结果
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("结果")
-public class JG extends BaseEntity {
+public class JG {
/**
* 年度
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JGRYDLB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JGRYDLB.java
index 935b3e58a..c913598ba 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JGRYDLB.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JGRYDLB.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 机关人员登录表
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("机关人员登录表")
-public class JGRYDLB extends BaseEntity {
+public class JGRYDLB {
/**
* 机关人员编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JSFSKSXS.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JSFSKSXS.java
index 825355b27..97172c802 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JSFSKSXS.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JSFSKSXS.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 讲授方式课时系数
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("讲授方式课时系数")
-public class JSFSKSXS extends BaseEntity {
+public class JSFSKSXS {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JSZW.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JSZW.java
index 43eaa5d8d..71340cb6c 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JSZW.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JSZW.java
@@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode;
* 技术职务
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("技术职务")
-public class JSZW extends BaseEntity {
+public class JSZW {
/**
* 编号
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JSZWKSFBZ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JSZWKSFBZ.java
index caeac3a70..ecb676a3c 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JSZWKSFBZ.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JSZWKSFBZ.java
@@ -1,7 +1,6 @@
package com.roomroot.jwgl.entity;
import com.baomidou.mybatisplus.annotation.*;
-import com.roomroot.jwgl.unit.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -14,9 +13,8 @@ import java.time.LocalDateTime;
*
+ * 注意:该表为历史遗留表,无 create_time/update_time/create_by/update_by/del_flag 审计列, + * 不能继承 BaseEntity,否则 MyBatis-Plus 会拼出不存在的列。 + *
*/ @Data -@EqualsAndHashCode(callSuper = true) @TableName("实施_课程表_教室") -public class SSKCBJS extends BaseEntity { +public class SSKCBJS { /** * 编号 @@ -26,31 +28,37 @@ public class SSKCBJS extends BaseEntity { /** * 实施_课程表编号 */ + @TableField("实施_课程表编号") private String sskcbbh; /** * 教室编号 */ + @TableField("教室编号") private String jsbh; /** * 备注 */ + @TableField("备注") private String bz; /** * 年度 */ + @TableField("年度") private Integer nd; /** * 日期 */ + @TableField("日期") private LocalDateTime rq; /** * 节次 */ + @TableField("节次") private Integer jc; } diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSKCBXYD.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSKCBXYD.java index 8230f67c8..11f7aad2b 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSKCBXYD.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSKCBXYD.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 实施_课程表_学员队 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("实施_课程表_学员队") -public class SSKCBXYD extends BaseEntity { +public class SSKCBXYD { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSKCXYD.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSKCXYD.java index 336714084..d3789321a 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSKCXYD.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSKCXYD.java @@ -2,7 +2,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import lombok.EqualsAndHashCode; * (如 SSKCBH),导致 isScheduled 等查询运行时报 Invalid column。 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("实施_课程学员队") -public class SSKCXYD extends BaseEntity { +public class SSKCXYD { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSOAppInfo.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSOAppInfo.java index 0f88b1d3d..15fcce71e 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSOAppInfo.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSOAppInfo.java @@ -1,17 +1,17 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableField; +import java.time.LocalDateTime; /** * SSO_AppInfo */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("SSO_AppInfo") -public class SSOAppInfo extends BaseEntity { +public class SSOAppInfo { /** * ID @@ -53,4 +53,11 @@ public class SSOAppInfo extends BaseEntity { */ private Boolean isEnable; + + /** + * CreateTime(本表列为 PascalCase 命名,非通用审计列,故不继承 BaseEntity) + */ + @TableField("\"CreateTime\"") + private LocalDateTime createTime; + } diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSOUserAuthOperate.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSOUserAuthOperate.java index 251370637..dbd669565 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSOUserAuthOperate.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSOUserAuthOperate.java @@ -1,17 +1,17 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableField; +import java.time.LocalDateTime; /** * SSO_UserAuthOperate */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("SSO_UserAuthOperate") -public class SSOUserAuthOperate extends BaseEntity { +public class SSOUserAuthOperate { /** * ID @@ -33,4 +33,11 @@ public class SSOUserAuthOperate extends BaseEntity { */ private String ipAddress; + + /** + * CreateTime(本表列为 PascalCase 命名,非通用审计列,故不继承 BaseEntity) + */ + @TableField("\"CreateTime\"") + private LocalDateTime createTime; + } diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSOUserAuthSession.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSOUserAuthSession.java index 9ee810327..75fd76571 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSOUserAuthSession.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSOUserAuthSession.java @@ -1,19 +1,18 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableField; /** * SSO_UserAuthSession */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("SSO_UserAuthSession") -public class SSOUserAuthSession extends BaseEntity { +public class SSOUserAuthSession { /** * SessionKey @@ -50,4 +49,11 @@ public class SSOUserAuthSession extends BaseEntity { */ private LocalDateTime invalidTime; + + /** + * CreateTime(本表列为 PascalCase 命名,非通用审计列,故不继承 BaseEntity) + */ + @TableField("\"CreateTime\"") + private LocalDateTime createTime; + } diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/TCKGLY.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/TCKGLY.java index 80e80044e..4efea8192 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/TCKGLY.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/TCKGLY.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode; * 听查课管理员 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("听查课管理员") -public class TCKGLY extends BaseEntity { +public class TCKGLY { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/TCKGLYDLB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/TCKGLYDLB.java index 325f2a0c8..c67aa6717 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/TCKGLYDLB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/TCKGLYDLB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode; * 听查课管理员登录表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("听查课管理员登录表") -public class TCKGLYDLB extends BaseEntity { +public class TCKGLYDLB { /** * 听查课管理员编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/TGB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/TGB.java index fe6e92389..55db3c9cc 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/TGB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/TGB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 通告表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("通告表") -public class TGB extends BaseEntity { +public class TGB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/TGYHXX.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/TGYHXX.java index 395e6d9e8..c4eab1f78 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/TGYHXX.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/TGYHXX.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 通告用户信息 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("通告用户信息") -public class TGYHXX extends BaseEntity { +public class TGYHXX { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/TKJL.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/TKJL.java index e2f55f236..7a97733e4 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/TKJL.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/TKJL.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 听课记录 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("听课记录") -public class TKJL extends BaseEntity { +public class TKJL { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/WJ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/WJ.java index 169332f28..3a3fc0edd 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/WJ.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/WJ.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 文件 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("文件") -public class WJ extends BaseEntity { +public class WJ { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/WSRYZCB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/WSRYZCB.java index 7e1ba460f..50d8fdda1 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/WSRYZCB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/WSRYZCB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode; * 文书_人员组成表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("文书_人员组成表") -public class WSRYZCB extends BaseEntity { +public class WSRYZCB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/WSSXB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/WSSXB.java index f9f0730bc..5d71a2257 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/WSSXB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/WSSXB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 文书_事项表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("文书_事项表") -public class WSSXB extends BaseEntity { +public class WSSXB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/WSWDB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/WSWDB.java index 1ba990a22..663ebc3f1 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/WSWDB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/WSWDB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode; * 文书_文档表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("文书_文档表") -public class WSWDB extends BaseEntity { +public class WSWDB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XQJYKCSKQKB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XQJYKCSKQKB.java index 7ba5588ac..db69ef2bf 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XQJYKCSKQKB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XQJYKCSKQKB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode; * 学期教员课程授课情况表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学期教员课程授课情况表") -public class XQJYKCSKQKB extends BaseEntity { +public class XQJYKCSKQKB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XQJYXXB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XQJYXXB.java index 906071c82..f4fec3059 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XQJYXXB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XQJYXXB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 学期教员信息表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学期教员信息表") -public class XQJYXXB extends BaseEntity { +public class XQJYXXB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XQWTKYYDJB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XQWTKYYDJB.java index 719c19ce8..428356948 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XQWTKYYDJB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XQWTKYYDJB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 学期未听课原因登记表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学期未听课原因登记表") -public class XQWTKYYDJB extends BaseEntity { +public class XQWTKYYDJB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYCPCPXMB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYCPCPXMB.java index 74f236244..6f953da9a 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYCPCPXMB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYCPCPXMB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 学员测评_测评项模板 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学员测评_测评项模板") -public class XYCPCPXMB extends BaseEntity { +public class XYCPCPXMB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYDDLB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYDDLB.java index 0c7ce354d..a08b8e395 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYDDLB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYDDLB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode; * 学员队登录表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学员队登录表") -public class XYDDLB extends BaseEntity { +public class XYDDLB { /** * 学员队编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYDMYDCPCPB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYDMYDCPCPB.java index f984dd133..420389389 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYDMYDCPCPB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYDMYDCPCPB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode; * 学员队满意度测评_测评表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学员队满意度测评_测评表") -public class XYDMYDCPCPB extends BaseEntity { +public class XYDMYDCPCPB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYDPBXX.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYDPBXX.java index 765de6eca..d7d52edc3 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYDPBXX.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYDPBXX.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 学员队拼班信息 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学员队拼班信息") -public class XYDPBXX extends BaseEntity { +public class XYDPBXX { /** * 学员队编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYFBLJB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYFBLJB.java index de97af818..f3054a1e2 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYFBLJB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYFBLJB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 学员分班留级表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学员分班留级表") -public class XYFBLJB extends BaseEntity { +public class XYFBLJB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYKCBKCP.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYKCBKCP.java index a19da8737..04c0a7d59 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYKCBKCP.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYKCBKCP.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 学员_课程板块测评 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学员_课程板块测评") -public class XYKCBKCP extends BaseEntity { +public class XYKCBKCP { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYKCBKCPQZX.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYKCBKCPQZX.java index d31351331..6e347370d 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYKCBKCPQZX.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYKCBKCPQZX.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 学员_课程板块测评_权重项 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学员_课程板块测评_权重项") -public class XYKCBKCPQZX extends BaseEntity { +public class XYKCBKCPQZX { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYKCCJ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYKCCJ.java index fa76fa748..dc188fa93 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYKCCJ.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYKCCJ.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode; * 学员课程成绩 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学员课程成绩") -public class XYKCCJ extends BaseEntity { +public class XYKCCJ { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYKCGCCJ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYKCGCCJ.java index 47bdd6f82..2a771ee57 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYKCGCCJ.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYKCGCCJ.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode; * 学员课程过程成绩 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学员课程过程成绩") -public class XYKCGCCJ extends BaseEntity { +public class XYKCGCCJ { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYMYDCPCPBC.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYMYDCPCPBC.java index 2f63a3e55..2a0706fcf 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYMYDCPCPBC.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYMYDCPCPBC.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 学员满意度测评_参评班次 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学员满意度测评_参评班次") -public class XYMYDCPCPBC extends BaseEntity { +public class XYMYDCPCPBC { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYMYDCPCPXY.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYMYDCPCPXY.java index ea51f5bcf..b8aa31b54 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYMYDCPCPXY.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYMYDCPCPXY.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 学员满意度测评_参评学员 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学员满意度测评_参评学员") -public class XYMYDCPCPXY extends BaseEntity { +public class XYMYDCPCPXY { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYMYDCPXM.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYMYDCPXM.java index 7c7d47938..ca38ba915 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYMYDCPXM.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYMYDCPXM.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 学员满意度测评项目 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学员满意度测评项目") -public class XYMYDCPXM extends BaseEntity { +public class XYMYDCPXM { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYMYDCPXMCPX.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYMYDCPXMCPX.java index 3849460bd..401b1d35a 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYMYDCPXMCPX.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYMYDCPXMCPX.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 学员满意度测评项目_测评项 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学员满意度测评项目_测评项") -public class XYMYDCPXMCPX extends BaseEntity { +public class XYMYDCPXMCPX { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYPBB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYPBB.java index 830386822..42b68e720 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYPBB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYPBB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 学员拼班表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学员拼班表") -public class XYPBB extends BaseEntity { +public class XYPBB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYSKJYCPB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYSKJYCPB.java index 86c56e067..655671277 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYSKJYCPB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYSKJYCPB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 学员_授课教员_测评表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学员_授课教员_测评表") -public class XYSKJYCPB extends BaseEntity { +public class XYSKJYCPB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYSKJYCPBQZX.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYSKJYCPBQZX.java index 7f229ab6c..3dcfe61bf 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYSKJYCPBQZX.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYSKJYCPBQZX.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode; * 学员_授课教员_测评表_权重项 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学员_授课教员_测评表_权重项") -public class XYSKJYCPBQZX extends BaseEntity { +public class XYSKJYCPBQZX { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYSKJYJCCPB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYSKJYJCCPB.java index e84b6f71d..e1dd826c1 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYSKJYJCCPB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYSKJYJCCPB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 学员_授课教员_节次_测评表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学员_授课教员_节次_测评表") -public class XYSKJYJCCPB extends BaseEntity { +public class XYSKJYJCCPB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYSKJYJCCPBQZX.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYSKJYJCCPBQZX.java index 21fbf063f..90550dd3e 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYSKJYJCCPBQZX.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYSKJYJCCPBQZX.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode; * 学员_授课教员_节次_测评表_权重项 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学员_授课教员_节次_测评表_权重项") -public class XYSKJYJCCPBQZX extends BaseEntity { +public class XYSKJYJCCPBQZX { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYXXB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYXXB.java index 36666baa2..fbb9687ca 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYXXB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYXXB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 学员信息表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学员信息表") -public class XYXXB extends BaseEntity { +public class XYXXB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYXXBB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYXXBB.java index 40708f190..88ebbf81e 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYXXBB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYXXBB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 学员信息备表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学员信息备表") -public class XYXXBB extends BaseEntity { +public class XYXXBB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYXXGGRZ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYXXGGRZ.java index 5c6de27fb..0602e0be7 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYXXGGRZ.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XYXXGGRZ.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 学员信息更改日志 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("学员信息更改日志") -public class XYXXGGRZ extends BaseEntity { +public class XYXXGGRZ { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/YCB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/YCB.java index 0afabf1a8..bf5b91273 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/YCB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/YCB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 异常表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("异常表") -public class YCB extends BaseEntity { +public class YCB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/YHB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/YHB.java index 174e3f382..90c97a9dd 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/YHB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/YHB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode; * 用户表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("用户表") -public class YHB extends BaseEntity { +public class YHB { /** * 用户帐号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/YHDLB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/YHDLB.java index b8cf9e6e2..49badd526 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/YHDLB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/YHDLB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode; * 用户登录表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("用户登录表") -public class YHDLB extends BaseEntity { +public class YHDLB { /** * 用户账号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/YJFKB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/YJFKB.java index 108d310c0..9581c9911 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/YJFKB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/YJFKB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 意见反馈表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("意见反馈表") -public class YJFKB extends BaseEntity { +public class YJFKB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZHPDGZ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZHPDGZ.java index 5d20ab373..84fd646d0 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZHPDGZ.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZHPDGZ.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 综合评定规则 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("综合评定规则") -public class ZHPDGZ extends BaseEntity { +public class ZHPDGZ { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZHPDGZJYSJLRDGZ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZHPDGZJYSJLRDGZ.java index eefd4aa10..76e3b4735 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZHPDGZJYSJLRDGZ.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZHPDGZJYSJLRDGZ.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode; * 综合评定规则_教研室结论认定规则 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("综合评定规则_教研室结论认定规则") -public class ZHPDGZJYSJLRDGZ extends BaseEntity { +public class ZHPDGZJYSJLRDGZ { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZHPDGZZHJSGZ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZHPDGZZHJSGZ.java index 04673d1fe..4f9b0f6b0 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZHPDGZZHJSGZ.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZHPDGZZHJSGZ.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode; * 综合评定规则_综合计算规则 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("综合评定规则_综合计算规则") -public class ZHPDGZZHJSGZ extends BaseEntity { +public class ZHPDGZZHJSGZ { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZHZTB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZHZTB.java index 4980ccc3d..217a85a4b 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZHZTB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZHZTB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 账户状态表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("账户状态表") -public class ZHZTB extends BaseEntity { +public class ZHZTB { /** * 登录信息编号(主键,关联登录信息表.编号) diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZJDDCPMB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZJDDCPMB.java index 0e1a5bfc8..46b6511c8 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZJDDCPMB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZJDDCPMB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,9 +12,8 @@ import java.time.LocalDateTime; * 专家督导_测评模板 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("专家督导_测评模板") -public class ZJDDCPMB extends BaseEntity { +public class ZJDDCPMB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZYBZLB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZYBZLB.java index 9cb9be35d..b88b442c0 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZYBZLB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/ZYBZLB.java @@ -3,7 +3,6 @@ package com.roomroot.jwgl.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,9 +10,8 @@ import lombok.EqualsAndHashCode; * 专业保障类别 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("专业保障类别") -public class ZYBZLB extends BaseEntity { +public class ZYBZLB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/KCBBZMXMapper.xml b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/KCBBZMXMapper.xml index 25626646d..3d6af12ba 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/KCBBZMXMapper.xml +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/KCBBZMXMapper.xml @@ -19,7 +19,6 @@+ * 按 (教室编号, 日期, 节次) 判重:已存在则更新可排课/名称/备注,不存在则插入。 + *
+ * + * @param list 场地历事件列表(jsbh/rq/jc 必填) + * @return 写入条数 + */ + int batchSave(List