fanxp 2 éve
szülő
commit
fe1d536033

+ 2 - 3
src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -244,9 +244,8 @@ public class UserController {
                     .selectAs(BaseStudentUser::getId, UserStudentVo::getStudentId)
                     .selectAs(BaseStudentUser::getAvatar, UserStudentVo::getAvatar);
 
-            List<BaseClass> list = baseClassService.list(queryWrapper);
-            List<UserStudentVo> userStudentVoList = BeanUtil.copyToList(list, UserStudentVo.class);
-            vo.setStudents(userStudentVoList);
+            List<UserStudentVo> list = baseClassService.selectJoinList(UserStudentVo.class,queryWrapper);
+            vo.setStudents(list);
         }
 
         return R.ok(vo);

+ 4 - 0
src/main/java/com/xjrsoft/module/organization/service/impl/UserServiceImpl.java

@@ -73,6 +73,10 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
         if (count > 0) {
             throw new MyException("用户名称或编码已存在");
         }
+        count = count(Wrappers.<User>query().lambda().eq(User::getMobile, dto.getMobile()));
+        if (count > 0) {
+            throw new MyException("手机号码已存在");
+        }
         User user = BeanUtil.toBean(dto, User.class);
 
         //密码加密加盐存储到数据库

+ 51 - 1
src/main/resources/sqlScript/init_sql.sql

@@ -800,7 +800,7 @@ CREATE TABLE `base_face_identify_records`  (
 DROP TABLE IF EXISTS sms_send_record;
 create table sms_send_record
 (
-    id int not null auto_increment comment '主键编号' ,
+    id bigint not null comment '主键编号' ,
     mobile_number varchar(64) not null comment '手机号码',
     sms varchar(512) not null default '' comment '短信内容',
     `status` tinyint(4) unsigned default 1 not null comment '状态 1=已发送 2=发送失败',
@@ -824,4 +824,54 @@ create table base_user_student
     primary key (`id`)
 ) engine=innodb default charset=utf8mb4 COLLATE = utf8mb4_0900_ai_ci comment '家长学生关联表';
 
+-- ----------------------------
+-- 上课时间
+-- ----------------------------
+drop table if exists class_time;
+create table class_time
+(
+    id bigint not null comment '主键编号' ,
+    time_period int default 0 not null  comment '时段(1=上午 2=下午 3=晚上)',
+    number int not null comment '节次',
+    full_name varchar(200)  not null default '' comment '全称',
+    short_name varchar(100)  not null default '' comment '简称',
+    `summer_start_time` time not null comment '夏天开始时间',
+    `summer_end_time` time not null comment '夏天结束时间',
+    `winter_start_time` time not null comment '冬天开始时间',
+    `winter_end_time` time not null comment '冬天结束时间',
+    remark varchar(2000) not null default '' comment '备注',
+    `create_date` date null default null COMMENT '创建时间',
+    `modify_date` date null default null COMMENT '修改时间',
+    primary key (`id`),
+    unique key `only`(`time_group`,`time_period`,`number`)
+) engine=innodb default charset=utf8mb4 comment '上课时间';
+
+-- ----------------------------
+-- 课表
+-- ----------------------------
+drop table if exists course_table;
+create table course_table
+(
+    id bigint not null comment '主键编号' ,
+    `base_semester_id` bigint not null COMMENT '学期ID(base_semester)',
+    teacher_id int not null default 0 comment '教师编号(用户表)',
+    teacher_name varchar(50) not null default '' comment '教师名称',
+    course_id int not null default 0 comment '课程编号(course)',
+    course_name varchar(200) not null default '' comment '课程名称',
+    class_id int not null default 0 comment '班级编号(class)',
+    class_name varchar(200) not null default '' comment '班级名称',
+    week int not null comment '周',
+    weeks int not null comment '星期几(1-7)',
+    weeks_cn varchar(200) not null comment '星期中文',
+    time_period int default 0 not null  comment '时段(1=上午 2=下午 3=晚上)',
+    time_number  int not null comment '节次',
+    site_id int not null default 0 comment '场地编号(site)',
+    site_name varchar(200) not null default '' comment '场地名称',
+    status int not null default 1 comment '状态 1=正常 2=错误',
+    err_msg varchar(200) not null default '' comment '错误信息描述',
+    `create_date` date null default null COMMENT '创建时间',
+    `modify_date` date null default null COMMENT '修改时间',
+    primary key (`id`)
+) engine=innodb default charset=utf8mb4 comment '课表';
+
 SET FOREIGN_KEY_CHECKS = 1;