add: 字典管理 - 学期管理

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/BasicMajorParams.java

@@ -0,0 +1,62 @@
+package com.qmth.distributed.print.business.bean.params;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.annotation.DBVerify;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description: 基础专业参数
+ * @Author: CaoZixuan
+ * @Date: 2021-11-01
+ */
+public class BasicMajorParams {
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "专业id（编辑时必填）")
+    @DBVerify(value = "专业id（编辑时必填）")
+    private Long id;
+
+    @ApiModelProperty(value = "专业名称")
+    @NotNull(message = "专业名称")
+    @Length(min = 1,message = "专业名称")
+    @DBVerify(value = "专业名称",required = true)
+    private String majorName;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "所属学院id")
+    @NotNull(message = "所属学院id")
+    @Range(min = 1L, message = "所属学院id")
+    @DBVerify(value = "所属学院id",required = true)
+    private Long collegeId;
+
+    public BasicMajorParams() {
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getMajorName() {
+        return majorName;
+    }
+
+    public void setMajorName(String majorName) {
+        this.majorName = majorName;
+    }
+
+    public Long getCollegeId() {
+        return collegeId;
+    }
+
+    public void setCollegeId(Long collegeId) {
+        this.collegeId = collegeId;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/BasicMajorResult.java

@@ -0,0 +1,94 @@
+package com.qmth.distributed.print.business.bean.result;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 基础专业查询结果
+ * @Author: CaoZixuan
+ * @Date: 2021-11-01
+ */
+public class BasicMajorResult implements Serializable {
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "专业主键")
+    private Long id;
+
+    @ApiModelProperty(value = "专业名称")
+    private String majorName;
+
+    @ApiModelProperty(value = "专业编码")
+    private String majorCode;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "学院主键")
+    private Long collegeId;
+
+    @ApiModelProperty(value = "所属学院")
+    private String collegeName;
+
+    @ApiModelProperty(value = "创建时间")
+    private Long createTime;
+
+    @ApiModelProperty(value = "创建人")
+    private Long createId;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getMajorName() {
+        return majorName;
+    }
+
+    public void setMajorName(String majorName) {
+        this.majorName = majorName;
+    }
+
+    public String getMajorCode() {
+        return majorCode;
+    }
+
+    public void setMajorCode(String majorCode) {
+        this.majorCode = majorCode;
+    }
+
+    public Long getCollegeId() {
+        return collegeId;
+    }
+
+    public void setCollegeId(Long collegeId) {
+        this.collegeId = collegeId;
+    }
+
+    public String getCollegeName() {
+        return collegeName;
+    }
+
+    public void setCollegeName(String collegeName) {
+        this.collegeName = collegeName;
+    }
+
+    public Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(Long createId) {
+        this.createId = createId;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/BasicSemesterMapper.java

@@ -1,7 +1,14 @@
 package com.qmth.distributed.print.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.distributed.print.business.entity.BasicSemester;
+import com.qmth.teachcloud.common.bean.result.BasicSemesterResult;
+import com.qmth.teachcloud.common.bean.result.BasicStudentResult;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Set;
 
 /**
  * <p>
@@ -12,5 +19,14 @@ import com.qmth.distributed.print.business.entity.BasicSemester;
  * @since 2021-10-28
  */
 public interface BasicSemesterMapper extends BaseMapper<BasicSemester> {
-
+    /**
+     * 基础学期分页查询
+     * @param iPage 分页参数
+     * @param schoolId 学校id
+     * @param orgIds 权限id
+     * @return 分页结果
+     */
+    IPage<BasicSemesterResult> findBasicSemesterPage(@Param("iPage") Page<BasicSemesterResult> iPage,
+                                                    @Param("schoolId") Long schoolId,
+                                                    @Param("orgIds") Set<Long> orgIds);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/BasicMajorService.java

@@ -1,6 +1,9 @@
 package com.qmth.distributed.print.business.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.distributed.print.business.bean.params.BasicMajorParams;
+import com.qmth.distributed.print.business.bean.result.BasicMajorResult;
 import com.qmth.distributed.print.business.entity.BasicMajor;
 
 /**
@@ -13,4 +16,27 @@ import com.qmth.distributed.print.business.entity.BasicMajor;
  */
 public interface BasicMajorService extends IService<BasicMajor> {
 
+    /**
+     * 基础专业分页查询
+     * @param schoolId 学校id
+     * @param majorName 专业名称模糊查询
+     * @param pageNumber 分页页数
+     * @param pageSize 分页容量
+     * @return 分页结果
+     */
+    IPage<BasicMajorResult> basicMajorPage(Long schoolId,String majorName, int pageNumber, int pageSize);
+
+    /**
+     * 基础专业编辑
+     * @param basicMajorParams 编辑参数
+     * @return 编辑后该专业id
+     */
+    Long saveBasicMajor(BasicMajorParams basicMajorParams) throws IllegalAccessException;
+
+    /**
+     * 专业删除
+     * @param id 专业主键
+     * @return 是否删除成功
+     */
+    boolean deleteBasicMajorById(Long id);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/BasicSemesterService.java

@@ -1,7 +1,10 @@
 package com.qmth.distributed.print.business.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.entity.BasicSemester;
+import com.qmth.teachcloud.common.bean.params.BasicSemesterParams;
+import com.qmth.teachcloud.common.bean.result.BasicSemesterResult;
 
 /**
  * <p>
@@ -13,4 +16,26 @@ import com.qmth.distributed.print.business.entity.BasicSemester;
  */
 public interface BasicSemesterService extends IService<BasicSemester> {
 
+    /**
+     * 基础学期分页查询
+     * @param schoolId 学校id
+     * @param pageNumber 分页页数
+     * @param pageSize 分页容量
+     * @return 分页结果
+     */
+    IPage<BasicSemesterResult> basicSemesterPage(Long schoolId,int pageNumber, int pageSize);
+
+    /**
+     * 基础学期编辑
+     * @param basicSemesterParams 编辑参数
+     * @return 编辑后该学期id
+     */
+    Long saveBasicSemester(BasicSemesterParams basicSemesterParams) throws IllegalAccessException;
+
+    /**
+     * 学期删除
+     * @param id 学期主键
+     * @return 是否删除成功
+     */
+    boolean deleteBasicSemesterById(Long id);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicMajorServiceImpl.java

@@ -1,10 +1,14 @@
 package com.qmth.distributed.print.business.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.distributed.print.business.bean.params.BasicMajorParams;
+import com.qmth.distributed.print.business.bean.result.BasicMajorResult;
 import com.qmth.distributed.print.business.entity.BasicMajor;
 import com.qmth.distributed.print.business.mapper.BasicMajorMapper;
 import com.qmth.distributed.print.business.service.BasicMajorService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <p>
@@ -17,4 +21,20 @@ import org.springframework.stereotype.Service;
 @Service
 public class BasicMajorServiceImpl extends ServiceImpl<BasicMajorMapper, BasicMajor> implements BasicMajorService {
 
+    @Override
+    public IPage<BasicMajorResult> basicMajorPage(Long schoolId, String majorName, int pageNumber, int pageSize) {
+        return null;
+    }
+
+    @Transactional
+    @Override
+    public Long saveBasicMajor(BasicMajorParams basicMajorParams) throws IllegalAccessException {
+        return null;
+    }
+
+    @Transactional
+    @Override
+    public boolean deleteBasicMajorById(Long id) {
+        return false;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicSemesterServiceImpl.java

@@ -1,10 +1,27 @@
 package com.qmth.distributed.print.business.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.entity.BasicSemester;
+import com.qmth.distributed.print.business.entity.ExamPrintPlan;
 import com.qmth.distributed.print.business.mapper.BasicSemesterMapper;
 import com.qmth.distributed.print.business.service.BasicSemesterService;
+import com.qmth.distributed.print.business.service.ExamPrintPlanService;
+import com.qmth.teachcloud.common.bean.params.BasicSemesterParams;
+import com.qmth.teachcloud.common.bean.result.BasicSemesterResult;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.SysUser;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.util.ServletUtil;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -16,5 +33,68 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class BasicSemesterServiceImpl extends ServiceImpl<BasicSemesterMapper, BasicSemester> implements BasicSemesterService {
+    @Resource
+    ExamPrintPlanService examPrintPlanService;
+
+    @Override
+    public IPage<BasicSemesterResult> basicSemesterPage(Long schoolId, int pageNumber, int pageSize) {
+        return this.baseMapper.findBasicSemesterPage(new Page<>(pageNumber, pageSize), schoolId,null);
+    }
+
+    @Transactional
+    @Override
+    public Long saveBasicSemester(BasicSemesterParams basicSemesterParams) throws IllegalAccessException {
+        SystemConstant.verifyDBFields(basicSemesterParams,basicSemesterParams.getClass());
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        Long id = basicSemesterParams.getId();
+        Long schoolId = sysUser.getSchoolId();
+        String semesterName = basicSemesterParams.getSemesterName();
+        Long startTime = basicSemesterParams.getStartTime();
+        Long endTime = basicSemesterParams.getEndTime();
+
+        // 校验学期唯一性
+        BasicSemester checkName = this.getOne(new QueryWrapper<BasicSemester>().lambda()
+                .eq(BasicSemester::getEnable,true)
+                .eq(BasicSemester::getSchoolId,schoolId)
+                .eq(BasicSemester::getName,semesterName));
+        if (Objects.nonNull(checkName) && !checkName.getId().equals(id)){
+            throw ExceptionResultEnum.ERROR.exception("学期名称【" + semesterName + "】重复");
+        }
+        if (SystemConstant.longNotNull(id)){
+            // 编辑
+            BasicSemester old = this.getById(id);
+            if (Objects.isNull(old) || old.getEnable().equals(false)){
+                throw ExceptionResultEnum.ERROR.exception("所选学期不存在或被禁用");
+            }
+            this.update(new UpdateWrapper<BasicSemester>().lambda()
+                    .eq(BasicSemester::getId,id)
+                    .set(BasicSemester::getName,semesterName)
+                    .set(BasicSemester::getStartTime,startTime)
+                    .set(BasicSemester::getEndTime,endTime));
+        }else {
+            // 新增
+            id = SystemConstant.getDbUuid();
+            BasicSemester basicSemester = new BasicSemester();
+            basicSemester.setId(id);
+            basicSemester.setEnable(true);
+            basicSemester.setName(semesterName);
+            basicSemester.setSchoolId(schoolId);
+            basicSemester.setCode(null);
+            basicSemester.setStartTime(startTime);
+            basicSemester.setEndTime(endTime);
+            basicSemester.setOrgId(sysUser.getOrgId());
+            this.save(basicSemester);
+        }
+        return id;
+    }
 
+    @Transactional
+    @Override
+    public boolean deleteBasicSemesterById(Long id) {
+        List<ExamPrintPlan> examPrintPlanList = examPrintPlanService.list(new QueryWrapper<ExamPrintPlan>().lambda().eq(ExamPrintPlan::getSemesterId,id));
+        if (examPrintPlanList.size() > 0){
+            throw ExceptionResultEnum.ERROR.exception("印刷计划中已使用了该学期，不能删除");
+        }
+        return this.removeById(id);
+    }
 }

distributed-print-business/src/main/resources/mapper/BasicSemesterMapper.xml

@@ -2,4 +2,27 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qmth.distributed.print.business.mapper.BasicSemesterMapper">
 
+    <select id="findBasicSemesterPage" resultType="com.qmth.teachcloud.common.bean.result.BasicSemesterResult">
+        SELECT
+            id,
+            name AS semesterName,
+            code AS semesterCode,
+            start_time AS startTime,
+            end_time AS endTime
+        FROM
+            basic_semester bs
+        <where>
+            AND bs.enable = true
+            <if test="schoolId != null and schoolId != ''">
+                AND bs.school_id = #{schoolId}
+            </if>
+            <if test="orgIds != null">
+                AND bs.org_id IN
+                <foreach collection="orgIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        ORDER BY bs.create_time DESC;
+    </select>
 </mapper>

teachcloud-common/src/main/java/com/qmth/teachcloud/common/annotation/DBVerify.java

@@ -14,5 +14,7 @@ public @interface DBVerify {
 
     boolean required() default false;
 
-    int length() default 0; //属性接收长度限制默认0,为0的不校验长度
+    int min() default 0; //属性接收长度限制默认0,为0的不校验长度,最小长度
+
+    int max() default 0; //属性接收长度限制默认0,为0的不校验长度,最大长度
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/params/BasicSemesterParams.java

@@ -0,0 +1,76 @@
+package com.qmth.teachcloud.common.bean.params;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.annotation.DBVerify;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Description: 基础学期参数
+ * @Author: CaoZixuan
+ * @Date: 2021-11-01
+ */
+public class BasicSemesterParams implements Serializable {
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "学期id（编辑时必填）")
+    @DBVerify(value = "学期id（编辑时必填）")
+    private Long id;
+
+    @ApiModelProperty(value = "学期名称")
+    @NotNull(message = "请输入学期名称")
+    @Length(min = 1,message = "请输入学期名称")
+    @DBVerify(value = "学期名称",required = true,min = 1,max = 50)
+    private String semesterName;
+
+    @ApiModelProperty(value = "学期开始时间")
+    @NotNull(message = "请选择学期开始时间")
+    @Range(min = 1L, message = "请选择学期开始时间")
+    @DBVerify(value = "学期开始时间",required = true,min = 1)
+    private Long startTime;
+
+    @ApiModelProperty(value = "学期结束时间")
+    @NotNull(message = "请选择学期结束时间")
+    @Range(min = 1L, message = "请选择学期结束时间")
+    @DBVerify(value = "学期结束时间",required = true,min = 1)
+    private Long endTime;
+
+    public BasicSemesterParams() {
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getSemesterName() {
+        return semesterName;
+    }
+
+    public void setSemesterName(String semesterName) {
+        this.semesterName = semesterName;
+    }
+
+    public Long getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Long startTime) {
+        this.startTime = startTime;
+    }
+
+    public Long getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Long endTime) {
+        this.endTime = endTime;
+    }
+}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/result/BasicSemesterResult.java

@@ -0,0 +1,68 @@
+package com.qmth.teachcloud.common.bean.result;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: 基础学期字典查询返回值
+ * @Author: CaoZixuan
+ * @Date: 2021-11-01
+ */
+public class BasicSemesterResult {
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "校区id")
+    private Long id;
+
+    @ApiModelProperty(value = "学期名称")
+    private String semesterName;
+
+    @ApiModelProperty(value = "学期编号")
+    private String semesterCode;
+
+    @ApiModelProperty(value = "学期开始时间")
+    private Long startTime;
+
+    @ApiModelProperty(value = "学期结束时间")
+    private Long endTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getSemesterName() {
+        return semesterName;
+    }
+
+    public void setSemesterName(String semesterName) {
+        this.semesterName = semesterName;
+    }
+
+    public String getSemesterCode() {
+        return semesterCode;
+    }
+
+    public void setSemesterCode(String semesterCode) {
+        this.semesterCode = semesterCode;
+    }
+
+    public Long getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Long startTime) {
+        this.startTime = startTime;
+    }
+
+    public Long getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Long endTime) {
+        this.endTime = endTime;
+    }
+}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -340,7 +340,7 @@ public class SystemConstant {
     }
 
     /**
-     * 检验数据库字段
+     * 检验字段
      *
      * @param obj   被检验的映射类对象
      * @param clazz 该对象的类
@@ -358,16 +358,22 @@ public class SystemConstant {
             }
             String value = dbVerify.value();
             boolean required = dbVerify.required();
-            int length = dbVerify.length();
+            int min = dbVerify.min();
+            int max = dbVerify.max();
 
             if (required) {
                 if (fieldValue == null || fieldValue.length() == 0 || fieldValue.equals("null")) {
                     return new DBVerifyResult(false, "[" + value + "]为必须字段，不能为空");
                 }
             }
-            if (fieldValue != null && length > 0) {
-                if (fieldValue.length() > length) {
-                    return new DBVerifyResult(false, "[" + value + "]超出最大长度限制，最大限制[" + length + "]");
+            if (fieldValue != null && min > 0) {
+                if (fieldValue.length() < min) {
+                    return new DBVerifyResult(false, "[" + value + "]低于最小长度限制，最小限制[" + min + "]");
+                }
+            }
+            if (fieldValue != null && max > 0) {
+                if (fieldValue.length() > max) {
+                    return new DBVerifyResult(false, "[" + value + "]超过最大长度限制，最大限制[" + max + "]");
                 }
             }
         }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/BasicClazz.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * @Author: CaoZixuan
  * @Date: 2021-08-28
  */
-@ApiModel(value = "BasicStudent对象", description = "学校id")
+@ApiModel(value = "BasicClazz对象", description = "班级字典表")
 public class BasicClazz extends BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -27,6 +27,10 @@ public class BasicClazz extends BaseEntity implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long campusId;
 
+    @ApiModelProperty(value = "专业id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long majorId;
+
     @ApiModelProperty(value = "班级编号")
     private String clazzCode;
 
@@ -92,4 +96,12 @@ public class BasicClazz extends BaseEntity implements Serializable {
     public void setOrgId(Long orgId) {
         this.orgId = orgId;
     }
+
+    public Long getMajorId() {
+        return majorId;
+    }
+
+    public void setMajorId(Long majorId) {
+        this.majorId = majorId;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicStudentServiceImpl.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicStudentServiceImpl.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.service.impl;
+package com.qmth.teachcloud.common.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;