From 2e151ea2284542517346bba3cbda8667e55592c9 Mon Sep 17 00:00:00 2001 From: liweijie Date: Wed, 16 Sep 2026 16:37:23 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E6=95=99=E5=AD=A6?= =?UTF-8?q?=E5=9C=BA=E5=9C=B0=E5=8E=86=EF=BC=9B=202=E3=80=81=E5=BE=88?= =?UTF-8?q?=E5=A4=9A=E8=A1=A8=E7=BB=A7=E6=89=BF=E4=BA=86=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E4=BD=86=E6=98=AF=E6=B2=A1=E6=9C=89=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AF=B9=E5=BA=94=E5=AD=97=E6=AE=B5=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=8A=A5=E9=94=99=EF=BC=8C=E6=8A=8A=E7=BB=A7=E6=89=BF=E5=8E=BB?= =?UTF-8?q?=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jwgl/ClassRoomCalendarController.java | 58 +++ .../roomroot/jwgl/entity/BCKTJXRZSKJY.java | 4 +- .../com/roomroot/jwgl/entity/BCXQJCXQB.java | 4 +- .../java/com/roomroot/jwgl/entity/BK.java | 4 +- .../java/com/roomroot/jwgl/entity/BKDDB.java | 4 +- .../java/com/roomroot/jwgl/entity/BKJKB.java | 4 +- .../java/com/roomroot/jwgl/entity/BKXY.java | 4 +- .../java/com/roomroot/jwgl/entity/BZMX.java | 4 +- .../java/com/roomroot/jwgl/entity/BZTGMX.java | 4 +- .../java/com/roomroot/jwgl/entity/CJGGRZ.java | 4 +- .../com/roomroot/jwgl/entity/CPCPRYB.java | 4 +- .../com/roomroot/jwgl/entity/CPCPYWJGB.java | 4 +- .../com/roomroot/jwgl/entity/CPJGPJJLB.java | 4 +- .../com/roomroot/jwgl/entity/CPNDCPB.java | 4 +- .../com/roomroot/jwgl/entity/CPPCDJB.java | 4 +- .../com/roomroot/jwgl/entity/CPTXPJJLB.java | 4 +- .../java/com/roomroot/jwgl/entity/CZRZB.java | 4 +- .../com/roomroot/jwgl/entity/DBVersion.java | 4 +- .../com/roomroot/jwgl/entity/DDDLTBB.java | 4 +- .../com/roomroot/jwgl/entity/DKSQBZMX.java | 4 +- .../com/roomroot/jwgl/entity/DKSQFZJY.java | 4 +- .../java/com/roomroot/jwgl/entity/DKSQJS.java | 4 +- .../com/roomroot/jwgl/entity/DKSQXYD.java | 4 +- .../java/com/roomroot/jwgl/entity/DLJLB.java | 4 +- .../java/com/roomroot/jwgl/entity/DLXXB.java | 4 +- .../java/com/roomroot/jwgl/entity/DXJSGZ.java | 4 +- .../com/roomroot/jwgl/entity/FWBDRWB.java | 4 +- .../com/roomroot/jwgl/entity/FWBDWPRYB.java | 4 +- .../roomroot/jwgl/entity/FWBDWPRYSCFJB.java | 4 +- .../com/roomroot/jwgl/entity/FWBDXQB.java | 4 +- .../com/roomroot/jwgl/entity/FWBDXQFJB.java | 4 +- .../com/roomroot/jwgl/entity/FXKTSSSXXM.java | 4 +- .../com/roomroot/jwgl/entity/FXKTSXXMBC.java | 4 +- .../com/roomroot/jwgl/entity/FXKTSXXMDS.java | 4 +- .../roomroot/jwgl/entity/FXKTSXXMFXKT.java | 4 +- .../roomroot/jwgl/entity/FXKTSXXMSXJGB.java | 4 +- .../com/roomroot/jwgl/entity/FXKTSXXMXY.java | 4 +- .../java/com/roomroot/jwgl/entity/FZQZBZ.java | 4 +- .../com/roomroot/jwgl/entity/FZQZBZQZGZ.java | 4 +- .../roomroot/jwgl/entity/FZZHGZBZCPJGYS.java | 4 +- .../roomroot/jwgl/entity/FZZHGZBZZHGZ.java | 4 +- .../java/com/roomroot/jwgl/entity/GCKJL.java | 4 +- .../com/roomroot/jwgl/entity/GCKJLPJJY.java | 4 +- .../com/roomroot/jwgl/entity/GCKLDJL.java | 4 +- .../com/roomroot/jwgl/entity/GCKLDJLPJJY.java | 4 +- .../java/com/roomroot/jwgl/entity/GCKZJ.java | 4 +- .../com/roomroot/jwgl/entity/GCKZJPJJY.java | 4 +- .../com/roomroot/jwgl/entity/GKLDCKB.java | 4 +- .../com/roomroot/jwgl/entity/GKLDLBZBB.java | 4 +- .../com/roomroot/jwgl/entity/GKZJCKB.java | 4 +- .../com/roomroot/jwgl/entity/GZTKJGRY.java | 4 +- .../java/com/roomroot/jwgl/entity/GZTKJY.java | 4 +- .../java/com/roomroot/jwgl/entity/JCSJB.java | 4 +- .../java/com/roomroot/jwgl/entity/JG.java | 4 +- .../com/roomroot/jwgl/entity/JGRYDLB.java | 4 +- .../com/roomroot/jwgl/entity/JSFSKSXS.java | 4 +- .../java/com/roomroot/jwgl/entity/JSZW.java | 4 +- .../com/roomroot/jwgl/entity/JSZWKSFBZ.java | 4 +- .../com/roomroot/jwgl/entity/JXCDLBRW.java | 4 +- .../java/com/roomroot/jwgl/entity/JXGLJG.java | 4 +- .../com/roomroot/jwgl/entity/JXRWJCXQB.java | 4 +- .../com/roomroot/jwgl/entity/JXRZJYKSBZ.java | 4 +- .../com/roomroot/jwgl/entity/JXRZKSBZSPB.java | 4 +- .../com/roomroot/jwgl/entity/JXSSJHTJB.java | 4 +- .../java/com/roomroot/jwgl/entity/JYDLB.java | 4 +- .../java/com/roomroot/jwgl/entity/JYKSBZ.java | 4 +- .../java/com/roomroot/jwgl/entity/JYL.java | 4 +- .../com/roomroot/jwgl/entity/JYNZKSF.java | 4 +- .../java/com/roomroot/jwgl/entity/JYSDLB.java | 4 +- .../com/roomroot/jwgl/entity/JYZJZGB.java | 4 +- .../com/roomroot/jwgl/entity/KCBBZMX.java | 4 +- .../java/com/roomroot/jwgl/entity/KCBMBB.java | 4 +- .../java/com/roomroot/jwgl/entity/KCBZFJ.java | 4 +- .../java/com/roomroot/jwgl/entity/KCBZSP.java | 4 +- .../java/com/roomroot/jwgl/entity/KCBZXX.java | 4 +- .../java/com/roomroot/jwgl/entity/KCCJ.java | 4 +- .../java/com/roomroot/jwgl/entity/KCGCCJ.java | 4 +- .../java/com/roomroot/jwgl/entity/KCJC.java | 4 +- .../com/roomroot/jwgl/entity/KCJXYX_CZRZ.java | 4 +- .../java/com/roomroot/jwgl/entity/KLXB.java | 4 +- .../java/com/roomroot/jwgl/entity/KSB.java | 4 +- .../java/com/roomroot/jwgl/entity/KSBZXM.java | 4 +- .../java/com/roomroot/jwgl/entity/KTJXFF.java | 4 +- .../com/roomroot/jwgl/entity/KTJXFFKSXS.java | 4 +- .../com/roomroot/jwgl/entity/KTRZXYKQB.java | 4 +- .../com/roomroot/jwgl/entity/KYKJJXSBB.java | 4 +- .../com/roomroot/jwgl/entity/KYKYCGB.java | 4 +- .../com/roomroot/jwgl/entity/KYKYJFB.java | 4 +- .../com/roomroot/jwgl/entity/KYKYXMB.java | 4 +- .../com/roomroot/jwgl/entity/KYSBGLB.java | 4 +- .../com/roomroot/jwgl/entity/KYSYSJSB.java | 4 +- .../com/roomroot/jwgl/entity/KYXSJLB.java | 4 +- .../java/com/roomroot/jwgl/entity/KYZDKB.java | 4 +- .../com/roomroot/jwgl/entity/LBSBXXB.java | 4 +- .../com/roomroot/jwgl/entity/LBZYGLPT.java | 4 +- .../com/roomroot/jwgl/entity/LDGCKCPMB.java | 4 +- .../java/com/roomroot/jwgl/entity/LLB.java | 4 +- .../java/com/roomroot/jwgl/entity/MHKSQB.java | 4 +- .../jwgl/entity/MemberOnlineInfo.java | 4 +- .../roomroot/jwgl/entity/N2JYJXZLCPCJ.java | 4 +- .../roomroot/jwgl/entity/N2XQJYJXZLCPXM.java | 4 +- .../com/roomroot/jwgl/entity/N2YXTBQK.java | 4 +- .../java/com/roomroot/jwgl/entity/NDZHPD.java | 4 +- .../com/roomroot/jwgl/entity/NDZHPDJYS.java | 4 +- .../java/com/roomroot/jwgl/entity/NZKSF.java | 4 +- .../com/roomroot/jwgl/entity/PJBJPKYS.java | 4 +- .../com/roomroot/jwgl/entity/PJKCAPYS.java | 4 +- .../java/com/roomroot/jwgl/entity/PXRW.java | 4 +- .../com/roomroot/jwgl/entity/RYDASHBMSZ.java | 4 +- .../java/com/roomroot/jwgl/entity/SSDKSQ.java | 4 +- .../java/com/roomroot/jwgl/entity/SSJG.java | 8 +- .../java/com/roomroot/jwgl/entity/SSJGCM.java | 4 +- .../com/roomroot/jwgl/entity/SSJGJYS.java | 4 +- .../com/roomroot/jwgl/entity/SSJGXYD.java | 4 +- .../com/roomroot/jwgl/entity/SSKCBFZJY.java | 4 +- .../com/roomroot/jwgl/entity/SSKCBJS.java | 16 +- .../com/roomroot/jwgl/entity/SSKCBXYD.java | 4 +- .../com/roomroot/jwgl/entity/SSKCXYD.java | 4 +- .../com/roomroot/jwgl/entity/SSOAppInfo.java | 13 +- .../jwgl/entity/SSOUserAuthOperate.java | 13 +- .../jwgl/entity/SSOUserAuthSession.java | 12 +- .../java/com/roomroot/jwgl/entity/TCKGLY.java | 4 +- .../com/roomroot/jwgl/entity/TCKGLYDLB.java | 4 +- .../java/com/roomroot/jwgl/entity/TGB.java | 4 +- .../java/com/roomroot/jwgl/entity/TGYHXX.java | 4 +- .../java/com/roomroot/jwgl/entity/TKJL.java | 4 +- .../java/com/roomroot/jwgl/entity/WJ.java | 4 +- .../com/roomroot/jwgl/entity/WSRYZCB.java | 4 +- .../java/com/roomroot/jwgl/entity/WSSXB.java | 4 +- .../java/com/roomroot/jwgl/entity/WSWDB.java | 4 +- .../com/roomroot/jwgl/entity/XQJYKCSKQKB.java | 4 +- .../com/roomroot/jwgl/entity/XQJYXXB.java | 4 +- .../com/roomroot/jwgl/entity/XQWTKYYDJB.java | 4 +- .../com/roomroot/jwgl/entity/XYCPCPXMB.java | 4 +- .../java/com/roomroot/jwgl/entity/XYDDLB.java | 4 +- .../com/roomroot/jwgl/entity/XYDMYDCPCPB.java | 4 +- .../com/roomroot/jwgl/entity/XYDPBXX.java | 4 +- .../com/roomroot/jwgl/entity/XYFBLJB.java | 4 +- .../com/roomroot/jwgl/entity/XYKCBKCP.java | 4 +- .../com/roomroot/jwgl/entity/XYKCBKCPQZX.java | 4 +- .../java/com/roomroot/jwgl/entity/XYKCCJ.java | 4 +- .../com/roomroot/jwgl/entity/XYKCGCCJ.java | 4 +- .../com/roomroot/jwgl/entity/XYMYDCPCPBC.java | 4 +- .../com/roomroot/jwgl/entity/XYMYDCPCPXY.java | 4 +- .../com/roomroot/jwgl/entity/XYMYDCPXM.java | 4 +- .../roomroot/jwgl/entity/XYMYDCPXMCPX.java | 4 +- .../java/com/roomroot/jwgl/entity/XYPBB.java | 4 +- .../com/roomroot/jwgl/entity/XYSKJYCPB.java | 4 +- .../roomroot/jwgl/entity/XYSKJYCPBQZX.java | 4 +- .../com/roomroot/jwgl/entity/XYSKJYJCCPB.java | 4 +- .../roomroot/jwgl/entity/XYSKJYJCCPBQZX.java | 4 +- .../java/com/roomroot/jwgl/entity/XYXXB.java | 4 +- .../java/com/roomroot/jwgl/entity/XYXXBB.java | 4 +- .../com/roomroot/jwgl/entity/XYXXGGRZ.java | 4 +- .../java/com/roomroot/jwgl/entity/YCB.java | 4 +- .../java/com/roomroot/jwgl/entity/YHB.java | 4 +- .../java/com/roomroot/jwgl/entity/YHDLB.java | 4 +- .../java/com/roomroot/jwgl/entity/YJFKB.java | 4 +- .../java/com/roomroot/jwgl/entity/ZHPDGZ.java | 4 +- .../roomroot/jwgl/entity/ZHPDGZJYSJLRDGZ.java | 4 +- .../roomroot/jwgl/entity/ZHPDGZZHJSGZ.java | 4 +- .../java/com/roomroot/jwgl/entity/ZHZTB.java | 4 +- .../com/roomroot/jwgl/entity/ZJDDCPMB.java | 4 +- .../java/com/roomroot/jwgl/entity/ZYBZLB.java | 4 +- .../roomroot/jwgl/mapper/KCBBZMXMapper.xml | 10 +- .../com/roomroot/jwgl/mapper/SSKCMapper.java | 5 + .../com/roomroot/jwgl/mapper/SSKCMapper.xml | 9 + .../service/ClassRoomCalendarService.java | 59 +++ .../impl/ClassRoomCalendarServiceImpl.java | 388 ++++++++++++++++ .../impl/CourseRunningImportServiceImpl.java | 5 - .../jwgl/service/impl/JYLServiceImpl.java | 15 +- .../impl/SchedulingWindowServiceImpl.java | 8 +- .../jwgl/vo/classroom/VenueLessonVO.java | 40 ++ .../vo/classroom/VenueScheduleItemVO.java | 45 ++ .../src/api/teachBusiness/venueCalendar.js | 81 ++++ .../components/SchoolCalendarEditor.vue | 433 +++++++++++++++++- .../teachBusiness/venue/calendarEditor.vue | 131 ++++++ .../src/views/teachBusiness/venue/index.vue | 21 +- 178 files changed, 1471 insertions(+), 531 deletions(-) create mode 100644 backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/vo/classroom/VenueLessonVO.java create mode 100644 backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/vo/classroom/VenueScheduleItemVO.java create mode 100644 frontend/src/api/teachBusiness/venueCalendar.js create mode 100644 frontend/src/views/teachBusiness/venue/calendarEditor.vue 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 batchSave(@RequestBody List list) { + int saved = calendarService.batchSave(list); + return Result.success("已保存 " + saved + " 个时间格事件", saved); + } + + /** + * 按 ID 批量删除场地历事件（恢复可排） + */ + @PostMapping("/batchDelete") + public Result batchDelete(@RequestBody List ids) { + int deleted = calendarService.batchDelete(ids); + return Result.success("已删除 " + deleted + " 个时间格事件", deleted); + } + + /** + * 按教室编号 + 日期范围查询场地历 + */ + @GetMapping("/listByJsbhAndRange") + 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; *

*/ @Data -@EqualsAndHashCode(callSuper = true) @TableName("技术职务课时费标准") -public class JSZWKSFBZ extends BaseEntity { +public class JSZWKSFBZ { @TableId(value = "编号", type = IdType.INPUT) private String bh; diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXCDLBRW.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXCDLBRW.java index e0388a8b9..7ef269fe0 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXCDLBRW.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXCDLBRW.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 JXCDLBRW extends BaseEntity { +public class JXCDLBRW { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXGLJG.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXGLJG.java index 48a8088a7..7d6fcbb60 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXGLJG.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXGLJG.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 JXGLJG extends BaseEntity { +public class JXGLJG { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXRWJCXQB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXRWJCXQB.java index ed34388dd..5c904690d 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXRWJCXQB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXRWJCXQB.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 JXRWJCXQB extends BaseEntity { +public class JXRWJCXQB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXRZJYKSBZ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXRZJYKSBZ.java index a4018a4c7..66eec2a71 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXRZJYKSBZ.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXRZJYKSBZ.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; @@ -15,9 +14,8 @@ import java.time.LocalDateTime; *

*/ @Data -@EqualsAndHashCode(callSuper = true) @TableName("教学日志教员课时补助") -public class JXRZJYKSBZ extends BaseEntity { +public class JXRZJYKSBZ { @TableId(value = "编号", type = IdType.INPUT) private String bh; diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXRZKSBZSPB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXRZKSBZSPB.java index 6f145620e..b66dedba0 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXRZKSBZSPB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXRZKSBZSPB.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; *

*/ @Data -@EqualsAndHashCode(callSuper = true) @TableName("教学日志课时补助审批表") -public class JXRZKSBZSPB extends BaseEntity { +public class JXRZKSBZSPB { @TableId(value = "编号", type = IdType.INPUT) private String bh; diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXSSJHTJB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXSSJHTJB.java index 7b5fabe4a..55e4ae478 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXSSJHTJB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JXSSJHTJB.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 JXSSJHTJB extends BaseEntity { +public class JXSSJHTJB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYDLB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYDLB.java index cb133da27..1b327d60d 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYDLB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYDLB.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 JYDLB extends BaseEntity { +public class JYDLB { /** * 教员编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYKSBZ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYKSBZ.java index 2738bdc1d..67f0fb3f1 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYKSBZ.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYKSBZ.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 JYKSBZ extends BaseEntity { +public class JYKSBZ { @TableId(value = "编号", type = IdType.INPUT) private String bh; diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYL.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYL.java index 3d03d0fe8..8db3e4392 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYL.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYL.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 JYL extends BaseEntity { +public class JYL { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYNZKSF.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYNZKSF.java index c75bdda73..d7db0f9d5 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYNZKSF.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYNZKSF.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; @@ -15,9 +14,8 @@ import java.time.LocalDateTime; *

*/ @Data -@EqualsAndHashCode(callSuper = true) @TableName("教员年终课时费") -public class JYNZKSF extends BaseEntity { +public class JYNZKSF { @TableId(value = "编号", type = IdType.INPUT) private String bh; diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYSDLB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYSDLB.java index 2573905e3..dab99da05 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYSDLB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYSDLB.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 JYSDLB extends BaseEntity { +public class JYSDLB { /** * 教研室代号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYZJZGB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYZJZGB.java index 539be357e..2d86a5e30 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYZJZGB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYZJZGB.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 JYZJZGB extends BaseEntity { +public class JYZJZGB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBBZMX.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBBZMX.java index 32f47d5a3..d01c00abb 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBBZMX.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBBZMX.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 KCBBZMX extends BaseEntity { +public class KCBBZMX { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBMBB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBMBB.java index f4d018aac..a0dd144b0 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBMBB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBMBB.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 KCBMBB extends BaseEntity { +public class KCBMBB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBZFJ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBZFJ.java index 27e911236..62fb6bf2d 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBZFJ.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBZFJ.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 KCBZFJ extends BaseEntity { +public class KCBZFJ { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBZSP.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBZSP.java index b63305a7c..4267128f8 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBZSP.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBZSP.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 KCBZSP extends BaseEntity { +public class KCBZSP { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBZXX.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBZXX.java index 239c73979..ecf731bfa 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBZXX.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCBZXX.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 KCBZXX extends BaseEntity { +public class KCBZXX { /** * 年度 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCCJ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCCJ.java index ef569f5b9..d4c333b1e 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCCJ.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCCJ.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 KCCJ extends BaseEntity { +public class KCCJ { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCGCCJ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCGCCJ.java index 783155497..882c60b6d 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCGCCJ.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCGCCJ.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 KCGCCJ extends BaseEntity { +public class KCGCCJ { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCJC.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCJC.java index c4afb2a31..22c0a6057 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCJC.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCJC.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 KCJC extends BaseEntity { +public class KCJC { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCJXYX_CZRZ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCJXYX_CZRZ.java index 6e90e0d18..124dd4f32 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCJXYX_CZRZ.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KCJXYX_CZRZ.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; -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 KCJXYX_CZRZ extends BaseEntity { +public class KCJXYX_CZRZ { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KLXB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KLXB.java index 89a0c372b..0d26cd5ae 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KLXB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KLXB.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 KLXB extends BaseEntity { +public class KLXB { /** * 课类型 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KSB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KSB.java index 95bfce42f..5b34894ab 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KSB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KSB.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 KSB extends BaseEntity { +public class KSB { /** * 考试编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KSBZXM.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KSBZXM.java index 5e7f92cf4..073290f58 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KSBZXM.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KSBZXM.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; *

*/ @Data -@EqualsAndHashCode(callSuper = true) @TableName("课时补助项目") -public class KSBZXM extends BaseEntity { +public class KSBZXM { @TableId(value = "编号", type = IdType.INPUT) private String bh; diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KTJXFF.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KTJXFF.java index a45a302af..1306bfca9 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KTJXFF.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KTJXFF.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 KTJXFF extends BaseEntity { +public class KTJXFF { /** * 名称 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KTJXFFKSXS.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KTJXFFKSXS.java index 2144980a4..976d1a2bf 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KTJXFFKSXS.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KTJXFFKSXS.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 KTJXFFKSXS extends BaseEntity { +public class KTJXFFKSXS { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KTRZXYKQB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KTRZXYKQB.java index d1ff829ab..dafc55cfc 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KTRZXYKQB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KTRZXYKQB.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 KTRZXYKQB extends BaseEntity { +public class KTRZXYKQB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYKJJXSBB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYKJJXSBB.java index 153fdce07..cf126fe22 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYKJJXSBB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYKJJXSBB.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; * KY_科技奖项申报表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("KY_科技奖项申报表") -public class KYKJJXSBB extends BaseEntity { +public class KYKJJXSBB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYKYCGB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYKYCGB.java index 0b04eda6e..8e6b1a205 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYKYCGB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYKYCGB.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; * KY_科研成果表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("KY_科研成果表") -public class KYKYCGB extends BaseEntity { +public class KYKYCGB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYKYJFB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYKYJFB.java index 158e02c1f..e0a3c28c4 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYKYJFB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYKYJFB.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; * KY_科研经费表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("KY_科研经费表") -public class KYKYJFB extends BaseEntity { +public class KYKYJFB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYKYXMB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYKYXMB.java index bb3bf06c5..fc0fecb31 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYKYXMB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYKYXMB.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; * KY_科研项目表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("KY_科研项目表") -public class KYKYXMB extends BaseEntity { +public class KYKYXMB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYSBGLB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYSBGLB.java index d12898dea..b5559d61b 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYSBGLB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYSBGLB.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; * KY_申报管理表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("KY_申报管理表") -public class KYSBGLB extends BaseEntity { +public class KYSBGLB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYSYSJSB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYSYSJSB.java index 51e1b6351..d6d8c501c 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYSYSJSB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYSYSJSB.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; * KY_实验室建设表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("KY_实验室建设表") -public class KYSYSJSB extends BaseEntity { +public class KYSYSJSB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYXSJLB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYXSJLB.java index 40a2cb685..4268a5e63 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYXSJLB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYXSJLB.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; * KY_学术交流表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("KY_学术交流表") -public class KYXSJLB extends BaseEntity { +public class KYXSJLB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYZDKB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYZDKB.java index c9eda26c1..36935bdf9 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYZDKB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/KYZDKB.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; * KY_制度库表 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("KY_制度库表") -public class KYZDKB extends BaseEntity { +public class KYZDKB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/LBSBXXB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/LBSBXXB.java index 4d989f206..506dc5a5c 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/LBSBXXB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/LBSBXXB.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 LBSBXXB extends BaseEntity { +public class LBSBXXB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/LBZYGLPT.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/LBZYGLPT.java index 5144a851c..7e008f874 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/LBZYGLPT.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/LBZYGLPT.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 LBZYGLPT extends BaseEntity { +public class LBZYGLPT { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/LDGCKCPMB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/LDGCKCPMB.java index 9484b135c..901fbec3b 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/LDGCKCPMB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/LDGCKCPMB.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 LDGCKCPMB extends BaseEntity { +public class LDGCKCPMB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/LLB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/LLB.java index 769ca5691..f655f4375 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/LLB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/LLB.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 LLB extends BaseEntity { +public class LLB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/MHKSQB.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/MHKSQB.java index 58f835c75..36616ff29 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/MHKSQB.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/MHKSQB.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 MHKSQB extends BaseEntity { +public class MHKSQB { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/MemberOnlineInfo.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/MemberOnlineInfo.java index ce7d88269..9d39c872f 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/MemberOnlineInfo.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/MemberOnlineInfo.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; * MemberOnlineInfo */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("MemberOnlineInfo") -public class MemberOnlineInfo extends BaseEntity { +public class MemberOnlineInfo { /** * SessionId diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/N2JYJXZLCPCJ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/N2JYJXZLCPCJ.java index 0d402edf6..6c6716073 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/N2JYJXZLCPCJ.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/N2JYJXZLCPCJ.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; * N2教员教学质量测评成绩 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("N2教员教学质量测评成绩") -public class N2JYJXZLCPCJ extends BaseEntity { +public class N2JYJXZLCPCJ { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/N2XQJYJXZLCPXM.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/N2XQJYJXZLCPXM.java index 7c7252136..a82cc9d0e 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/N2XQJYJXZLCPXM.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/N2XQJYJXZLCPXM.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; * N2学期教员教学质量测评项目 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("N2学期教员教学质量测评项目") -public class N2XQJYJXZLCPXM extends BaseEntity { +public class N2XQJYJXZLCPXM { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/N2YXTBQK.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/N2YXTBQK.java index 31e157c61..5ea1ab16c 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/N2YXTBQK.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/N2YXTBQK.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; * N2院系填报情况 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("N2院系填报情况") -public class N2YXTBQK extends BaseEntity { +public class N2YXTBQK { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/NDZHPD.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/NDZHPD.java index a2977628d..2aae73962 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/NDZHPD.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/NDZHPD.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 NDZHPD extends BaseEntity { +public class NDZHPD { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/NDZHPDJYS.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/NDZHPDJYS.java index 68d62a0fb..9664404a8 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/NDZHPDJYS.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/NDZHPDJYS.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 NDZHPDJYS extends BaseEntity { +public class NDZHPDJYS { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/NZKSF.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/NZKSF.java index f5068be61..4efe67904 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/NZKSF.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/NZKSF.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; *

*/ @Data -@EqualsAndHashCode(callSuper = true) @TableName("年终课时费") -public class NZKSF extends BaseEntity { +public class NZKSF { @TableId(value = "编号", type = IdType.INPUT) private String bh; diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/PJBJPKYS.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/PJBJPKYS.java index c5b7ba0d1..f0b6fcdf9 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/PJBJPKYS.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/PJBJPKYS.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 PJBJPKYS extends BaseEntity { +public class PJBJPKYS { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/PJKCAPYS.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/PJKCAPYS.java index 2129bbadd..50239b0d6 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/PJKCAPYS.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/PJKCAPYS.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 PJKCAPYS extends BaseEntity { +public class PJKCAPYS { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/PXRW.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/PXRW.java index d929f9bec..b8874769b 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/PXRW.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/PXRW.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; -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 PXRW extends BaseEntity { +public class PXRW { /** * 标识号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/RYDASHBMSZ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/RYDASHBMSZ.java index ffcecec7a..157cd41f9 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/RYDASHBMSZ.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/RYDASHBMSZ.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 RYDASHBMSZ extends BaseEntity { +public class RYDASHBMSZ { /** * 档案目录 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSDKSQ.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSDKSQ.java index 6fc9bbe83..1595be6f5 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSDKSQ.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSDKSQ.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; -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 SSDKSQ extends BaseEntity { +public class SSDKSQ { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSJG.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSJG.java index 5d41005b6..1e5629529 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSJG.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSJG.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,9 +14,8 @@ import java.time.LocalDateTime; * 实施_机关 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("实施_机关") -public class SSJG extends BaseEntity { +public class SSJG { /** * 编号 @@ -75,8 +73,8 @@ public class SSJG extends BaseEntity { /** * 逻辑删除标记：0-正常，1-已删除。 - * 覆盖 BaseEntity 的 delFlag 字段以添加 @TableLogic 注解， - * 使 MyBatis-Plus 的 BaseMapper 方法自动过滤已删除记录。 + * 逻辑删除标记（本表无 create_time 等审计列，故不继承 BaseEntity）。 + * 注解使 MyBatis-Plus 的 BaseMapper 方法自动过滤已删除记录。 * 手写 XML 查询需自行添加 DEL_FLAG 过滤条件。 */ @TableLogic diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSJGCM.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSJGCM.java index 99864f305..32d6d8512 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSJGCM.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSJGCM.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import com.roomroot.jwgl.unit.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,9 +11,8 @@ import lombok.EqualsAndHashCode; * 实施_机关参谋 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("实施_机关参谋") -public class SSJGCM extends BaseEntity { +public class SSJGCM { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSJGJYS.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSJGJYS.java index a42df0d92..cc22b1a8e 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSJGJYS.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSJGJYS.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 SSJGJYS extends BaseEntity { +public class SSJGJYS { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSJGXYD.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSJGXYD.java index 744e7d4e7..b4275a4a8 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSJGXYD.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSJGXYD.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 SSJGXYD extends BaseEntity { +public class SSJGXYD { /** * 学员队编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSKCBFZJY.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSKCBFZJY.java index e71d199ec..824908b51 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSKCBFZJY.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSKCBFZJY.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 SSKCBFZJY extends BaseEntity { +public class SSKCBFZJY { /** * 编号 diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSKCBJS.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSKCBJS.java index df8682be5..441bc3da1 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSKCBJS.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSKCBJS.java @@ -1,21 +1,23 @@ package com.roomroot.jwgl.entity; +import com.baomidou.mybatisplus.annotation.TableField; 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; 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 @@ - @@ -44,9 +43,9 @@ m.保障类别编号, l.名称 AS 保障类别名称, COUNT(a.编号) AS 使用次数, - MAX(a.创建时间) AS 最近时间, + MAX(a.日期) AS 最近时间, CAST(ROUND(AVG(a.数量), 0) AS INT) AS 平均数量, - MAX(a.数量) KEEP (DENSE_RANK LAST ORDER BY a.创建时间) AS 最近数量 + MAX(a.数量) KEEP (DENSE_RANK LAST ORDER BY a.日期) AS 最近数量 FROM "课程表_保障明细" a INNER JOIN "实施_课程表" b ON a.课程表编号 = b.编号 LEFT JOIN "保障提供明细" m ON a.保障提供明细编号 = m.编号 @@ -94,8 +93,7 @@ REGEXP_SUBSTR(a.备注, '"confirmRemark":"([^"]*)"', 1, 1, NULL, 1) ELSE NULL END AS 确认备注, - a.创建时间, - a.update_time AS 更新时间 + a.日期 AS 创建时间 FROM "课程表_保障明细" a LEFT JOIN "保障提供明细" m ON a.保障提供明细编号 = m.编号 LEFT JOIN "保障类别" l ON m.保障类别编号 = l.编号 @@ -107,7 +105,7 @@ END ) = t.编号 WHERE a.课程表编号 = #{sskcbbh} - ORDER BY a.创建时间 DESC + ORDER BY a.日期 DESC diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/SSKCMapper.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/SSKCMapper.java index ef7d8a154..39108b942 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/SSKCMapper.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/SSKCMapper.java @@ -15,4 +15,9 @@ public interface SSKCMapper extends BaseMapper { List selectByClassBh(@Param("classBh") String classBh, @Param("nd") Integer nd); SSKC selectByCourseBhAndClassBh(@Param("courseBh") String courseBh, @Param("classBh") String classBh, @Param("nd") Integer nd); + + /** + * 按编号批量查询（编号为 VARBINARY GUID，不能用 selectBatchIds——主键 typeHandler 对 IN 参数不生效） + */ + List selectByBhs(@Param("list") List bhs); } \ No newline at end of file diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/SSKCMapper.xml b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/SSKCMapper.xml index 7229643d9..95a654d66 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/SSKCMapper.xml +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/SSKCMapper.xml @@ -31,4 +31,13 @@ WHERE sc.课编号 = #{courseBh} AND scxd.学员队编号 = #{classBh} AND sc.年度 = #{nd} AND sc.停用 = 0 + + + \ No newline at end of file diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/ClassRoomCalendarService.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/ClassRoomCalendarService.java index 9500682bf..9d8ab4c35 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/ClassRoomCalendarService.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/ClassRoomCalendarService.java @@ -3,6 +3,8 @@ package com.roomroot.jwgl.service; import com.roomroot.jwgl.entity.JXCDL; import com.roomroot.jwgl.unit.PageQuery; import com.roomroot.jwgl.unit.PageResult; +import com.roomroot.jwgl.vo.classroom.VenueLessonVO; +import com.roomroot.jwgl.vo.classroom.VenueScheduleItemVO; import java.util.List; @@ -72,4 +74,61 @@ public interface ClassRoomCalendarService { * @return 教学场地历列表 */ List listByRq(String rq); + + /** + * 批量保存场地历事件（拖选区域写入）。 + *

+ * 按 (教室编号, 日期, 节次) 判重：已存在则更新可排课/名称/备注，不存在则插入。 + *

+ * + * @param list 场地历事件列表（jsbh/rq/jc 必填） + * @return 写入条数 + */ + int batchSave(List list); + + /** + * 按 ID 批量删除场地历事件（软删，恢复可排） + * + * @param ids 主键ID列表 + * @return 删除条数 + */ + int batchDelete(List ids); + + /** + * 按教室编号 + 日期范围查询场地历 + * + * @param jsbh 教室编号 + * @param start 开始日期 yyyy-MM-dd + * @param end 结束日期 yyyy-MM-dd + * @return 场地历列表 + */ + List listByJsbhAndRange(String jsbh, String start, String end); + + /** + * 查询场地在日期范围内已排课次（编辑器蓝格数据源） + * + * @param jsbh 教室编号 + * @param start 开始日期 yyyy-MM-dd + * @param end 结束日期 yyyy-MM-dd + * @param nd 学期代号（可空，空则不限学期） + * @return 已排课次列表 + */ + List listVenueLessons(String jsbh, String start, String end, Integer nd); + + /** + * 查询指定本场地为专用教室的班次（编辑器顶部横幅数据源） + * + * @param jsbh 教室编号 + * @return 班次描述列表（如"一队（2025年度 第1学期）"） + */ + List listDesignatedTeams(String jsbh); + + /** + * 场地占用总览：某日期+节次全部场地的占用状态 + * + * @param rq 日期 yyyy-MM-dd + * @param jc 节次（单节次） + * @return 全部场地的占用条目 + */ + List venueSchedule(String rq, Integer jc); } \ No newline at end of file diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/ClassRoomCalendarServiceImpl.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/ClassRoomCalendarServiceImpl.java index 8234f6b02..4aa97017a 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/ClassRoomCalendarServiceImpl.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/ClassRoomCalendarServiceImpl.java @@ -2,17 +2,48 @@ package com.roomroot.jwgl.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.roomroot.jwgl.entity.JSB; import com.roomroot.jwgl.entity.JXCDL; +import com.roomroot.jwgl.entity.JYB; +import com.roomroot.jwgl.entity.KB; +import com.roomroot.jwgl.entity.SSKCB; +import com.roomroot.jwgl.entity.SSKCBJS; +import com.roomroot.jwgl.entity.SSKC; +import com.roomroot.jwgl.entity.SSKCXYD; +import com.roomroot.jwgl.entity.XYDB; +import com.roomroot.jwgl.entity.XYDNDXQJBXXB; import com.roomroot.jwgl.mapper.ClassRoomCalendarMapper; +import com.roomroot.jwgl.mapper.ClassRoomMapper; +import com.roomroot.jwgl.mapper.ClassSemesterMapper; +import com.roomroot.jwgl.mapper.JYBMapper; +import com.roomroot.jwgl.mapper.KBMapper; +import com.roomroot.jwgl.mapper.SSKCBJSMapper; +import com.roomroot.jwgl.mapper.SSKCBMapper; +import com.roomroot.jwgl.mapper.SSKCMapper; +import com.roomroot.jwgl.mapper.SSKCXYDMapper; +import com.roomroot.jwgl.mapper.XYDBMapper; import com.roomroot.jwgl.service.ClassRoomCalendarService; +import com.roomroot.jwgl.unit.BusinessException; import com.roomroot.jwgl.unit.PageQuery; import com.roomroot.jwgl.unit.PageResult; import com.roomroot.jwgl.utils.UuidUtil; +import com.roomroot.jwgl.vo.classroom.VenueLessonVO; +import com.roomroot.jwgl.vo.classroom.VenueScheduleItemVO; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import jakarta.annotation.Resource; +import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; /** * 教学场地历服务实现类 @@ -20,9 +51,38 @@ import java.util.List; @Service public class ClassRoomCalendarServiceImpl implements ClassRoomCalendarService { + private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + @Resource private ClassRoomCalendarMapper jxcdlMapper; + @Resource + private ClassRoomMapper classRoomMapper; + + @Resource + private SSKCBJSMapper sskcbjsMapper; + + @Resource + private SSKCBMapper sskcbMapper; + + @Resource + private SSKCMapper sskcMapper; + + @Resource + private KBMapper kbMapper; + + @Resource + private JYBMapper jybMapper; + + @Resource + private SSKCXYDMapper sskcxydMapper; + + @Resource + private XYDBMapper xydbMapper; + + @Resource + private ClassSemesterMapper classSemesterMapper; + @Override public void add(JXCDL jxcdl) { jxcdl.setId(UuidUtil.getUUID()); @@ -73,6 +133,334 @@ public class ClassRoomCalendarServiceImpl implements ClassRoomCalendarService { return jxcdlMapper.selectByRq(rq); } + @Override + @Transactional(rollbackFor = Exception.class) + public int batchSave(List list) { + if (list == null || list.isEmpty()) { + return 0; + } + // 校验必填项并归一化日期 + Set jsbhSet = new HashSet<>(); + LocalDate minDay = null; + LocalDate maxDay = null; + for (JXCDL item : list) { + if (item.getJsbh() == null || item.getJsbh().trim().isEmpty()) { + throw new BusinessException("场地历事件缺少教室编号"); + } + if (item.getRq() == null || item.getJc() == null) { + throw new BusinessException("场地历事件缺少日期或节次"); + } + jsbhSet.add(item.getJsbh().trim()); + LocalDate d = item.getRq().toLocalDate(); + minDay = minDay == null || d.isBefore(minDay) ? d : minDay; + maxDay = maxDay == null || d.isAfter(maxDay) ? d : maxDay; + } + // 一次拉出涉及场地在日期区间内的已有事件，按 (教室编号|日期|节次) 判重 + Map existing = new HashMap<>(); + for (JXCDL row : jxcdlMapper.selectList(new LambdaQueryWrapper() + .in(JXCDL::getJsbh, jsbhSet) + .ge(JXCDL::getRq, minDay.atStartOfDay()) + .lt(JXCDL::getRq, maxDay.plusDays(1).atStartOfDay()) + .eq(JXCDL::getDelFlag, 0))) { + if (row.getRq() == null || row.getJc() == null) { + continue; + } + existing.put(row.getJsbh() + "|" + row.getRq().toLocalDate().format(DATE_FORMATTER) + + "|" + row.getJc(), row); + } + int saved = 0; + LocalDateTime now = LocalDateTime.now(); + for (JXCDL item : list) { + String key = item.getJsbh().trim() + "|" + + item.getRq().toLocalDate().format(DATE_FORMATTER) + "|" + item.getJc(); + JXCDL prev = existing.get(key); + if (prev != null) { + prev.setMc(item.getMc()); + prev.setBz(item.getBz()); + prev.setKpk(item.getKpk()); + jxcdlMapper.updateById(prev); + } else { + JXCDL row = new JXCDL(); + row.setId(UuidUtil.getUUID()); + row.setBh(item.getJsbh().trim() + "-" + + item.getRq().toLocalDate().format(DATE_FORMATTER).replace("-", "") + + "-" + item.getJc()); + row.setMc(item.getMc()); + row.setBz(item.getBz()); + row.setKpk(item.getKpk() != null ? item.getKpk() : Boolean.FALSE); + row.setRq(item.getRq().toLocalDate().atStartOfDay()); + row.setJc(item.getJc()); + row.setJsbh(item.getJsbh().trim()); + row.setDelFlag(0); + row.setCjsj(now); + jxcdlMapper.insert(row); + } + saved++; + } + return saved; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int batchDelete(List ids) { + if (ids == null || ids.isEmpty()) { + return 0; + } + int deleted = 0; + for (JXCDL row : jxcdlMapper.selectBatchIds(ids)) { + if (row.getDelFlag() != null && row.getDelFlag() == 1) { + continue; + } + row.setDelFlag(1); + jxcdlMapper.updateById(row); + deleted++; + } + return deleted; + } + + @Override + public List listByJsbhAndRange(String jsbh, String start, String end) { + if (jsbh == null || jsbh.trim().isEmpty()) { + return new ArrayList<>(); + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(JXCDL::getJsbh, jsbh.trim()) + .eq(JXCDL::getDelFlag, 0); + LocalDate s = parseDate(start); + LocalDate e = parseDate(end); + if (s != null) { + wrapper.ge(JXCDL::getRq, s.atStartOfDay()); + } + if (e != null) { + wrapper.lt(JXCDL::getRq, e.plusDays(1).atStartOfDay()); + } + wrapper.orderByAsc(JXCDL::getRq, JXCDL::getJc); + return jxcdlMapper.selectList(wrapper); + } + + @Override + public List listVenueLessons(String jsbh, String start, String end, Integer nd) { + if (jsbh == null || jsbh.trim().isEmpty()) { + return new ArrayList<>(); + } + // 教室子表定位占用该场地的课次（该表数据不做软删过滤，与冲突检测口径一致） + List links = sskcbjsMapper.selectList(new LambdaQueryWrapper() + .eq(SSKCBJS::getJsbh, jsbh.trim())); + if (links.isEmpty()) { + return new ArrayList<>(); + } + Set lessonBhs = links.stream().map(SSKCBJS::getSskcbbh) + .filter(b -> b != null && !b.isEmpty()).collect(Collectors.toSet()); + if (lessonBhs.isEmpty()) { + return new ArrayList<>(); + } + LocalDate s = parseDate(start); + LocalDate e = parseDate(end); + List lessons = sskcbMapper.selectBatchIds(lessonBhs).stream() + .filter(l -> l.getRq() != null && l.getJc() != null) + .filter(l -> l.getSczt() == null || l.getSczt() == 0) + .filter(l -> nd == null || nd.equals(l.getNd())) + .filter(l -> { + LocalDate d = l.getRq().toLocalDate(); + return (s == null || !d.isBefore(s)) && (e == null || !d.isAfter(e)); + }) + .collect(Collectors.toList()); + if (lessons.isEmpty()) { + return new ArrayList<>(); + } + // 课程名称：课次.实施_课程编号 -> 实施_课程.科目编号 -> 课表.课名称 + Set courseBhs = lessons.stream().map(SSKCB::getSskcbh) + .filter(b -> b != null && !b.isEmpty()).collect(Collectors.toSet()); + Map courseByBh = courseBhs.isEmpty() ? new HashMap<>() + : sskcMapper.selectByBhs(new ArrayList<>(courseBhs)).stream() + .collect(Collectors.toMap(c -> normGuid(c.getBh()), c -> c, (a, b) -> a)); + Set kbhs = courseByBh.values().stream().map(SSKC::getKmbh) + .filter(b -> b != null && !b.isEmpty()).collect(Collectors.toSet()); + Map kmcByKbh = kbhs.isEmpty() ? new HashMap<>() + : kbMapper.selectBatchIds(kbhs).stream() + .collect(Collectors.toMap(KB::getKbh, k -> k.getKmc() == null ? "" : k.getKmc(), (a, b) -> a)); + // 教员姓名：实施_课程.教员编号 -> 教员表.教员姓名 + Set jybhs = courseByBh.values().stream().map(SSKC::getJybh) + .filter(b -> b != null && !b.isEmpty()).collect(Collectors.toSet()); + Map jyxmByJybh = jybhs.isEmpty() ? new HashMap<>() + : jybMapper.selectBatchIds(jybhs).stream() + .collect(Collectors.toMap(JYB::getJybh, j -> j.getJyxm() == null ? "" : j.getJyxm(), (a, b) -> a)); + // 学员队名称：实施_课程学员队 -> 学员队表 + Map> teamsOfCourse = new HashMap<>(); + if (!courseBhs.isEmpty()) { + List teamLinks = sskcxydMapper.selectList(new LambdaQueryWrapper() + .in(SSKCXYD::getSskcbh, courseBhs)); + Set xydbhs = teamLinks.stream().map(SSKCXYD::getXydbh) + .filter(b -> b != null && !b.isEmpty()).collect(Collectors.toSet()); + Map teamNameByBh = xydbhs.isEmpty() ? new HashMap<>() + : xydbMapper.selectList(new LambdaQueryWrapper().in(XYDB::getXydbh, xydbhs)) + .stream().collect(Collectors.toMap(XYDB::getXydbh, + t -> t.getXydmc() == null ? "" : t.getXydmc(), (a, b) -> a)); + for (SSKCXYD link : teamLinks) { + String name = teamNameByBh.getOrDefault(link.getXydbh(), link.getXydbh()); + if (name != null && !name.isEmpty()) { + teamsOfCourse.computeIfAbsent(link.getSskcbh(), k -> new ArrayList<>()).add(name); + } + } + } + List result = new ArrayList<>(); + for (SSKCB lesson : lessons) { + SSKC course = courseByBh.get(normGuid(lesson.getSskcbh())); + VenueLessonVO vo = new VenueLessonVO(); + vo.setRq(lesson.getRq().toLocalDate().format(DATE_FORMATTER)); + vo.setJc(lesson.getJc()); + vo.setSskcbh(lesson.getBh()); + vo.setKcmc(course == null ? "" : kmcByKbh.getOrDefault(course.getKmbh(), "")); + vo.setJyxm(course == null ? "" : jyxmByJybh.getOrDefault(course.getJybh(), "")); + vo.setXydmc(String.join("；", teamsOfCourse.getOrDefault(lesson.getSskcbh(), List.of()))); + result.add(vo); + } + return result; + } + + @Override + public List listDesignatedTeams(String jsbh) { + if (jsbh == null || jsbh.trim().isEmpty()) { + return new ArrayList<>(); + } + // 专用教室编号可能存教室编号或教室ID，两种口径都匹配（与 ClassSemesterMapper.xml 的联查一致） + JSB room = classRoomMapper.selectOne(new LambdaQueryWrapper() + .eq(JSB::getJsbh, jsbh.trim()) + .eq(JSB::getDelFlag, 0) + .last("LIMIT 1")); + Set keys = new HashSet<>(); + keys.add(jsbh.trim()); + if (room != null && room.getId() != null) { + keys.add(room.getId()); + } + List rows = classSemesterMapper.selectList(new LambdaQueryWrapper() + .in(XYDNDXQJBXXB::getZyjsbh, keys) + .eq(XYDNDXQJBXXB::getDelFlag, 0)); + if (rows.isEmpty()) { + return new ArrayList<>(); + } + Set xydbhs = rows.stream().map(XYDNDXQJBXXB::getXydbh) + .filter(b -> b != null && !b.isEmpty()).collect(Collectors.toSet()); + Map teamNameByBh = xydbhs.isEmpty() ? new HashMap<>() + : xydbMapper.selectList(new LambdaQueryWrapper().in(XYDB::getXydbh, xydbhs)) + .stream().collect(Collectors.toMap(XYDB::getXydbh, + t -> t.getXydmc() == null ? "" : t.getXydmc(), (a, b) -> a)); + List result = new ArrayList<>(); + for (XYDNDXQJBXXB row : rows) { + String name = teamNameByBh.getOrDefault(row.getXydbh(), row.getXydbh()); + StringBuilder sb = new StringBuilder(name == null ? "" : name); + if (row.getNd() != null || row.getXqdc() != null) { + sb.append("（"); + if (row.getNd() != null) { + sb.append(row.getNd()).append("年度"); + } + if (row.getXqdc() != null) { + sb.append(" 第").append(row.getXqdc()).append("学期"); + } + sb.append("）"); + } + if (sb.length() > 0) { + result.add(sb.toString()); + } + } + return result; + } + + @Override + public List venueSchedule(String rq, Integer jc) { + LocalDate day = parseDate(rq); + if (day == null || jc == null) { + throw new BusinessException("请提供日期和节次"); + } + List rooms = classRoomMapper.selectList(new LambdaQueryWrapper() + .eq(JSB::getDelFlag, 0)); + // 场地历事件 + Map eventByRoom = new HashMap<>(); + for (JXCDL row : jxcdlMapper.selectList(new LambdaQueryWrapper() + .ge(JXCDL::getRq, day.atStartOfDay()) + .lt(JXCDL::getRq, day.plusDays(1).atStartOfDay()) + .eq(JXCDL::getJc, jc) + .eq(JXCDL::getDelFlag, 0))) { + eventByRoom.put(row.getJsbh(), row); + } + // 已排课次：该日期+节次的课次 -> 教室子表反查占用场地 + Map lessonByRoom = new HashMap<>(); + List lessons = sskcbMapper.selectList(new LambdaQueryWrapper() + .ge(SSKCB::getRq, day.atStartOfDay()) + .lt(SSKCB::getRq, day.plusDays(1).atStartOfDay()) + .eq(SSKCB::getJc, jc) + .eq(SSKCB::getSczt, 0)); + if (!lessons.isEmpty()) { + Map lessonByBh = lessons.stream() + .collect(Collectors.toMap(SSKCB::getBh, l -> l, (a, b) -> a)); + for (SSKCBJS link : sskcbjsMapper.selectList(new LambdaQueryWrapper() + .in(SSKCBJS::getSskcbbh, lessonByBh.keySet()))) { + if (link.getJsbh() != null) { + lessonByRoom.putIfAbsent(link.getJsbh(), lessonByBh.get(link.getSskcbbh())); + } + } + } + Map courseNames = loadCourseNames(lessons); + List result = new ArrayList<>(); + for (JSB room : rooms) { + VenueScheduleItemVO vo = new VenueScheduleItemVO(); + vo.setJsbh(room.getJsbh()); + vo.setJsmc(room.getJsmc()); + vo.setJxldh(room.getJxldh()); + SSKCB lesson = lessonByRoom.get(room.getJsbh()); + JXCDL event = eventByRoom.get(room.getJsbh()); + if (lesson != null) { + vo.setStatus("occupied"); + vo.setKcmc(courseNames.getOrDefault(normGuid(lesson.getSskcbh()), "")); + } else if (event != null) { + vo.setStatus(Boolean.FALSE.equals(event.getKpk()) ? "unavailable" : "noted"); + vo.setMc(event.getMc()); + } else { + vo.setStatus("free"); + } + result.add(vo); + } + return result; + } + + /** + * 实施_课程编号 -> 课程名称（实施_课程.科目编号 -> 课表.课名称） + */ + private Map loadCourseNames(List lessons) { + Set courseBhs = lessons.stream().map(SSKCB::getSskcbh) + .filter(b -> b != null && !b.isEmpty()).collect(Collectors.toSet()); + if (courseBhs.isEmpty()) { + return new HashMap<>(); + } + List courses = sskcMapper.selectByBhs(new ArrayList<>(courseBhs)); + Set kbhs = courses.stream().map(SSKC::getKmbh) + .filter(b -> b != null && !b.isEmpty()).collect(Collectors.toSet()); + Map kmcByKbh = kbhs.isEmpty() ? new HashMap<>() + : kbMapper.selectBatchIds(kbhs).stream() + .collect(Collectors.toMap(KB::getKbh, k -> k.getKmc() == null ? "" : k.getKmc(), (a, b) -> a)); + Map names = new HashMap<>(); + for (SSKC c : courses) { + names.put(normGuid(c.getBh()), kmcByKbh.getOrDefault(c.getKmbh(), c.getKmbh())); + } + return names; + } + + /** 归一化 GUID：去横线转小写，屏蔽 CHAR(36) 存储与 VARBINARY 解码的大小写差异 */ + private String normGuid(String guid) { + return guid == null ? "" : guid.trim().replace("-", "").toLowerCase(); + } + + private LocalDate parseDate(String s) { + if (s == null || s.trim().isEmpty()) { + return null; + } + try { + return LocalDate.parse(s.trim().substring(0, 10), DATE_FORMATTER); + } catch (Exception e) { + return null; + } + } + /** * 构建查询条件 */ diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/CourseRunningImportServiceImpl.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/CourseRunningImportServiceImpl.java index c08b0a04c..aac3829cf 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/CourseRunningImportServiceImpl.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/CourseRunningImportServiceImpl.java @@ -1541,8 +1541,6 @@ public class CourseRunningImportServiceImpl implements CourseRunningImportServic // 从课次实体复制日期节次，便于后续统计和展示 plan.setRq(lesson.getRq()); plan.setJc(lesson.getJc()); - plan.setCreateTime(LocalDateTime.now()); - plan.setUpdateTime(LocalDateTime.now()); // 步骤5：插入教学保障计划数据 kcbbzmxMapper.insert(plan); @@ -1645,7 +1643,6 @@ public class CourseRunningImportServiceImpl implements CourseRunningImportServic plan.setSl(dto.getSl()); // 保留原有备注中的确认状态信息（如果有），并更新用户备注内容 plan.setBz(mergeSupportRemark(plan.getBz(), dto.getBz())); - plan.setUpdateTime(LocalDateTime.now()); // 步骤5：执行数据库更新 kcbbzmxMapper.updateById(plan); @@ -1727,7 +1724,6 @@ public class CourseRunningImportServiceImpl implements CourseRunningImportServic // 步骤4：构建确认状态JSON，追加到备注字段中 String confirmJson = buildSupportConfirmJson(dto.getQrrbh(), dto.getQrbz()); plan.setBz(mergeSupportRemark(plan.getBz(), confirmJson)); - plan.setUpdateTime(LocalDateTime.now()); // 步骤5：执行数据库更新 kcbbzmxMapper.updateById(plan); @@ -1817,7 +1813,6 @@ public class CourseRunningImportServiceImpl implements CourseRunningImportServic // 步骤4：移除备注中的确认状态JSON，恢复为未确认状态 plan.setBz(clearSupportConfirmJson(plan.getBz())); - plan.setUpdateTime(LocalDateTime.now()); // 步骤5：执行数据库更新 kcbbzmxMapper.updateById(plan); diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/JYLServiceImpl.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/JYLServiceImpl.java index 65eda53d1..c65156b02 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/JYLServiceImpl.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/JYLServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.UUID; /** - * 教员历 Service 实现。交互口径与教学场地历一致：新增生成编号 + delFlag=0，删除为软删。 + * 教员历 Service 实现。交互口径与教学场地历一致：新增生成编号；该表无 del_flag 审计列，删除为物理删除。 */ @Service public class JYLServiceImpl implements JYLService { @@ -33,22 +33,16 @@ public class JYLServiceImpl implements JYLService { row.setKpk(0); } row.setCjsj(LocalDateTime.now()); - row.setDelFlag(0); jylMapper.insert(row); } @Override public void delete(String bh) { - JYL row = jylMapper.selectById(bh); - if (row != null) { - row.setDelFlag(1); - jylMapper.updateById(row); - } + jylMapper.deleteById(bh); } @Override public void update(JYL row) { - row.setDelFlag(null); jylMapper.updateById(row); } @@ -77,7 +71,6 @@ public class JYLServiceImpl implements JYLService { public List listByJybh(String jybh) { return jylMapper.selectList(new LambdaQueryWrapper() .eq(JYL::getJybh, jybh) - .eq(JYL::getDelFlag, 0) .orderByAsc(JYL::getRq) .orderByAsc(JYL::getJc)); } @@ -85,13 +78,11 @@ public class JYLServiceImpl implements JYLService { @Override public List listByRq(String rq) { return jylMapper.selectList(new LambdaQueryWrapper() - .apply("DATE(rq) = {0}", rq) - .eq(JYL::getDelFlag, 0)); + .apply("DATE(rq) = {0}", rq)); } private LambdaQueryWrapper buildWrapper(JYL condition) { LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - qw.eq(JYL::getDelFlag, 0); if (condition != null) { if (StringUtils.isNotEmpty(condition.getJybh())) { qw.eq(JYL::getJybh, condition.getJybh()); diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/SchedulingWindowServiceImpl.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/SchedulingWindowServiceImpl.java index ea80c00e1..3072edb0f 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/SchedulingWindowServiceImpl.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/SchedulingWindowServiceImpl.java @@ -145,7 +145,7 @@ public class SchedulingWindowServiceImpl implements SchedulingWindowService { List links = ctx.links; List sskcIds = links.stream().map(SSKCXYD::getSskcbh).distinct().toList(); Map courses = sskcIds.isEmpty() ? Map.of() - : sskcMapper.selectBatchIds(sskcIds).stream().collect(Collectors.toMap(SSKC::getBh, c -> c, (a, b) -> a)); + : sskcMapper.selectByBhs(sskcIds).stream().collect(Collectors.toMap(SSKC::getBh, c -> c, (a, b) -> a)); List lessons = ctx.lessons; Map> lessonsByCourse = lessons.stream() .collect(Collectors.groupingBy(SSKCB::getSskcbh)); @@ -212,7 +212,7 @@ public class SchedulingWindowServiceImpl implements SchedulingWindowService { .collect(Collectors.groupingBy(l -> l.getRq().toLocalDate().toString() + "#" + l.getJc())); Map courseNames = new HashMap<>(); Map courseTeachers = new HashMap<>(); - for (SSKC course : sskcMapper.selectBatchIds(ctx.links.stream().map(SSKCXYD::getSskcbh).distinct().toList())) { + for (SSKC course : sskcMapper.selectByBhs(ctx.links.stream().map(SSKCXYD::getSskcbh).distinct().toList())) { courseNames.put(course.getBh(), resolveCourseName(course.getKmbh())); courseTeachers.put(course.getBh(), safe(course.getJybh())); } @@ -321,7 +321,7 @@ public class SchedulingWindowServiceImpl implements SchedulingWindowService { } Map teacherBlocked = new HashMap<>(); for (JYL row : jylMapper.selectList(new LambdaQueryWrapper() - .eq(JYL::getKpk, 0).eq(JYL::getDelFlag, 0))) { + .eq(JYL::getKpk, 0))) { if (row.getRq() != null && row.getJybh() != null) { teacherBlocked.put(row.getRq().toLocalDate().toString() + "#" + row.getJc() + "#" + row.getJybh(), "教员历不可用"); } @@ -646,7 +646,7 @@ public class SchedulingWindowServiceImpl implements SchedulingWindowService { if (sskcbh == null || sskcbh.isEmpty()) { throw new ServiceException("请指定运行课程", BAD_REQUEST); } - SSKC course = sskcMapper.selectById(sskcbh); + SSKC course = sskcMapper.selectByBhs(java.util.List.of(sskcbh)).stream().findFirst().orElse(null); if (course == null) { throw new ServiceException("运行课程不存在：" + sskcbh, NOT_FOUND); } diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/vo/classroom/VenueLessonVO.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/vo/classroom/VenueLessonVO.java new file mode 100644 index 000000000..3ea8e8853 --- /dev/null +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/vo/classroom/VenueLessonVO.java @@ -0,0 +1,40 @@ +package com.roomroot.jwgl.vo.classroom; + +import lombok.Data; + +/** + * 场地已排课次（场地历编辑器蓝格数据源）。 + */ +@Data +public class VenueLessonVO { + + /** + * 课次日期（yyyy-MM-dd）。 + */ + private String rq; + + /** + * 节次（单节次，1~12）。 + */ + private Integer jc; + + /** + * 课次编号（实施_课程表.编号）。 + */ + private String sskcbh; + + /** + * 课程名称。 + */ + private String kcmc; + + /** + * 教员姓名。 + */ + private String jyxm; + + /** + * 学员队名称（多个用；连接）。 + */ + private String xydmc; +} diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/vo/classroom/VenueScheduleItemVO.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/vo/classroom/VenueScheduleItemVO.java new file mode 100644 index 000000000..42a27254c --- /dev/null +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/vo/classroom/VenueScheduleItemVO.java @@ -0,0 +1,45 @@ +package com.roomroot.jwgl.vo.classroom; + +import lombok.Data; + +/** + * 场地占用总览条目：某日期+节次下，一个场地的占用状态。 + */ +@Data +public class VenueScheduleItemVO { + + /** + * 教室编号。 + */ + private String jsbh; + + /** + * 教室名称。 + */ + private String jsmc; + + /** + * 教学楼代号。 + */ + private String jxldh; + + /** + * 占用状态：free-空闲 / unavailable-场地历不可用 / occupied-已排课次 / noted-有场地备注（仍可排）。 + */ + private String status; + + /** + * 场地事件名称（场地历）。 + */ + private String mc; + + /** + * 占用课程名称（已排课次）。 + */ + private String kcmc; + + /** + * 占用学员队名称（已排课次）。 + */ + private String xydmc; +} diff --git a/frontend/src/api/teachBusiness/venueCalendar.js b/frontend/src/api/teachBusiness/venueCalendar.js new file mode 100644 index 000000000..74f0948eb --- /dev/null +++ b/frontend/src/api/teachBusiness/venueCalendar.js @@ -0,0 +1,81 @@ +import request from '@/utils/request' + +// 教学场地历（JXCDL 教学场地历 /classroom/jxcdl） +// 稀疏存储：只保存"事件"行（不可用/有备注），没有记录 = 默认可排。 +// 节次为单节次整数（1~12），段式格子（如 1-2）由前端展开为两行。 + +/** + * 按教室编号 + 日期范围查询场地历事件 + * GET /classroom/jxcdl/listByJsbhAndRange + */ +export function listVenueCalendarRange(jsbh, start, end) { + return request({ + url: '/classroom/jxcdl/listByJsbhAndRange', + method: 'get', + params: { jsbh, start, end } + }) +} + +/** + * 批量保存场地历事件（拖选区域写入，按 教室编号+日期+节次 判重覆盖） + * POST /classroom/jxcdl/batchSave + * @param list JXCDL 数组：{ jsbh, rq(yyyy-MM-dd HH:mm:ss), jc, kpk, mc, bz } + */ +export function batchSaveVenueCalendar(list) { + return request({ + url: '/classroom/jxcdl/batchSave', + method: 'post', + data: list + }) +} + +/** + * 按 ID 批量删除场地历事件（恢复可排） + * POST /classroom/jxcdl/batchDelete + */ +export function batchDeleteVenueCalendar(ids) { + return request({ + url: '/classroom/jxcdl/batchDelete', + method: 'post', + data: ids + }) +} + +/** + * 查询场地在日期范围内已排课次（编辑器蓝格数据源） + * GET /classroom/jxcdl/lessons + * 返回 [{ rq, jc, sskcbh, kcmc, jyxm, xydmc }] + */ +export function listVenueLessons(jsbh, start, end, nd) { + return request({ + url: '/classroom/jxcdl/lessons', + method: 'get', + params: { jsbh, start, end, nd } + }) +} + +/** + * 查询指定本场地为专用教室的班次（编辑器顶部横幅） + * GET /classroom/jxcdl/designatedTeams + * 返回字符串数组，如 ["一队（2025年度 第1学期）"] + */ +export function listVenueDesignatedTeams(jsbh) { + return request({ + url: '/classroom/jxcdl/designatedTeams', + method: 'get', + params: { jsbh } + }) +} + +/** + * 场地占用总览：某日期+节次全部场地的占用状态 + * GET /classroom/jxcdl/venueSchedule + * 返回 [{ jsbh, jsmc, jxldh, status(free/unavailable/occupied/noted), mc, kcmc, xydmc }] + */ +export function venueSchedule(rq, jc) { + return request({ + url: '/classroom/jxcdl/venueSchedule', + method: 'get', + params: { rq, jc } + }) +} diff --git a/frontend/src/views/teachBusiness/calendar/components/SchoolCalendarEditor.vue b/frontend/src/views/teachBusiness/calendar/components/SchoolCalendarEditor.vue index 27e8293d4..c4ee430b0 100644 --- a/frontend/src/views/teachBusiness/calendar/components/SchoolCalendarEditor.vue +++ b/frontend/src/views/teachBusiness/calendar/components/SchoolCalendarEditor.vue @@ -17,11 +17,11 @@
事件名称: - - 加粗显示 + + 加粗显示 可排课 - 正课 - 备注显示 + 正课 + 备注显示 备注: 设定 删除 吸取 + 规律生成 刷新 显示78节 @@ -45,6 +46,11 @@
+ +
+ 指定本场地为专用教室的班次：{{ designatedTeams.join('、') }} +
+
@@ -72,9 +78,11 @@ class="sce-cell" :class="cellClass(wIdx, col)" :data-key="cellKey(wIdx, col.colIndex)" + :title="cellTitle(wIdx, col)" @dblclick="onCellDblClick(wIdx, col)" > {{ getEvent(wIdx, col.colIndex).name }} + {{ lessonTextOf(wIdx, col.colIndex) }}{{ dateNumberOf(wIdx, col.dayIndex) }} @@ -85,7 +93,47 @@
已选 {{ selectedKeys.length }} 个时间格 已吸取：{{ absorbPreview }} + + 不可用 + 场地备注 + 已排课次 + 校历不可排 +
+ + + + + + + {{ d }} + + + + + {{ s.label }} + + + + + 至 + + 周 + + + 使用上方工具栏填写的「事件名称 / 可排课 / 备注」 + + + {{ rulePreviewCount }} 个时间格 + （跳过校历不可排/已排课 {{ ruleSkippedCount }} 格） + + +
+ 取 消 + 生 成 +
+ @@ -93,6 +141,13 @@ import { getSemester } from '@/api/teachBusiness/semester' import { listXqxlb, addXqxlb, updateXqxlb } from '@/api/teachBusiness/xqxlb' import { listClassCalendarEvent, updateClassCalendarEvent } from '@/api/teachOffice/classCalendarEvent' +import { + listVenueCalendarRange, + batchSaveVenueCalendar, + batchDeleteVenueCalendar, + listVenueLessons, + listVenueDesignatedTeams +} from '@/api/teachBusiness/venueCalendar' // 节次定义：12/34/56 常显，78/晚上/夜间由开关控制可见 const SLOT_DEFS = [ @@ -116,6 +171,9 @@ const SLOT_COURSE_MAP = { const WEEK_DAYS = ['周一', '周二', '周三', '周四', '周五', '周六', '周日'] +// 场地历：单节次 -> 节次格 key（1-2 节合并在同一格） +const JC_SLOT_MAP = { 1: '12', 2: '12', 3: '34', 4: '34', 5: '56', 6: '56', 7: '78', 8: '78', 9: 'night', 10: 'night', 11: 'late', 12: 'late' } + function pad2(n) { return n < 10 ? '0' + n : '' + n } @@ -142,6 +200,8 @@ export default { mode: { type: String, default: 'school' }, xydxqbh: { type: String, default: '' }, xydbh: { type: String, default: '' }, + // 场地历模式：教室编号 + jsbh: { type: String, default: '' }, rangeStart: { type: String, default: '' }, rangeEnd: { type: String, default: '' } }, @@ -181,7 +241,24 @@ export default { moved: false, // 是否发生移动（区分点击与拖拽） dragAddMode: false, // ctrl 拖拽为追加 // 窗口控制 - absorbPreview: '' + absorbPreview: '', + // ---- 场地历模式 ---- + // 校历不可排格：'yyyy-MM-dd#slotKey' -> 校历事件名（置灰只读，不落库） + schoolOff: {}, + // 已排课次（蓝格只读）：'yyyy-MM-dd#slotKey' -> [{ kcmc, jyxm, xydmc, jc }] + lessons: {}, + // 指定本场地为专用教室的班次（顶部横幅） + designatedTeams: [], + weekDayOptions: WEEK_DAYS, + slotOptions: SLOT_DEFS, + ruleDialog: { + visible: false, + submitting: false, + weekdays: [], + slots: [], + weekStart: 1, + weekEnd: 1 + } } }, computed: { @@ -202,6 +279,36 @@ export default { // 不再按日历起点/季度取年份，避免跨年度学期解析出错。 xqxlbNd() { return Number(String(this.nd).slice(0, 6)) || Number(this.nd) || 0 + }, + // 规律生成：预计写入的格子数（排除学期范围外/校历不可排/已排课的格） + ruleTargets() { + const cells = [] + let skipped = 0 + const dlg = this.ruleDialog + if (!dlg.weekdays.length || !dlg.slots.length || !this.calendarStart) return { cells, skipped } + const w0 = Math.max(0, (dlg.weekStart || 1) - 1) + const w1 = Math.min(this.totalWeeks - 1, (dlg.weekEnd || this.totalWeeks) - 1) + for (let w = w0; w <= w1; w++) { + dlg.weekdays.forEach(dayIndex => { + if (this.isOutOfRange(w, dayIndex)) return + const d = this.cellDate(w, dayIndex) + const dateStr = fmtDate(d) + dlg.slots.forEach(slotKey => { + if (this.isSchoolOff(dateStr, slotKey) || this.hasLessonAt(dateStr, slotKey)) { + skipped++ + return + } + cells.push({ dateStr, slotKey }) + }) + }) + } + return { cells, skipped } + }, + rulePreviewCount() { + return this.ruleTargets.cells.length + }, + ruleSkippedCount() { + return this.ruleTargets.skipped } }, watch: { @@ -217,6 +324,12 @@ export default { if (this.mode === 'class' && val) this.loadClassCalendar() } }, + jsbh: { + immediate: true, + handler(val) { + if (this.mode === 'venue' && val) this.loadVenueEvents() + } + }, visibleColumns(newCols, oldCols) { // 节次列显隐会改变列索引，按「周期-星期-节次」重定位事件，避免事件随时间格列偏移 if (oldCols && oldCols.length) { @@ -298,7 +411,8 @@ export default { this.calendarStart = null this.buildWeeks() } - this.loadXqxlbEvents() + if (this.mode === 'venue') this.loadVenueEvents() + else this.loadXqxlbEvents() }) .catch(() => { this.$message.warning('学期详情获取失败，请确认学期数据') @@ -360,6 +474,195 @@ export default { }) this.events = loaded }, + /* ---------- 场地历（venue 模式） ---------- */ + // 场地历为稀疏存储：只拉"事件"行，空格默认即"可排"； + // 校历不可排格（节假日）整格置灰只读不落库；已排课次蓝格只读。 + loadVenueEvents() { + if (!this.jsbh) return + const s = this.startDate ? fmtDate(this.startDate) : '' + const e = this.endDate ? fmtDate(this.endDate) : '' + Promise.all([ + listXqxlb({ nd: this.xqxlbNd }).catch(() => ({ data: [] })), + listVenueCalendarRange(this.jsbh, s, e).catch(() => ({ data: [] })), + listVenueLessons(this.jsbh, s, e, this.xqxlbNd).catch(() => ({ data: [] })), + listVenueDesignatedTeams(this.jsbh).catch(() => ({ data: [] })) + ]).then(([xlRes, evRes, lsRes, tmRes]) => { + const xlList = Array.isArray(xlRes.data) ? xlRes.data : (xlRes.data && xlRes.data.records) || [] + const evList = Array.isArray(evRes.data) ? evRes.data : (evRes.data && evRes.data.records) || [] + const lsList = Array.isArray(lsRes.data) ? lsRes.data : (lsRes.data && lsRes.data.records) || [] + this.designatedTeams = Array.isArray(tmRes.data) ? tmRes.data : [] + // 校历不可排格 -> 灰 + const off = {} + xlList.forEach(item => { + if (item.kpk === true || item.kpk === 1) return + const dateStr = String(item.jqsj || '').slice(0, 10) + const slotKey = this.courseClassToSlotKey(item.courseClass) + if (dateStr && slotKey) off[dateStr + '#' + slotKey] = item.jqmc || '校历不可排课' + }) + this.schoolOff = off + // 已排课次 -> 蓝 + const lessons = {} + lsList.forEach(item => { + const dateStr = String(item.rq || '').slice(0, 10) + const slotKey = JC_SLOT_MAP[item.jc] + if (!dateStr || !slotKey) return + const key = dateStr + '#' + slotKey + if (!lessons[key]) lessons[key] = [] + lessons[key].push(item) + }) + this.lessons = lessons + this.renderVenueEvents(evList) + }) + }, + renderVenueEvents(list) { + // 同格（日期+节次段）两行单节次记录归并为一个事件 + const merged = {} + list.forEach(row => { + const dateStr = String(row.rq || '').slice(0, 10) + const slotKey = JC_SLOT_MAP[row.jc] + if (!dateStr || !slotKey) return + const pos = this.locateDateSlot(dateStr, slotKey) + if (!pos) return + const colIndex = this.colIndexOf(pos.dayIndex, pos.slotKey) + const ck = colIndex >= 0 ? this.cellKey(pos.wIdx, colIndex) : null + const storeKey = ck || this.cellStableKey(pos.wIdx, pos.dayIndex, pos.slotKey) + const bucket = ck ? merged : this.hiddenEvents + const prev = bucket[storeKey] + if (prev) { + if (row.id) prev.ids.push(row.id) + if (!prev.name && row.mc) prev.name = row.mc + if (row.kpk === false || row.kpk === 0) prev.schedulable = false + if (!prev.remark && row.bz) prev.remark = row.bz + } else { + bucket[storeKey] = { + ids: row.id ? [row.id] : [], + name: row.mc || '', + schedulable: !(row.kpk === false || row.kpk === 0), + remark: row.bz || '' + } + } + }) + this.events = merged + }, + // 日期 + 节次格 -> 网格位置 + locateDateSlot(dateStr, slotKey) { + if (!this.calendarStart || !dateStr) return null + const d = new Date(dateStr.replace(/-/g, '/')) + if (isNaN(d.getTime())) return null + const offset = Math.round((d - this.calendarStart) / (24 * 3600 * 1000)) + if (offset < 0) return null + return { wIdx: Math.floor(offset / 7), dayIndex: offset % 7, slotKey } + }, + cellDateStr(wIdx, dayIndex) { + const d = this.cellDate(wIdx, dayIndex) + return d ? fmtDate(d) : '' + }, + isSchoolOff(dateStr, slotKey) { + return !!this.schoolOff[dateStr + '#' + slotKey] + }, + hasLessonAt(dateStr, slotKey) { + return !!(this.lessons[dateStr + '#' + slotKey] || []).length + }, + getLessons(wIdx, colIndex) { + const col = this.visibleColumns.find(c => c.colIndex === colIndex) + if (!col) return null + return this.lessons[this.cellDateStr(wIdx, col.dayIndex) + '#' + col.slotKey] || null + }, + lessonTextOf(wIdx, colIndex) { + const list = this.getLessons(wIdx, colIndex) || [] + const names = list.map(l => l.kcmc).filter(Boolean) + return names.length ? names.join('；') : '已排课' + }, + cellTitle(wIdx, col) { + if (this.mode !== 'venue') return '' + const dateStr = this.cellDateStr(wIdx, col.dayIndex) + const parts = [] + const offName = this.schoolOff[dateStr + '#' + col.slotKey] + if (offName) parts.push('校历：' + offName + '（不可排课）') + const ls = this.lessons[dateStr + '#' + col.slotKey] || [] + ls.forEach(l => { + parts.push('课次：' + (l.kcmc || '-') + + (l.jyxm ? ' / 教员：' + l.jyxm : '') + + (l.xydmc ? ' / 班次：' + l.xydmc : '')) + }) + const ev = this.getEvent(wIdx, col.colIndex) + if (ev && (ev.name || ev.remark)) { + parts.push('场地事件：' + (ev.name || '-') + (ev.remark ? '（' + ev.remark + '）' : '')) + } + return parts.join('\n') + }, + // 场地历可编辑格过滤：剔除校历不可排、已排课次、学期范围外的格 + filterVenueEditable(keys) { + const ok = [] + let skipped = 0 + keys.forEach(key => { + const pos = this.parseCellKey(key) + if (!pos) { skipped++; return } + const dateStr = this.cellDateStr(pos.wIdx, pos.dayIndex) + if (this.isOutOfRange(pos.wIdx, pos.dayIndex) + || this.isSchoolOff(dateStr, pos.slotKey) + || this.hasLessonAt(dateStr, pos.slotKey)) { + skipped++ + return + } + ok.push({ key, pos, dateStr }) + }) + return { ok, skipped } + }, + periodsOfSlot(slotKey) { + const seg = SLOT_COURSE_MAP[slotKey] + if (!seg) return [] + return seg.split('-').map(Number).filter(n => !isNaN(n)) + }, + /* ---------- 规律生成 ---------- */ + openRuleDialog() { + if (!this.toolbar.eventName.trim()) { + this.$message.warning('请先在上方工具栏填写事件名称') + return + } + this.ruleDialog.weekEnd = this.totalWeeks || 1 + this.ruleDialog.visible = true + }, + applyRuleGenerate() { + const name = this.toolbar.eventName.trim() + if (!name) { + this.$message.warning('请先填写事件名称') + return + } + const { cells } = this.ruleTargets + if (!cells.length) { + this.$message.warning('所选条件下没有可写入的时间格') + return + } + this.ruleDialog.submitting = true + this.saveVenueCells(cells, name).then(ok => { + if (ok) this.ruleDialog.visible = false + }).finally(() => { + this.ruleDialog.submitting = false + }) + }, + // 把 [{dateStr, slotKey}] 展开为单节次行并批量保存 + saveVenueCells(cells, name) { + const rows = [] + cells.forEach(c => { + this.periodsOfSlot(c.slotKey).forEach(jc => { + rows.push({ + jsbh: this.jsbh, + rq: c.dateStr + ' 00:00:00', + jc: jc, + kpk: !!this.toolbar.schedulable, + mc: name, + bz: this.toolbar.remark || null + }) + }) + }) + if (!rows.length) return Promise.resolve(false) + return batchSaveVenueCalendar(rows).then(res => { + this.$message.success((res && res.message) || '已保存 ' + rows.length + ' 条场地历') + this.reloadEvents() + return true + }).catch(() => false) + }, // 根据假期记录反推时间格位置（jqsj 日期 + courseClass 节次），与列是否可见无关 locateXqxlb(item) { if (!this.calendarStart || !item.jqsj) return null @@ -442,13 +745,20 @@ export default { cellClass(wIdx, col) { const classes = [] if (this.selectedKeys.includes(this.cellKey(wIdx, col.colIndex))) classes.push('is-selected') - // 班历：班次日期范围外的格子不可排，给出明确视觉提示 - if (this.mode === 'class' && this.isOutOfRange(wIdx, col.dayIndex)) { + // 班历/场地历：学期日期范围外的格子不可排，给出明确视觉提示 + if ((this.mode === 'class' || this.mode === 'venue') && this.isOutOfRange(wIdx, col.dayIndex)) { classes.push('is-out-of-range') } const ev = this.getEvent(wIdx, col.colIndex) - // 可排课的全部白色；不可排课且事件名非空才标红 - if (ev && ev.name && !ev.schedulable) { + if (this.mode === 'venue') { + const dateStr = this.cellDateStr(wIdx, col.dayIndex) + // 校历不可排（节假日）置灰只读；已排课次蓝色只读 + if (this.isSchoolOff(dateStr, col.slotKey)) classes.push('is-school-off') + if (this.hasLessonAt(dateStr, col.slotKey)) classes.push('has-lesson') + // 场地事件：不可排标红，仍可排的纯备注标黄 + if (ev) classes.push(ev.schedulable ? 'has-note' : 'no-schedule') + } else if (ev && ev.name && !ev.schedulable) { + // 可排课的全部白色；不可排课且事件名非空才标红 classes.push('no-schedule') } return classes @@ -585,6 +895,16 @@ export default { } } const keys = [...this.selectedKeys] + // 场地历：过滤不可编辑格（校历不可排/已排课次/范围外），按单节次展开批量保存 + if (this.mode === 'venue') { + const { ok, skipped } = this.filterVenueEditable(keys) + if (skipped > 0) { + this.$message.warning(`已跳过 ${skipped} 个不可编辑格（校历不可排/已排课次/范围外）`) + } + if (!ok.length) return + this.saveVenueCells(ok.map(t => ({ dateStr: t.dateStr, slotKey: t.pos.slotKey })), name) + return + } keys.forEach(key => { const prev = this.events[key] this.$set(this.events, key, { @@ -613,6 +933,25 @@ export default { type: 'warning' }).then(() => { const keys = [...this.selectedKeys] + // 场地历：收集事件行 ID 走批量删除 + if (this.mode === 'venue') { + const ids = [] + keys.forEach(key => { + const ev = this.events[key] + if (ev && ev.ids) ids.push(...ev.ids) + }) + if (!ids.length) { + this.$message.warning('所选时间格没有场地事件') + return + } + batchDeleteVenueCalendar(ids).then(res => { + this.$message.success((res && res.message) || '已删除场地事件') + keys.forEach(key => this.$delete(this.events, key)) + this.selectedKeys = [] + this.reloadEvents() + }).catch(() => {}) + return + } this.persistDeleteEvents(keys).then(({ ok, fail }) => { if (fail === 0) { keys.forEach(key => { @@ -643,6 +982,17 @@ export default { }, onCellDblClick(wIdx, col) { const ev = this.getEvent(wIdx, col.colIndex) + // 场地历：双击蓝格显示课次详情 + if (this.mode === 'venue') { + const ls = this.getLessons(wIdx, col.colIndex) + if (ls && ls.length && !(ev && ev.name)) { + const lines = ls.map(l => '课程：' + (l.kcmc || '-') + + (l.jyxm ? '　教员：' + l.jyxm : '') + + (l.xydmc ? '　班次：' + l.xydmc : '')) + this.$alert(lines.join('
'), '已排课次', { dangerouslyUseHTMLString: true }) + return + } + } if (ev && ev.name) { this.toolbar.eventName = ev.name this.toolbar.bold = !!ev.bold @@ -660,6 +1010,7 @@ export default { this.events = {} this.hiddenEvents = {} if (this.mode === 'class') this.loadClassEvents() + else if (this.mode === 'venue') this.loadVenueEvents() else this.loadXqxlbEvents() this.$message.info('已刷新') }, @@ -667,6 +1018,7 @@ export default { this.events = {} this.hiddenEvents = {} if (this.mode === 'class') this.loadClassEvents() + else if (this.mode === 'venue') this.loadVenueEvents() else this.loadXqxlbEvents() }, savePayload(payload) { @@ -765,7 +1117,7 @@ export default { /* ---------- 返回学期管理 ---------- */ handleClose() { this.$emit('close') - if (this.mode !== 'class') { + if (this.mode === 'school') { this.$router.replace({ path: '/teachBusiness/semester' }) } } @@ -827,6 +1179,15 @@ export default { .sce-divider { width: 1px; height: 18px; background: #dcdfe6; margin: 0 14px; } } + /* 场地历：专用教室横幅 */ + .sce-venue-banner { + padding: 6px 14px; + font-size: 12px; + color: #e6a23c; + background: #fdf6ec; + border-bottom: 1px solid #ebeef5; + } + /* 时间编排区 */ .sce-grid-wrap { flex: 1; @@ -912,6 +1273,34 @@ export default { // 可排课白色，不可排课且有事件标红 &.no-schedule { background: #fde2e2; } + // 场地历：仍可排的纯备注事件标黄 + &.has-note { background: #fdf6ec; } + + // 场地历：已排课次蓝格（只读） + &.has-lesson { + background: #e8f1fd; + cursor: default; + + .sce-lesson-name { + display: block; + font-size: 10px; + color: #409eff; + line-height: 1; + padding: 2px 0; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + } + + // 场地历：校历不可排格置灰只读 + &.is-school-off { + background: #f0f0f0; + cursor: not-allowed; + + .sce-date-num { color: #c0c4cc; } + } + // 班历：班次日期范围外的格子不可排 &.is-out-of-range { background: #f4f4f5; @@ -936,6 +1325,28 @@ export default { background: #fafafa; .sce-absorb-tip { margin-left: 12px; color: #00875a; } + + .sce-legend { + float: right; + + .lg { + display: inline-block; + width: 10px; + height: 10px; + margin: 0 4px 0 14px; + border: 1px solid #dcdfe6; + vertical-align: middle; + } + .lg-red { background: #fde2e2; } + .lg-yellow { background: #fdf6ec; } + .lg-blue { background: #e8f1fd; } + .lg-gray { background: #f0f0f0; } + } } } + +.rule-week { width: 110px; } +.rule-sep { margin: 0 8px; color: #606266; } +.rule-unit { margin-left: 8px; color: #606266; } +.rule-hint { font-size: 12px; color: #909399; } diff --git a/frontend/src/views/teachBusiness/venue/calendarEditor.vue b/frontend/src/views/teachBusiness/venue/calendarEditor.vue new file mode 100644 index 000000000..c09d15c02 --- /dev/null +++ b/frontend/src/views/teachBusiness/venue/calendarEditor.vue @@ -0,0 +1,131 @@ + + + + + diff --git a/frontend/src/views/teachBusiness/venue/index.vue b/frontend/src/views/teachBusiness/venue/index.vue index 32a6d2b3f..0cf251504 100644 --- a/frontend/src/views/teachBusiness/venue/index.vue +++ b/frontend/src/views/teachBusiness/venue/index.vue @@ -75,9 +75,10 @@ - + @@ -202,6 +203,9 @@ 确 定 + + + @@ -214,9 +218,11 @@ import { listAllClassroom } from '@/api/teachBusiness/classroom' import { listAllBuild } from '@/api/teachBusiness/build' +import VenueCalendarEditor from './calendarEditor.vue' export default { name: 'Venue', + components: { VenueCalendarEditor }, data() { return { loading: false, @@ -241,6 +247,9 @@ export default { submitting: false, form: this.createEmptyForm() }, + // 场地历编辑弹窗 + calendarVisible: false, + calendarVenue: null, rules: { jsmc: [{ required: true, message: '请输入教室名称', trigger: 'blur' }] } @@ -403,6 +412,16 @@ export default { }).catch(() => {}) }, + /* ---------- 场地历 ---------- */ + handleCalendarEdit(row) { + if (!row.jsbh) { + this.$message.warning('该场地缺少教室编号，无法维护场地历') + return + } + this.calendarVenue = row + this.calendarVisible = true + }, + /* ---------- 工具 ---------- */ createEmptyForm() { return {