Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/base/entity/BaseGrade.java

@@ -0,0 +1,53 @@
+package com.xjrsoft.module.base.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 班级表
+ * </p>
+ *
+ * @author baomidou
+ * @since 2023-09-02 04:52:58
+ */
+@Data
+@TableName("base_grade")
+@ApiModel(value = "BaseGrade对象", description = "年级表")
+public class BaseGrade implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private Long id;
+
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+
+    @ApiModelProperty("年级名称")
+    private String name;
+
+    @ApiModelProperty("年份")
+    private String title;
+
+}

src/main/java/com/xjrsoft/module/base/entity/BaseMajorSet.java

@@ -0,0 +1,76 @@
+package com.xjrsoft.module.base.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 班级表
+ * </p>
+ *
+ * @author baomidou
+ * @since 2023-09-02 04:52:58
+ */
+@Data
+@TableName("base_major_set")
+@ApiModel(value = "BaseMajorSet", description = "专业方向表")
+public class BaseMajorSet implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private Long id;
+
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+
+    @ApiModelProperty("专业方向名称")
+    private String name;
+
+    @ApiModelProperty("专业方向代码")
+    private String code;
+
+    @ApiModelProperty("专业方向简称")
+    private String shortName;
+
+    @ApiModelProperty("上报专业技能方向名称")
+    private String skillName;
+
+    @ApiModelProperty("专业方向说明")
+    private String remark;
+
+    @ApiModelProperty("办学层次")
+    private Long majorGradationId;
+
+    @ApiModelProperty("专业分类")
+    private Long majorCategorId;
+
+    @ApiModelProperty("所属机构")
+    private Long departmentId;
+
+    @ApiModelProperty("专业")
+    private Long majorId;
+
+    @ApiModelProperty("适用学制")
+    private Double studyYear;
+}

src/main/java/com/xjrsoft/module/base/mapper/BaseGradeMapper.java

@@ -0,0 +1,18 @@
+package com.xjrsoft.module.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xjrsoft.module.base.entity.BaseGrade;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 学期表 Mapper 接口
+ * </p>
+ *
+ * @author baomidou
+ * @since 2023-09-02 04:52:58
+ */
+@Mapper
+public interface BaseGradeMapper extends BaseMapper<BaseGrade> {
+
+}

src/main/java/com/xjrsoft/module/base/mapper/BaseMajorSetMapper.java

@@ -0,0 +1,18 @@
+package com.xjrsoft.module.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xjrsoft.module.base.entity.BaseMajorSet;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 学期表 Mapper 接口
+ * </p>
+ *
+ * @author baomidou
+ * @since 2023-09-02 04:52:58
+ */
+@Mapper
+public interface BaseMajorSetMapper extends BaseMapper<BaseMajorSet> {
+
+}

src/main/java/com/xjrsoft/module/base/service/IBaseGradeService.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.base.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xjrsoft.module.base.entity.BaseGrade;
+import com.xjrsoft.module.base.entity.BaseSemester;
+
+/**
+ * <p>
+ * 学期表 服务类
+ * </p>
+ *
+ * @author baomidou
+ * @since 2023-09-02 04:52:58
+ */
+public interface IBaseGradeService extends IService<BaseGrade> {
+
+}

src/main/java/com/xjrsoft/module/base/service/IBaseMajorSetService.java

@@ -0,0 +1,16 @@
+package com.xjrsoft.module.base.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xjrsoft.module.base.entity.BaseMajorSet;
+
+/**
+ * <p>
+ * 学期表 服务类
+ * </p>
+ *
+ * @author baomidou
+ * @since 2023-09-02 04:52:58
+ */
+public interface IBaseMajorSetService extends IService<BaseMajorSet> {
+
+}

src/main/java/com/xjrsoft/module/base/service/impl/BaseGradeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.xjrsoft.module.base.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xjrsoft.module.base.entity.BaseGrade;
+import com.xjrsoft.module.base.mapper.BaseGradeMapper;
+import com.xjrsoft.module.base.service.IBaseGradeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 学期表 服务实现类
+ * </p>
+ *
+ * @author baomidou
+ * @since 2023-09-02 04:52:58
+ */
+@Service
+public class BaseGradeServiceImpl extends ServiceImpl<BaseGradeMapper, BaseGrade> implements IBaseGradeService {
+
+}

src/main/java/com/xjrsoft/module/base/service/impl/BaseMajorSetServiceImpl.java

@@ -0,0 +1,20 @@
+package com.xjrsoft.module.base.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xjrsoft.module.base.entity.BaseMajorSet;
+import com.xjrsoft.module.base.mapper.BaseMajorSetMapper;
+import com.xjrsoft.module.base.service.IBaseMajorSetService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 学期表 服务实现类
+ * </p>
+ *
+ * @author baomidou
+ * @since 2023-09-02 04:52:58
+ */
+@Service
+public class BaseMajorSetServiceImpl extends ServiceImpl<BaseMajorSetMapper, BaseMajorSet> implements IBaseMajorSetService {
+
+}

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

@@ -13,6 +13,9 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseClass;
+import com.xjrsoft.module.base.entity.BaseGrade;
+import com.xjrsoft.module.base.entity.BaseMajorSet;
+import com.xjrsoft.module.erpModel.caseErpPurchase.entity.CaseErpApply;
 import com.xjrsoft.module.organization.entity.Department;
 import com.xjrsoft.module.student.dto.AddBaseStudentCadreDto;
 import com.xjrsoft.module.student.dto.BaseStudentCadrePageDto;
@@ -20,6 +23,7 @@ import com.xjrsoft.module.student.dto.UpdateBaseStudentCadreDto;
 import com.xjrsoft.module.student.entity.BaseStudent;
 import com.xjrsoft.module.student.entity.BaseStudentCadre;
 import com.xjrsoft.module.student.entity.BaseStudentPost;
+import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 import com.xjrsoft.module.student.service.IBaseStudentCadreService;
 import com.xjrsoft.module.student.vo.BaseStudentCadrePageVo;
 import com.xjrsoft.module.student.vo.BaseStudentCadreVo;
@@ -67,6 +71,12 @@ public class BaseStudentCadreController {
                 .like(StrUtil.isNotBlank(dto.getUserName()), XjrUser::getName, dto.getUserName())
                 .eq(ObjectUtil.isNotEmpty(dto.getOrgId()), BaseStudentCadre::getOrgId, dto.getOrgId())
                 .eq(ObjectUtil.isNotEmpty(dto.getClassId()), BaseStudentCadre::getClassId, dto.getClassId())
+                .eq(ObjectUtil.isNotEmpty(dto.getPostId()), BaseStudentCadre::getPostId, dto.getPostId())
+                .eq(ObjectUtil.isNotEmpty(dto.getGradeId()), BaseStudentSchoolRoll::getGradeId, dto.getGradeId())
+                .eq(ObjectUtil.isNotEmpty(dto.getMajorSetId()), BaseStudentSchoolRoll::getMajorSetId, dto.getMajorSetId())
+                .eq(ObjectUtil.isNotEmpty(dto.getLevel()), BaseStudentPost::getLevel, dto.getLevel())
+                .between(ObjectUtil.isNotNull(dto.getStartTimeStart()) && ObjectUtil.isNotNull(dto.getStartTimeEnd()), BaseStudentCadre::getStartTime,dto.getStartTimeStart(),dto.getStartTimeEnd())
+                .between(ObjectUtil.isNotNull(dto.getEndTimeStart()) && ObjectUtil.isNotNull(dto.getEndTimeEnd()), BaseStudentCadre::getEndTime,dto.getEndTimeStart(),dto.getEndTimeEnd())
                 .orderByDesc(BaseStudentCadre::getId)
                 .selectAs(BaseStudent::getStudentId, BaseStudentCadre::getStudentId)
                 .selectAs(XjrUser::getName, BaseStudentCadre::getUserName)
@@ -74,12 +84,19 @@ public class BaseStudentCadreController {
                 .selectAs(BaseStudentPost::getPost, BaseStudentCadre::getPost)
                 .selectAs(BaseStudentPost::getLevel, BaseStudentCadre::getLevel)
                 .selectAs(Department::getName, BaseStudentCadre::getOrgName)
+                .selectAs(XjrUser::getMobile, BaseStudentCadre::getMobile)
+                .selectAs(BaseMajorSet::getName, BaseStudentCadre::getMajorSetName)
+                .selectAs(BaseGrade::getName, BaseStudentCadre::getGradeName)
                 .select(BaseStudentCadre.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentCadrePageVo.class).contains(x.getProperty()))
                 .innerJoin(XjrUser.class, XjrUser::getId, BaseStudentCadre::getUserId)
                 .innerJoin(BaseStudent.class, BaseStudent::getUserId, BaseStudentCadre::getUserId)
                 .innerJoin(BaseStudentPost.class, BaseStudentPost::getId, BaseStudentCadre::getPostId)
                 .innerJoin(BaseClass.class, BaseClass::getId, BaseStudentCadre::getClassId)
-                .innerJoin(Department.class, Department::getId, BaseClass::getOrgId);
+                .innerJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, BaseStudentCadre::getUserId)
+                .innerJoin(Department.class, Department::getId, BaseClass::getOrgId)
+                .leftJoin(BaseMajorSet.class, BaseMajorSet::getId, BaseStudentSchoolRoll::getMajorSetId)
+                .leftJoin(BaseGrade.class, BaseGrade::getId, BaseStudentSchoolRoll::getGradeId);
+
         IPage<BaseStudentCadre> page = baseStudentCadreService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<BaseStudentCadrePageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentCadrePageVo.class);
         return RT.ok(pageOutput);
@@ -103,7 +120,7 @@ public class BaseStudentCadreController {
     public RT<Boolean> add(@Valid @RequestBody AddBaseStudentCadreDto dto){
         BaseStudentCadre baseStudentCadre = BeanUtil.toBean(dto, BaseStudentCadre.class);
         boolean isSuccess = baseStudentCadreService.save(baseStudentCadre);
-    return RT.ok(isSuccess);
+        return RT.ok(isSuccess);
     }
 
     @PutMapping

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

@@ -6,17 +6,23 @@ 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.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.TreeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.erpModel.caseErpBom.entity.CaseErpBom;
+import com.xjrsoft.module.erpModel.caseErpBom.vo.CaseErpBomTreeVo;
 import com.xjrsoft.module.student.dto.AddBaseStudentPostDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentPostDto;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
+import com.xjrsoft.module.student.vo.BaseStudentPostTreeVo;
 import org.springframework.http.ResponseEntity;
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
@@ -113,4 +119,5 @@ public class BaseStudentPostController {
 
         return RT.fileStream(bot.toByteArray(), "BaseStudentPost" + ExcelTypeEnum.XLSX.getValue());
     }
+
 }

src/main/java/com/xjrsoft/module/student/dto/BaseStudentCadrePageDto.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 
@@ -40,6 +41,10 @@ public class BaseStudentCadrePageDto extends PageInput {
     @ApiModelProperty("职务")
     private String post;
 
+    @ContentStyle(dataFormat = 49)
+    @ApiModelProperty("职务Id")
+    private String postId;
+
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("级别")
     @ApiModelProperty("级别")
@@ -51,12 +56,34 @@ public class BaseStudentCadrePageDto extends PageInput {
     private String orgName;
 
     @ContentStyle(dataFormat = 49)
-    @ExcelProperty("学生任职机构")
     @ApiModelProperty("学生任职机构")
     private Long orgId;
 
     @ContentStyle(dataFormat = 49)
-    @ExcelProperty("班级id")
     @ApiModelProperty("班级id")
     private Long classId;
+
+    @ContentStyle(dataFormat = 49)
+    @ApiModelProperty("年级id")
+    private String gradeId;
+
+    @ContentStyle(dataFormat = 49)
+    @ApiModelProperty("专业id")
+    private String majorSetId;
+
+    @ContentStyle(dataFormat = 49)
+    @ApiModelProperty("状态（1:在职 0:离职）")
+    private Integer status;
+
+    @ApiModelProperty("任职开始时间-开始")
+    private LocalDateTime startTimeStart;
+
+    @ApiModelProperty("任职开始时间-结束")
+    private LocalDateTime startTimeEnd;
+
+    @ApiModelProperty("任职结束时间-开始")
+    private LocalDateTime endTimeStart;
+
+    @ApiModelProperty("任职结束时间-结束")
+    private LocalDateTime endTimeEnd;
 }

src/main/java/com/xjrsoft/module/student/entity/BaseStudentCadre.java

@@ -150,4 +150,16 @@ public class BaseStudentCadre implements Serializable {
     @TableField(exist = false)
     private String orgName;
 
+    @ApiModelProperty("年级")
+    @TableField(exist = false)
+    private String gradeName;
+
+    @ApiModelProperty("专业")
+    @TableField(exist = false)
+    private String majorSetName;
+
+    @ApiModelProperty("手机号")
+    @TableField(exist = false)
+    private String mobile;
+
 }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentCadrePageVo.java

@@ -173,5 +173,18 @@ public class BaseStudentCadrePageVo {
     @ApiModelProperty("学生任职机构名称")
     private String orgName;
 
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("手机号")
+    @ApiModelProperty("手机号")
+    private String mobile;
+
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("专业")
+    @ApiModelProperty("专业")
+    private String majorSetName;
 
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("年级")
+    @ApiModelProperty("年级")
+    private String gradeName;
 }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentPostTreeVo.java

@@ -0,0 +1,56 @@
+package com.xjrsoft.module.student.vo;
+
+import com.xjrsoft.module.erpModel.caseErpBom.vo.CaseErpBomTreeVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+* @title: 学生职务设置表单出参
+* @Author dzx
+* @Date: 2023-11-13
+* @Version 1.0
+*/
+@Data
+public class BaseStudentPostTreeVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 职务
+    */
+    @ApiModelProperty("职务")
+    private String post;
+    /**
+    * 职务级别
+    */
+    @ApiModelProperty("职务级别")
+    private String level;
+    /**
+    * 是否允许德育检查(1:是 0:否)
+    */
+    @ApiModelProperty("是否允许德育检查(1:是 0:否)")
+    private Integer isAllowedCheck;
+    /**
+    * 职责描述
+    */
+    @ApiModelProperty("职责描述")
+    private String explains;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+
+    private List<BaseStudentPostTreeVo> children;
+
+}

src/main/resources/sqlScript/20231113_sql.sql

@@ -71,33 +71,8 @@ CREATE TABLE base_punishment_type
 -- ----------------------------
 -- 学生处分信息管理
 -- ----------------------------
-DROP TABLE IF EXISTS base_punishment_info;
-CREATE TABLE base_punishment_info
-(
-    id BIGINT NOT NULL COMMENT '主键编号',
-    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
-    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
-    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
-    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
-    `delete_mark` INT NOT NULL COMMENT '删除标记',
-    `enabled_mark` INT NOT NULL COMMENT '有效标志',
-    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
-    `base_semester_id` BIGINT COMMENT '学期ID(base_semester)',
-    `punishment_type_id` BIGINT NULL DEFAULT NULL COMMENT '处分类型id',
-    `start_time` DATE NULL DEFAULT NULL COMMENT '处分开始日期',
-    `end_time` DATE NULL DEFAULT NULL COMMENT '处分结束日期',
-    `is_publicity` INT NULL DEFAULT 1 COMMENT '是否公示(1:是 0:否)',
-    `push_message_object` INT NULL DEFAULT NULL COMMENT '发送处分(1:班主任 2:学生 3:家长)',
-    `reason` VARCHAR(500) NULL DEFAULT NULL COMMENT '处分原因',
-    PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生处分信息管理';
-
-
--- ----------------------------
--- 学生处分信息管理
--- ----------------------------
-DROP TABLE IF EXISTS base_punishment_info;
-CREATE TABLE base_punishment_info
+DROP TABLE IF EXISTS base_student_punishment_info;
+CREATE TABLE base_student_punishment_info
 (
     id BIGINT NOT NULL COMMENT '主键编号',
     `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',