news

src/main/java/com/xjrsoft/module/oa/controller/NewsController.java

@@ -18,6 +18,7 @@ import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.oa.dto.AddNewsDto;
 import com.xjrsoft.module.oa.dto.NewsPageDto;
+import com.xjrsoft.module.oa.dto.UpdateNewsDto;
 import com.xjrsoft.module.oa.entity.Message;
 import com.xjrsoft.module.oa.entity.News;
 import com.xjrsoft.module.oa.entity.NewsRelation;
@@ -112,8 +113,8 @@ public class NewsController {
 
     @PutMapping
     @ApiOperation(value = "修改新闻")
-    public R update(@RequestBody AddNewsDto addNewsDto) {
-        News news = BeanUtil.toBean(addNewsDto, News.class);
+    public R update(@RequestBody UpdateNewsDto updateNewsDto) {
+        News news = BeanUtil.toBean(updateNewsDto, News.class);
         return R.ok(newsService.updateById(news));
     }
 

src/main/java/com/xjrsoft/module/oa/dto/AddNewsDto.java

@@ -24,6 +24,13 @@ public class AddNewsDto {
     @Min(value = 1, message = "类型必须大于0")
     private Integer typeId;
 
+    @ApiModelProperty("班级(base_class)")
+    private Long classId;
+
+    @ApiModelProperty("状态 1=未发布 2=已发布 3=下架")
+    @Min(value = 1, message = "类型必须大于0")
+    private Integer status;
+
     /**
      * 父级主键
      */

src/main/java/com/xjrsoft/module/oa/entity/News.java

@@ -32,6 +32,12 @@ public class News extends AuditEntity implements Serializable {
     @ApiModelProperty("类型（1-新闻2-公告）")
     private Integer typeId;
 
+    @ApiModelProperty("班级(base_class)")
+    private Long classId;
+
+    @ApiModelProperty("状态 1=未发布 2=已发布 3=下架")
+    private Integer status;
+
     @ApiModelProperty("所属类别主键")
     private Long categoryId;
 

src/main/java/com/xjrsoft/module/student/controller/StudentManagerController.java

@@ -3,16 +3,12 @@ package com.xjrsoft.module.student.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.dev.entity.BaseTeacher;
-import com.xjrsoft.module.dev.entity.XjrUser;
-import com.xjrsoft.module.dev.vo.XjrUserPageVo;
 import com.xjrsoft.module.student.dto.AddBaseStudentUserDto;
 import com.xjrsoft.module.student.dto.BaseStudentUserPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentUserDto;

src/main/java/com/xjrsoft/module/dev/controller/TeacherbaseManagerController.java → src/main/java/com/xjrsoft/module/teacher/controller/TeacherbaseManagerController.java

@@ -1,46 +1,32 @@
-package com.xjrsoft.module.dev.controller;
+package com.xjrsoft.module.teacher.controller;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.xjrsoft.common.constant.GlobalConstant;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.authority.entity.DataAuth;
-import com.xjrsoft.module.authority.vo.DataAuthListVo;
-import com.xjrsoft.module.dev.dto.AddXjrUserDto;
-import com.xjrsoft.module.dev.dto.UpdateXjrUserDto;
+import com.xjrsoft.module.teacher.dto.AddXjrUserDto;
+import com.xjrsoft.module.teacher.dto.UpdateXjrUserDto;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 
-import com.xjrsoft.module.dev.dto.XjrUserPageDto;
-import com.xjrsoft.module.dev.entity.BaseTeacher;
-import com.xjrsoft.module.dev.entity.XjrUser;
-import com.xjrsoft.module.dev.service.ITeacherbaseManagerService;
-import com.xjrsoft.module.dev.vo.XjrUserPageVo;
-
-import com.xjrsoft.module.dev.vo.XjrUserVo;
-import com.xjrsoft.module.form.entity.FormTemplate;
-import com.xjrsoft.module.form.vo.FormTemplateListVo;
-import com.xjrsoft.module.oa.entity.NewsRelation;
-import com.xjrsoft.module.oa.vo.NewsPageVo;
-import com.xjrsoft.module.organization.entity.User;
+import com.xjrsoft.module.teacher.dto.XjrUserPageDto;
+import com.xjrsoft.module.teacher.entity.BaseTeacher;
+import com.xjrsoft.module.teacher.entity.XjrUser;
+import com.xjrsoft.module.teacher.service.ITeacherbaseManagerService;
+import com.xjrsoft.module.teacher.vo.XjrUserPageVo;
+
+import com.xjrsoft.module.teacher.vo.XjrUserVo;
 import com.xjrsoft.module.system.entity.DictionaryDetail;
 import com.xjrsoft.module.system.service.IDictionarydetailService;
-import com.xjrsoft.module.system.vo.DictionaryItemDetailVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -50,8 +36,8 @@ import java.util.List;
 * @Version 1.0
 */
 @RestController
-@RequestMapping("/dev" + "/teacherbasemanager")
-@Api(value = "/dev"  + "/teacherbasemanager",tags = "教职工基本信息管理代码")
+@RequestMapping("/teacher" + "/teacherbasemanager")
+@Api(value = "/teacher"  + "/teacherbasemanager",tags = "教职工基本信息管理代码")
 @AllArgsConstructor
 public class TeacherbaseManagerController {
 

src/main/java/com/xjrsoft/module/dev/dto/AddBaseTeacherContactDto.java → src/main/java/com/xjrsoft/module/teacher/dto/AddBaseTeacherContactDto.java

@@ -1,15 +1,8 @@
-package com.xjrsoft.module.dev.dto;
+package com.xjrsoft.module.teacher.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-
 
 
 /**

src/main/java/com/xjrsoft/module/dev/dto/AddBaseTeacherDto.java → src/main/java/com/xjrsoft/module/teacher/dto/AddBaseTeacherDto.java

@@ -1,16 +1,11 @@
-package com.xjrsoft.module.dev.dto;
+package com.xjrsoft.module.teacher.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
-
 
 
 /**

src/main/java/com/xjrsoft/module/dev/dto/AddBaseTeacherEducationDto.java → src/main/java/com/xjrsoft/module/teacher/dto/AddBaseTeacherEducationDto.java

@@ -1,15 +1,8 @@
-package com.xjrsoft.module.dev.dto;
+package com.xjrsoft.module.teacher.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-
 
 
 /**

src/main/java/com/xjrsoft/module/dev/dto/AddBaseTeacherEmployDto.java → src/main/java/com/xjrsoft/module/teacher/dto/AddBaseTeacherEmployDto.java

@@ -1,15 +1,8 @@
-package com.xjrsoft.module.dev.dto;
+package com.xjrsoft.module.teacher.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-
 
 
 /**

src/main/java/com/xjrsoft/module/dev/dto/AddBaseTeacherFamilyDto.java → src/main/java/com/xjrsoft/module/teacher/dto/AddBaseTeacherFamilyDto.java

@@ -1,15 +1,8 @@
-package com.xjrsoft.module.dev.dto;
+package com.xjrsoft.module.teacher.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-
 
 
 /**

src/main/java/com/xjrsoft/module/dev/dto/AddBaseTeacherFamilyMemberDto.java → src/main/java/com/xjrsoft/module/teacher/dto/AddBaseTeacherFamilyMemberDto.java

@@ -1,16 +1,11 @@
-package com.xjrsoft.module.dev.dto;
+package com.xjrsoft.module.teacher.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
-
 
 
 /**

src/main/java/com/xjrsoft/module/dev/dto/AddBaseTeacherRegularDto.java → src/main/java/com/xjrsoft/module/teacher/dto/AddBaseTeacherRegularDto.java

@@ -1,4 +1,4 @@
-package com.xjrsoft.module.dev.dto;
+package com.xjrsoft.module.teacher.dto;
 
 import com.alibaba.fastjson.JSONArray;
 import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/com/xjrsoft/module/dev/dto/AddXjrUserDto.java → src/main/java/com/xjrsoft/module/teacher/dto/AddXjrUserDto.java

@@ -1,22 +1,10 @@
-package com.xjrsoft.module.dev.dto;
+package com.xjrsoft.module.teacher.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
 import java.util.List;
-import com.xjrsoft.module.dev.entity.BaseTeacher;
-import com.xjrsoft.module.dev.entity.BaseTeacherContact;
-import com.xjrsoft.module.dev.entity.BaseTeacherEducation;
-import com.xjrsoft.module.dev.entity.BaseTeacherEmploy;
-import com.xjrsoft.module.dev.entity.BaseTeacherFamily;
-import com.xjrsoft.module.dev.entity.BaseTeacherFamilyMember;
-import com.xjrsoft.module.dev.entity.BaseTeacherRegular;
-
 
 
 /**

src/main/java/com/xjrsoft/module/dev/dto/UpdateBaseTeacherContactDto.java → src/main/java/com/xjrsoft/module/teacher/dto/UpdateBaseTeacherContactDto.java

@@ -1,16 +1,9 @@
-package com.xjrsoft.module.dev.dto;
+package com.xjrsoft.module.teacher.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-
-
 
 /**
 * @title: 教职工基本信息管理

src/main/java/com/xjrsoft/module/dev/dto/UpdateBaseTeacherDto.java → src/main/java/com/xjrsoft/module/teacher/dto/UpdateBaseTeacherDto.java

@@ -1,17 +1,14 @@
-package com.xjrsoft.module.dev.dto;
+package com.xjrsoft.module.teacher.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
 
-import java.time.LocalTime;
 import java.time.LocalDateTime;
-import java.math.BigDecimal;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.util.Date;
-import java.util.List;
-
 
 
 /**

src/main/java/com/xjrsoft/module/dev/dto/UpdateBaseTeacherEducationDto.java → src/main/java/com/xjrsoft/module/teacher/dto/UpdateBaseTeacherEducationDto.java

@@ -1,16 +1,9 @@
-package com.xjrsoft.module.dev.dto;
+package com.xjrsoft.module.teacher.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-
-
 
 /**
 * @title: 教职工基本信息管理

src/main/java/com/xjrsoft/module/dev/dto/UpdateBaseTeacherEmployDto.java → src/main/java/com/xjrsoft/module/teacher/dto/UpdateBaseTeacherEmployDto.java

@@ -1,16 +1,9 @@
-package com.xjrsoft.module.dev.dto;
+package com.xjrsoft.module.teacher.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-
-
 
 /**
 * @title: 教职工基本信息管理

src/main/java/com/xjrsoft/module/dev/dto/UpdateBaseTeacherFamilyDto.java → src/main/java/com/xjrsoft/module/teacher/dto/UpdateBaseTeacherFamilyDto.java

@@ -1,16 +1,9 @@
-package com.xjrsoft.module.dev.dto;
+package com.xjrsoft.module.teacher.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-
-
 
 /**
 * @title: 教职工基本信息管理

src/main/java/com/xjrsoft/module/dev/dto/UpdateBaseTeacherFamilyMemberDto.java → src/main/java/com/xjrsoft/module/teacher/dto/UpdateBaseTeacherFamilyMemberDto.java

@@ -1,17 +1,12 @@
-package com.xjrsoft.module.dev.dto;
+package com.xjrsoft.module.teacher.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.util.Date;
-import java.util.List;
-
 
 
 /**

src/main/java/com/xjrsoft/module/dev/dto/UpdateBaseTeacherRegularDto.java → src/main/java/com/xjrsoft/module/teacher/dto/UpdateBaseTeacherRegularDto.java

@@ -1,4 +1,4 @@
-package com.xjrsoft.module.dev.dto;
+package com.xjrsoft.module.teacher.dto;
 
 import com.alibaba.fastjson.JSONArray;
 import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/com/xjrsoft/module/dev/dto/UpdateXjrUserDto.java → src/main/java/com/xjrsoft/module/teacher/dto/UpdateXjrUserDto.java

@@ -1,22 +1,10 @@
-package com.xjrsoft.module.dev.dto;
+package com.xjrsoft.module.teacher.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.List;
-import com.xjrsoft.module.dev.entity.BaseTeacher;
-import com.xjrsoft.module.dev.entity.BaseTeacherContact;
-import com.xjrsoft.module.dev.entity.BaseTeacherEducation;
-import com.xjrsoft.module.dev.entity.BaseTeacherEmploy;
-import com.xjrsoft.module.dev.entity.BaseTeacherFamily;
-import com.xjrsoft.module.dev.entity.BaseTeacherFamilyMember;
-import com.xjrsoft.module.dev.entity.BaseTeacherRegular;
-
 
 
 /**

src/main/java/com/xjrsoft/module/dev/dto/XjrUserPageDto.java → src/main/java/com/xjrsoft/module/teacher/dto/XjrUserPageDto.java

@@ -1,14 +1,9 @@
-package com.xjrsoft.module.dev.dto;
+package com.xjrsoft.module.teacher.dto;
 
 import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
 
 
 /**

src/main/java/com/xjrsoft/module/dev/entity/BaseTeacher.java → src/main/java/com/xjrsoft/module/teacher/entity/BaseTeacher.java

@@ -1,4 +1,4 @@
-package com.xjrsoft.module.dev.entity;
+package com.xjrsoft.module.teacher.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,16 +6,12 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
-import java.time.LocalTime;
 import java.time.LocalDateTime;
-import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
 
 
 /**

src/main/java/com/xjrsoft/module/dev/entity/BaseTeacherContact.java → src/main/java/com/xjrsoft/module/teacher/entity/BaseTeacherContact.java

@@ -1,19 +1,15 @@
-package com.xjrsoft.module.dev.entity;
+package com.xjrsoft.module.teacher.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
-import java.time.LocalTime;
 import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 
 
 /**

src/main/java/com/xjrsoft/module/dev/entity/BaseTeacherEducation.java → src/main/java/com/xjrsoft/module/teacher/entity/BaseTeacherEducation.java

@@ -1,19 +1,15 @@
-package com.xjrsoft.module.dev.entity;
+package com.xjrsoft.module.teacher.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
-import java.time.LocalTime;
 import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 
 
 /**

src/main/java/com/xjrsoft/module/dev/entity/BaseTeacherEmploy.java → src/main/java/com/xjrsoft/module/teacher/entity/BaseTeacherEmploy.java

@@ -1,19 +1,15 @@
-package com.xjrsoft.module.dev.entity;
+package com.xjrsoft.module.teacher.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
-import java.time.LocalTime;
 import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 
 
 /**

src/main/java/com/xjrsoft/module/dev/entity/BaseTeacherFamily.java → src/main/java/com/xjrsoft/module/teacher/entity/BaseTeacherFamily.java

@@ -1,19 +1,15 @@
-package com.xjrsoft.module.dev.entity;
+package com.xjrsoft.module.teacher.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
-import java.time.LocalTime;
 import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 
 
 /**

src/main/java/com/xjrsoft/module/dev/entity/BaseTeacherFamilyMember.java → src/main/java/com/xjrsoft/module/teacher/entity/BaseTeacherFamilyMember.java

@@ -1,4 +1,4 @@
-package com.xjrsoft.module.dev.entity;
+package com.xjrsoft.module.teacher.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,16 +6,12 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
-import java.time.LocalTime;
 import java.time.LocalDateTime;
-import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
 
 
 /**

src/main/java/com/xjrsoft/module/dev/entity/BaseTeacherRegular.java → src/main/java/com/xjrsoft/module/teacher/entity/BaseTeacherRegular.java

@@ -1,4 +1,4 @@
-package com.xjrsoft.module.dev.entity;
+package com.xjrsoft.module.teacher.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;

src/main/java/com/xjrsoft/module/dev/entity/XjrUser.java → src/main/java/com/xjrsoft/module/teacher/entity/XjrUser.java

@@ -1,4 +1,4 @@
-package com.xjrsoft.module.dev.entity;
+package com.xjrsoft.module.teacher.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -10,9 +10,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
-import java.time.LocalTime;
 import java.time.LocalDateTime;
-import java.math.BigDecimal;
 import java.util.List;
 
 

src/main/java/com/xjrsoft/module/dev/mapper/BaseTeacherContactMapper.java → src/main/java/com/xjrsoft/module/teacher/mapper/BaseTeacherContactMapper.java

@@ -1,8 +1,7 @@
-package com.xjrsoft.module.dev.mapper;
+package com.xjrsoft.module.teacher.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.dev.entity.BaseTeacherContact;
+import com.xjrsoft.module.teacher.entity.BaseTeacherContact;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/xjrsoft/module/dev/mapper/BaseTeacherEducationMapper.java → src/main/java/com/xjrsoft/module/teacher/mapper/BaseTeacherEducationMapper.java

@@ -1,8 +1,7 @@
-package com.xjrsoft.module.dev.mapper;
+package com.xjrsoft.module.teacher.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.dev.entity.BaseTeacherEducation;
+import com.xjrsoft.module.teacher.entity.BaseTeacherEducation;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/xjrsoft/module/dev/mapper/BaseTeacherEmployMapper.java → src/main/java/com/xjrsoft/module/teacher/mapper/BaseTeacherEmployMapper.java

@@ -1,8 +1,7 @@
-package com.xjrsoft.module.dev.mapper;
+package com.xjrsoft.module.teacher.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.dev.entity.BaseTeacherEmploy;
+import com.xjrsoft.module.teacher.entity.BaseTeacherEmploy;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/xjrsoft/module/dev/mapper/BaseTeacherFamilyMapper.java → src/main/java/com/xjrsoft/module/teacher/mapper/BaseTeacherFamilyMapper.java

@@ -1,8 +1,7 @@
-package com.xjrsoft.module.dev.mapper;
+package com.xjrsoft.module.teacher.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.dev.entity.BaseTeacherFamily;
+import com.xjrsoft.module.teacher.entity.BaseTeacherFamily;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/xjrsoft/module/dev/mapper/BaseTeacherFamilyMemberMapper.java → src/main/java/com/xjrsoft/module/teacher/mapper/BaseTeacherFamilyMemberMapper.java

@@ -1,8 +1,7 @@
-package com.xjrsoft.module.dev.mapper;
+package com.xjrsoft.module.teacher.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.dev.entity.BaseTeacherFamilyMember;
+import com.xjrsoft.module.teacher.entity.BaseTeacherFamilyMember;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/xjrsoft/module/dev/mapper/BaseTeacherMapper.java → src/main/java/com/xjrsoft/module/teacher/mapper/BaseTeacherMapper.java

@@ -1,8 +1,7 @@
-package com.xjrsoft.module.dev.mapper;
+package com.xjrsoft.module.teacher.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.dev.entity.BaseTeacher;
+import com.xjrsoft.module.teacher.entity.BaseTeacher;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/xjrsoft/module/dev/mapper/BaseTeacherRegularMapper.java → src/main/java/com/xjrsoft/module/teacher/mapper/BaseTeacherRegularMapper.java

@@ -1,8 +1,7 @@
-package com.xjrsoft.module.dev.mapper;
+package com.xjrsoft.module.teacher.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.dev.entity.BaseTeacherRegular;
+import com.xjrsoft.module.teacher.entity.BaseTeacherRegular;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/xjrsoft/module/dev/mapper/XjrUserMapper.java → src/main/java/com/xjrsoft/module/teacher/mapper/XjrUserMapper.java

@@ -1,7 +1,7 @@
-package com.xjrsoft.module.dev.mapper;
+package com.xjrsoft.module.teacher.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.dev.entity.XjrUser;
+import com.xjrsoft.module.teacher.entity.XjrUser;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/xjrsoft/module/dev/service/ITeacherbaseManagerService.java → src/main/java/com/xjrsoft/module/teacher/service/ITeacherbaseManagerService.java

@@ -1,9 +1,8 @@
-package com.xjrsoft.module.dev.service;
+package com.xjrsoft.module.teacher.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.yulichang.base.MPJBaseService;
-import com.xjrsoft.module.dev.entity.XjrUser;
-import lombok.Data;
+import com.xjrsoft.module.teacher.entity.XjrUser;
+
 import java.util.List;
 
 /**

src/main/java/com/xjrsoft/module/dev/service/impl/TeacherbaseManagerServiceImpl.java → src/main/java/com/xjrsoft/module/teacher/service/impl/TeacherbaseManagerServiceImpl.java

@@ -1,24 +1,23 @@
-package com.xjrsoft.module.dev.service.impl;
+package com.xjrsoft.module.teacher.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.base.MPJBaseServiceImpl;
-import com.xjrsoft.module.dev.entity.BaseTeacher;
-import com.xjrsoft.module.dev.mapper.BaseTeacherMapper;
-import com.xjrsoft.module.dev.entity.BaseTeacherContact;
-import com.xjrsoft.module.dev.mapper.BaseTeacherContactMapper;
-import com.xjrsoft.module.dev.entity.BaseTeacherEducation;
-import com.xjrsoft.module.dev.mapper.BaseTeacherEducationMapper;
-import com.xjrsoft.module.dev.entity.BaseTeacherEmploy;
-import com.xjrsoft.module.dev.mapper.BaseTeacherEmployMapper;
-import com.xjrsoft.module.dev.entity.BaseTeacherFamily;
-import com.xjrsoft.module.dev.mapper.BaseTeacherFamilyMapper;
-import com.xjrsoft.module.dev.entity.BaseTeacherFamilyMember;
-import com.xjrsoft.module.dev.mapper.BaseTeacherFamilyMemberMapper;
-import com.xjrsoft.module.dev.entity.BaseTeacherRegular;
-import com.xjrsoft.module.dev.mapper.BaseTeacherRegularMapper;
-import com.xjrsoft.module.dev.entity.XjrUser;
-import com.xjrsoft.module.dev.mapper.XjrUserMapper;
-import com.xjrsoft.module.dev.service.ITeacherbaseManagerService;
+import com.xjrsoft.module.teacher.entity.BaseTeacher;
+import com.xjrsoft.module.teacher.mapper.BaseTeacherMapper;
+import com.xjrsoft.module.teacher.entity.BaseTeacherContact;
+import com.xjrsoft.module.teacher.mapper.BaseTeacherContactMapper;
+import com.xjrsoft.module.teacher.entity.BaseTeacherEducation;
+import com.xjrsoft.module.teacher.mapper.BaseTeacherEducationMapper;
+import com.xjrsoft.module.teacher.entity.BaseTeacherEmploy;
+import com.xjrsoft.module.teacher.mapper.BaseTeacherEmployMapper;
+import com.xjrsoft.module.teacher.entity.BaseTeacherFamily;
+import com.xjrsoft.module.teacher.mapper.BaseTeacherFamilyMapper;
+import com.xjrsoft.module.teacher.entity.BaseTeacherFamilyMember;
+import com.xjrsoft.module.teacher.mapper.BaseTeacherFamilyMemberMapper;
+import com.xjrsoft.module.teacher.entity.BaseTeacherRegular;
+import com.xjrsoft.module.teacher.mapper.BaseTeacherRegularMapper;
+import com.xjrsoft.module.teacher.entity.XjrUser;
+import com.xjrsoft.module.teacher.mapper.XjrUserMapper;
+import com.xjrsoft.module.teacher.service.ITeacherbaseManagerService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/xjrsoft/module/dev/vo/BaseTeacherContactVo.java → src/main/java/com/xjrsoft/module/teacher/vo/BaseTeacherContactVo.java

@@ -1,13 +1,8 @@
-package com.xjrsoft.module.dev.vo;
+package com.xjrsoft.module.teacher.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-
 /**
 * @title: 表单出参
 * @Author 管理员

src/main/java/com/xjrsoft/module/dev/vo/BaseTeacherEducationVo.java → src/main/java/com/xjrsoft/module/teacher/vo/BaseTeacherEducationVo.java

@@ -1,13 +1,8 @@
-package com.xjrsoft.module.dev.vo;
+package com.xjrsoft.module.teacher.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-
 /**
 * @title: 表单出参
 * @Author 管理员

src/main/java/com/xjrsoft/module/dev/vo/BaseTeacherEmployVo.java → src/main/java/com/xjrsoft/module/teacher/vo/BaseTeacherEmployVo.java

@@ -1,13 +1,8 @@
-package com.xjrsoft.module.dev.vo;
+package com.xjrsoft.module.teacher.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-
 /**
 * @title: 表单出参
 * @Author 管理员

src/main/java/com/xjrsoft/module/dev/vo/BaseTeacherFamilyMemberVo.java → src/main/java/com/xjrsoft/module/teacher/vo/BaseTeacherFamilyMemberVo.java

@@ -1,14 +1,10 @@
-package com.xjrsoft.module.dev.vo;
+package com.xjrsoft.module.teacher.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
 
 /**
 * @title: 表单出参

src/main/java/com/xjrsoft/module/dev/vo/BaseTeacherFamilyVo.java → src/main/java/com/xjrsoft/module/teacher/vo/BaseTeacherFamilyVo.java

@@ -1,13 +1,8 @@
-package com.xjrsoft.module.dev.vo;
+package com.xjrsoft.module.teacher.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-
 /**
 * @title: 表单出参
 * @Author 管理员

src/main/java/com/xjrsoft/module/dev/vo/BaseTeacherRegularVo.java → src/main/java/com/xjrsoft/module/teacher/vo/BaseTeacherRegularVo.java

@@ -1,15 +1,11 @@
-package com.xjrsoft.module.dev.vo;
+package com.xjrsoft.module.teacher.vo;
 
 import com.alibaba.fastjson.JSONArray;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
 
 /**
 * @title: 表单出参

src/main/java/com/xjrsoft/module/dev/vo/BaseTeacherVo.java → src/main/java/com/xjrsoft/module/teacher/vo/BaseTeacherVo.java

@@ -1,14 +1,10 @@
-package com.xjrsoft.module.dev.vo;
+package com.xjrsoft.module.teacher.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
 
 /**
 * @title: 表单出参

src/main/java/com/xjrsoft/module/dev/vo/XjrUserPageVo.java → src/main/java/com/xjrsoft/module/teacher/vo/XjrUserPageVo.java

@@ -1,15 +1,8 @@
-package com.xjrsoft.module.dev.vo;
+package com.xjrsoft.module.teacher.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import com.xjrsoft.common.annotation.Trans;
-import com.xjrsoft.common.enums.TransType;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-
 /**
 * @title: 分页列表出参
 * @Author 管理员

src/main/java/com/xjrsoft/module/dev/vo/XjrUserVo.java → src/main/java/com/xjrsoft/module/teacher/vo/XjrUserVo.java

@@ -1,19 +1,9 @@
-package com.xjrsoft.module.dev.vo;
+package com.xjrsoft.module.teacher.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
 import java.util.List;
-import com.xjrsoft.module.dev.entity.BaseTeacher;
-import com.xjrsoft.module.dev.entity.BaseTeacherContact;
-import com.xjrsoft.module.dev.entity.BaseTeacherEducation;
-import com.xjrsoft.module.dev.entity.BaseTeacherEmploy;
-import com.xjrsoft.module.dev.entity.BaseTeacherFamily;
-import com.xjrsoft.module.dev.entity.BaseTeacherFamilyMember;
-import com.xjrsoft.module.dev.entity.BaseTeacherRegular;
 
 /**
 * @title: 表单出参