添加排课功能

backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/JYL.java

@@ -3,6 +3,7 @@ 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.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -24,36 +25,43 @@ public class JYL {
     /**
      * 名称
      */
+    @TableField("名称")
     private String mc;
 
     /**
      * 可排课
      */
+    @TableField("可排课")
     private Integer kpk;
 
     /**
      * 日期
      */
+    @TableField("日期")
     private LocalDateTime rq;
 
     /**
      * 节次
      */
+    @TableField("节次")
     private Integer jc;
 
     /**
      * 创建时间
      */
+    @TableField("创建时间")
     private LocalDateTime cjsj;
 
     /**
      * 备注
      */
+    @TableField("备注")
     private String bz;
 
     /**
      * 教员编号
      */
+    @TableField("教员编号")
     private String jybh;
 
 }

backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSKCBFZJY.java

@@ -3,6 +3,7 @@ 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.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -24,46 +25,55 @@ public class SSKCBFZJY {
     /**
      * 实施_课程表编号
      */
+    @TableField("实施_课程表编号")
     private String sskcbbh;
 
     /**
      * 辅助教员编号
      */
+    @TableField("辅助教员编号")
     private String fzjybh;
 
     /**
      * 主教员
      */
+    @TableField("主教员")
     private Integer zjy;
 
     /**
      * 年度
      */
+    @TableField("年度")
     private Integer nd;
 
     /**
      * 参与学员测评
      */
+    @TableField("参与学员测评")
     private Integer cyxycp;
 
     /**
      * 学员测评平均分
      */
+    @TableField("学员测评平均分")
     private Float xycppjf;
 
     /**
      * 备注
      */
+    @TableField("备注")
     private String bz;
 
     /**
      * 日期
      */
+    @TableField("日期")
     private LocalDateTime rq;
 
     /**
      * 节次
      */
+    @TableField("节次")
     private Integer jc;
 
 }

backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/SSKCBXYD.java

@@ -3,6 +3,7 @@ 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.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -24,36 +25,43 @@ public class SSKCBXYD {
     /**
      * 实施_课程表编号
      */
+    @TableField("实施_课程表编号")
     private String sskcbbh;
 
     /**
      * 学员队编号
      */
+    @TableField("学员队编号")
     private String xydbh;
 
     /**
      * 人数
      */
+    @TableField("人数")
     private Integer rs;
 
     /**
      * 简称
      */
+    @TableField("简称")
     private String jc;
 
     /**
      * 年度
      */
+    @TableField("年度")
     private Integer nd;
 
     /**
      * 日期
      */
+    @TableField("日期")
     private LocalDateTime rq;
 
     /**
      * 节次
      */
+    @TableField("节次")
     private Integer jc2;
 
 }

backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/SchedulingWindowServiceImpl.java

@@ -399,6 +399,7 @@ public class SchedulingWindowServiceImpl implements SchedulingWindowService {
                 lesson.setBh(UuidUtil.getUUID());
                 lesson.setSskcbh(course.getBh());
                 lesson.setJhsjap(0);
+                lesson.setSjsjap(0);
                 lesson.setJxnr(request.getJxnr());
                 lesson.setJxyd(request.getJxyd());
                 lesson.setJxff(request.getJxff() == null || request.getJxff().isEmpty() ? "理论讲授" : request.getJxff());
@@ -406,10 +407,11 @@ public class SchedulingWindowServiceImpl implements SchedulingWindowService {
                 lesson.setJc(cell.getJc());
                 lesson.setNd(ctx.ndCode);
                 lesson.setSczt(0);
+                lesson.setXycpzt("未开始");
                 lesson.setJcdj(request.getJcdj() == null ? 0 : request.getJcdj());
                 lesson.setJxbzbz(request.getJxbzbz());
                 lesson.setYcxx(request.getYcxx());
-                lesson.setBzms(request.getBzms());
+                lesson.setBzms(request.getBzms() == null || request.getBzms().isEmpty() ? "行政班" : request.getBzms());
                 lesson.setCjsj(now);
                 lesson.setBdsj(now);
                 sskcbMapper.insert(lesson);