Merge remote-tracking branch 'origin/master'

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java

@@ -330,4 +330,70 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
             .collect(Collectors.toList());
     }
 
+
+    public static int getPeriod(String className) {
+        int period = 0;
+        //获取当前年
+        int year = DateUtils.getYear();
+        //获取当前月
+        int month = DateUtils.getMonth();
+        //计算届数
+        if (className.contains("一年级")) {
+            if (month < 7) {
+                period = year - 1;
+            } else {
+                period = year;
+            }
+        } else if (className.contains("二年级")) {
+            if (month < 7) {
+                period = year - 2;
+            } else {
+                period = year - 1;
+            }
+        } else if (className.contains("三年级")) {
+            if (month < 7) {
+                period = year - 3;
+            } else {
+                period = year - 2;
+            }
+        } else if (className.contains("四年级")) {
+            if (month < 7) {
+                period = year - 4;
+            } else {
+                period = year - 3;
+            }
+        } else if (className.contains("五年级")) {
+            if (month < 7) {
+                period = year - 5;
+            } else {
+                period = year - 4;
+            }
+        } else if (className.contains("六年级")) {
+            if (month < 7) {
+                period = year - 6;
+            } else {
+                period = year - 5;
+            }
+        } else if (className.contains("七年级")) {
+            if (month < 7) {
+                period = year - 1;
+            } else {
+                period = year;
+            }
+        } else if (className.contains("八年级")) {
+            if (month < 7) {
+                period = year - 2;
+            } else {
+                period = year - 1;
+            }
+        } else if (className.contains("九年级")) {
+            if (month < 7) {
+                period = year - 3;
+            } else {
+                period = year - 2;
+            }
+        }
+        return period;
+    }
+
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/register/RegisterParentsController.java

@@ -72,7 +72,6 @@ public class RegisterParentsController extends BaseController {
     /**
      * 新增注册-家长
      */
-    @SaIgnore
     @Log(title = "注册-家长", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java

@@ -43,7 +43,6 @@ public class SysDeptController extends BaseController {
     /**
      * 获取部门列表
      */
-    @SaCheckPermission("system:dept:list")
     @GetMapping("/old/list")
     public R<List<SysDeptVo>> oldList(SysDeptBo dept)
     {

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java

@@ -51,10 +51,6 @@ public class SysMenuController extends BaseController {
     /**
      * 获取菜单列表
      */
-    @SaCheckRole(value = {
-            TenantConstants.SUPER_ADMIN_ROLE_KEY,
-            TenantConstants.TENANT_ADMIN_ROLE_KEY
-    }, mode = SaMode.OR)
     @SaCheckPermission("system:menu:list")
     @GetMapping("/list")
     public R<List<SysMenuVo>> list(SysMenuBo menu) {
@@ -67,10 +63,10 @@ public class SysMenuController extends BaseController {
      *
      * @param menuId 菜单ID
      */
-    @SaCheckRole(value = {
+   /* @SaCheckRole(value = {
             TenantConstants.SUPER_ADMIN_ROLE_KEY,
             TenantConstants.TENANT_ADMIN_ROLE_KEY
-    }, mode = SaMode.OR)
+    }, mode = SaMode.OR)*/
     @SaCheckPermission("system:menu:query")
     @GetMapping(value = "/{menuId}")
     public R<SysMenuVo> getInfo(@PathVariable Long menuId) {
@@ -80,10 +76,10 @@ public class SysMenuController extends BaseController {
     /**
      * 获取菜单下拉树列表
      */
-    @SaCheckRole(value = {
+    /*@SaCheckRole(value = {
             TenantConstants.SUPER_ADMIN_ROLE_KEY,
             TenantConstants.TENANT_ADMIN_ROLE_KEY
-    }, mode = SaMode.OR)
+    }, mode = SaMode.OR)*/
     @SaCheckPermission("system:menu:query")
     @GetMapping("/treeselect")
     public R<List<Tree<Long>>> treeselect(SysMenuBo menu) {
@@ -96,10 +92,10 @@ public class SysMenuController extends BaseController {
      *
      * @param roleId 角色ID
      */
-    @SaCheckRole(value = {
+    /*@SaCheckRole(value = {
             TenantConstants.SUPER_ADMIN_ROLE_KEY,
             TenantConstants.TENANT_ADMIN_ROLE_KEY
-    }, mode = SaMode.OR)
+    }, mode = SaMode.OR)*/
     @SaCheckPermission("system:menu:query")
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
     public R<MenuTreeSelectVo> roleMenuTreeselect(@PathVariable("roleId") Long roleId) {

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/CourseChange.java

@@ -45,6 +45,7 @@ public class CourseChange extends BaseEntity {
     /**
      * 申请时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date applyTime;
 
     /**
@@ -70,6 +71,7 @@ public class CourseChange extends BaseEntity {
     /**
      * 调课科目的上课时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date subjectTime;
 
     /**
@@ -100,6 +102,7 @@ public class CourseChange extends BaseEntity {
     /**
      * 被调课科目的上课时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date beSubjectTime;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/FormalParentsStudent.java

@@ -54,6 +54,8 @@ public class FormalParentsStudent extends BaseEntity {
      */
     private String className;
 
+    private String period;
+
     /**
      * 姓名
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/FormalTeacherClass.java

@@ -57,6 +57,8 @@ public class FormalTeacherClass extends BaseEntity {
      */
     private String className;
 
+    private String period;
+
     /**
      * 学科
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/RegisterParentsStudent.java

@@ -67,6 +67,8 @@ public class RegisterParentsStudent extends BaseEntity {
      */
     private String className;
 
+    private String period;
+
     /**
      * 姓名
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/FormalParentsStudentBo.java

@@ -56,6 +56,8 @@ public class FormalParentsStudentBo extends BaseEntity {
     //@NotBlank(message = "班级名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String className;
 
+    private String period;
+
     /**
      * 姓名
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/FormalTeacherClassBo.java

@@ -50,6 +50,8 @@ public class FormalTeacherClassBo extends BaseEntity {
      */
     private String className;
 
+    private String period;
+
     /**
      * 学科
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/RegisterParentsStudentBo.java

@@ -68,6 +68,8 @@ public class RegisterParentsStudentBo extends BaseEntity {
      */
     private String className;
 
+    private String period;
+
     /**
      * 姓名
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CourseChangeVo.java

@@ -82,6 +82,7 @@ public class CourseChangeVo implements Serializable {
      * 调课科目的上课时间
      */
     @ExcelProperty(value = "调课科目的上课时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date subjectTime;
 
     /**
@@ -119,6 +120,7 @@ public class CourseChangeVo implements Serializable {
      * 被调课科目的上课时间
      */
     @ExcelProperty(value = "被调课科目的上课时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date beSubjectTime;
 
     /**
@@ -185,6 +187,7 @@ public class CourseChangeVo implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/FormalParentsStudentVo.java

@@ -69,6 +69,9 @@ public class FormalParentsStudentVo implements Serializable {
     @ExcelProperty(value = "班级名称")
     private String className;
 
+    @ExcelProperty(value = "届")
+    private String period;
+
     /**
      * 姓名
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/FormalTeacherClassVo.java

@@ -71,6 +71,9 @@ public class FormalTeacherClassVo implements Serializable {
     @ExcelProperty(value = "班级名称")
     private String className;
 
+    @ExcelProperty(value = "届")
+    private String period;
+
     /**
      * 学科
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RegisterParentsStudentVo.java

@@ -81,6 +81,9 @@ public class RegisterParentsStudentVo implements Serializable {
     @ExcelProperty(value = "班级名称")
     private String className;
 
+    @ExcelProperty(value = "届")
+    private String period;
+
     /**
      * 姓名
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RegisterTeacherClassVo.java

@@ -60,7 +60,7 @@ public class RegisterTeacherClassVo implements Serializable {
     /**
      *
      */
-    @ExcelProperty(value = "")
+    @ExcelProperty(value = "届")
     private String period;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/RegisterParentsServiceImpl.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.system.domain.RegisterParentsStudent;
 import org.dromara.system.domain.bo.RegisterParentsStudentBo;
 import org.dromara.system.domain.bo.RegisterTeacherClassBo;
 import org.dromara.system.domain.vo.RegisterParentsStudentVo;
@@ -113,14 +114,16 @@ public class RegisterParentsServiceImpl implements IRegisterParentsService {
         List<RegisterParentsStudentVo> registerParentsStudentList = bo.getRegisterParentsStudentList();
         if(registerParentsStudentList!=null && registerParentsStudentList.size()>0){
             for (RegisterParentsStudentVo registerParentsStudent : registerParentsStudentList) {
+                int period = StringUtils.getPeriod(registerParentsStudent.getClassName());
+                registerParentsStudent.setPeriod(String.valueOf(period));
                 registerParentsStudent.setParentsId(bo.getId());
                 registerParentsStudent.setParentsName(bo.getUserName());
                 registerParentsStudent.setParentsPhone(bo.getUserPhone());
                 registerParentsStudent.setCreateTime(DateUtils.getNowDate());
                 registerParentsStudent.setUpdateTime(DateUtils.getNowDate());
-                RegisterParentsStudentBo registerParentsStudentBo = new RegisterParentsStudentBo();
+                RegisterParentsStudent registerParentsStudentBo = new RegisterParentsStudent();
                 ClassUtils.copyProperties(registerParentsStudent, registerParentsStudentBo);
-                registerParentsStudentService.insertByBo(registerParentsStudentBo);
+                registerParentsStudentMapper.insert(registerParentsStudentBo);
             }
         }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/RegisterParentsStudentServiceImpl.java

@@ -124,6 +124,7 @@ public class RegisterParentsStudentServiceImpl implements IRegisterParentsStuden
         lqw.like(StringUtils.isNotBlank(bo.getSchoolName()), RegisterParentsStudent::getSchoolName, bo.getSchoolName());
         lqw.eq(bo.getClassId() != null, RegisterParentsStudent::getClassId, bo.getClassId());
         lqw.like(StringUtils.isNotBlank(bo.getClassName()), RegisterParentsStudent::getClassName, bo.getClassName());
+        lqw.like(StringUtils.isNotBlank(bo.getPeriod()), RegisterParentsStudent::getPeriod, bo.getPeriod());
         lqw.like(StringUtils.isNotBlank(bo.getStudentName()), RegisterParentsStudent::getStudentName, bo.getStudentName());
         lqw.eq(StringUtils.isNotBlank(bo.getStudentNumber()), RegisterParentsStudent::getStudentNumber, bo.getStudentNumber());
         lqw.eq(StringUtils.isNotBlank(bo.getIsPass()), RegisterParentsStudent::getIsPass, bo.getIsPass());
@@ -145,6 +146,8 @@ public class RegisterParentsStudentServiceImpl implements IRegisterParentsStuden
         bo.setParentsId(registerParentsVo.getId());
         bo.setParentsName(registerParentsVo.getUserName());
         bo.setParentsPhone(registerParentsVo.getUserPhone());
+        int period = StringUtils.getPeriod(bo.getClassName());
+        bo.setPeriod(String.valueOf(period));
         bo.setCreateTime(DateUtils.getNowDate());
         bo.setUpdateTime(DateUtils.getNowDate());
         bo.setCreateTime(DateUtils.getNowDate());

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/RegisterTeacherServiceImpl.java

@@ -148,7 +148,7 @@ public class RegisterTeacherServiceImpl implements IRegisterTeacherService {
             for (RegisterTeacherClassVo registerTeacherClass : registerTeacherClassList) {
                 registerTeacherClass.setTeacherId(bo.getId());
                 String className = registerTeacherClass.getClassName();
-                int period = getPeriod(className);
+                int period = StringUtils.getPeriod(className);
                 registerTeacherClass.setPeriod(String.valueOf(period));
                 registerTeacherClass.setTenantId(bo.getTenantId());
 
@@ -166,71 +166,6 @@ public class RegisterTeacherServiceImpl implements IRegisterTeacherService {
         return R.fail();
     }
 
-    private int getPeriod(String className) {
-        int period = 0;
-        //获取当前年
-        int year = DateUtils.getYear();
-        //获取当前月
-        int month = DateUtils.getMonth();
-        //计算届数
-        if (className.contains("一年级")) {
-            if (month < 7) {
-                period = year - 1;
-            } else {
-                period = year;
-            }
-        } else if (className.contains("二年级")) {
-            if (month < 7) {
-                period = year - 2;
-            } else {
-                period = year - 1;
-            }
-        } else if (className.contains("三年级")) {
-            if (month < 7) {
-                period = year - 3;
-            } else {
-                period = year - 2;
-            }
-        } else if (className.contains("四年级")) {
-            if (month < 7) {
-                period = year - 4;
-            } else {
-                period = year - 3;
-            }
-        } else if (className.contains("五年级")) {
-            if (month < 7) {
-                period = year - 5;
-            } else {
-                period = year - 4;
-            }
-        } else if (className.contains("六年级")) {
-            if (month < 7) {
-                period = year - 6;
-            } else {
-                period = year - 5;
-            }
-        } else if (className.contains("七年级")) {
-            if (month < 7) {
-                period = year - 1;
-            } else {
-                period = year;
-            }
-        } else if (className.contains("八年级")) {
-            if (month < 7) {
-                period = year - 2;
-            } else {
-                period = year - 1;
-            }
-        } else if (className.contains("九年级")) {
-            if (month < 7) {
-                period = year - 3;
-            } else {
-                period = year - 2;
-            }
-        }
-        return period;
-    }
-
     /**
      * 修改注册-老师
      */
@@ -247,7 +182,7 @@ public class RegisterTeacherServiceImpl implements IRegisterTeacherService {
                 registerTeacherClass.setTeacherId(bo.getId());
 
                 String className = registerTeacherClass.getClassName();
-                int period = getPeriod(className);
+                int period = StringUtils.getPeriod(className);
                 registerTeacherClass.setPeriod(String.valueOf(period));
                 RegisterTeacherClassBo registerTeacherClassBo = new RegisterTeacherClassBo();
                 ClassUtils.copyProperties(registerTeacherClass, registerTeacherClassBo);

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java

@@ -370,7 +370,6 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
                 List<FormalTeacherClassVo> teacherClass = formalTeacherClassService.getTeacherClass(String.valueOf(loginUser.getUserId()));
                 dept.setParentId(teacherClass.get(0).getSchoolId());
             }
-
         }
         return baseMapper.selectDeptOldList(dept);
     }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ZhxyShyjServiceImpl.java

@@ -281,6 +281,7 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
                     formalTeacherClass.setSchoolName(registerTeacher.getSchoolName());
                     formalTeacherClass.setClassId(teacherClass.getClassId());
                     formalTeacherClass.setClassName(teacherClass.getClassName());
+                    formalTeacherClass.setPeriod(teacherClass.getPeriod());
                     formalTeacherClass.setDiscipline(teacherClass.getDiscipline());
                     formalTeacherClass.setCreateTime(DateUtils.getNowDate());
                     formalTeacherClassMapper.insert(formalTeacherClass);
@@ -359,6 +360,7 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
                 formalParentsStudent.setTenantId(registerParentsStudent.getTenantId());
                 formalParentsStudent.setClassId(registerParentsStudent.getClassId());
                 formalParentsStudent.setClassName(registerParentsStudent.getClassName());
+                formalParentsStudent.setPeriod(registerParentsStudent.getPeriod());
                 formalParentsStudent.setStudentName(registerParentsStudent.getStudentName());
                 formalParentsStudent.setStudentNumber(registerParentsStudent.getStudentNumber());
                 formalParentsStudent.setCreateTime(DateUtils.getNowDate());

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RegisterParentsStudentMapper.xml

@@ -14,6 +14,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="schoolName"    column="school_name"    />
         <result property="classId"    column="class_id"    />
         <result property="className"    column="class_name"    />
+        <result property="period"    column="period"    />
+
         <result property="studentName"    column="student_name"    />
         <result property="studentNumber"    column="student_number"    />
         <result property="isPass"    column="is_pass"    />
@@ -28,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectRegisterParentsStudentVo">
-        select id, parents_id,parents_name,parents_phone, school_id, school_name, class_id, class_name, student_name, student_number, is_pass,audit_id,audit_user,opinion, create_by, create_time, update_by, update_time, remark from register_parents_student
+        select id, parents_id,parents_name,parents_phone, school_id, school_name, class_id, class_name, period,student_name, student_number, is_pass,audit_id,audit_user,opinion, create_by, create_time, update_by, update_time, remark from register_parents_student
     </sql>
     <update id="updateMapperById">
         update register_parents_student
@@ -40,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="schoolName != null">school_name = #{schoolName},</if>
             <if test="classId != null">class_id = #{classId},</if>
             <if test="className != null">class_name = #{className},</if>
+            <if test="period != null">period = #{period},</if>
             <if test="studentName != null">student_name = #{studentName},</if>
             <if test="studentNumber != null">student_number = #{studentNumber},</if>
             <if test="isPass != null">is_pass = #{isPass},</if>
@@ -65,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectRegisterParentsStudentListByTime" resultMap="RegisterParentsStudentResult">
         <include refid="selectRegisterParentsStudentVo"/>
         where date_format(create_time,'%Y%m') = date_format(#{monthFirst},'%Y%m')
+        <if test="period != null">period = #{period},</if>
         and class_id in
         <foreach collection="classIds" index="index" item="item" open="(" separator="," close=")">
             #{item}