Skip to content

D
dd_school
Commit 4a312190 by zhaopanyu
Options

Merge branch 'master' of 49.232.152.146:qangqi/dd_school

parents dfec8cdb e152ed88
Showing with 414 additions and 45 deletions
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
...@@ -106,6 +106,7 @@ public class SysUser extends BaseEntity ...@@ -106,6 +106,7 @@ public class SysUser extends BaseEntity
private SysDept dept; private SysDept dept;
/** 角色对象 */ /** 角色对象 */
@Excel(name = "角色")
private List<SysRole> roles; private List<SysRole> roles;
/** 角色组 */ /** 角色组 */
......
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import java.util.List;
import java.util.Map;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
...@@ -18,6 +20,10 @@ public interface SysDeptMapper ...@@ -18,6 +20,10 @@ public interface SysDeptMapper
* @return 部门信息集合 * @return 部门信息集合
*/ */
public List<SysDept> selectDeptList(SysDept dept); public List<SysDept> selectDeptList(SysDept dept);
public List<Map<String, Object>> selectDeptGroupByUserId(Long userId);
public List<SysDept> selectDepartmentDept(String deptName);
public SysDept selectParenById(@Param("deptId") Long deptId ,@Param("parenId") Long parenId);
public String selectSupDeptName(Long deptId);
/** /**
* 根据角色ID查询部门树信息 * 根据角色ID查询部门树信息
......
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
...@@ -21,6 +21,7 @@ public interface SysUserMapper { ...@@ -21,6 +21,7 @@ public interface SysUserMapper {
public List<SysUser> selectUserList(SysUser sysUser); public List<SysUser> selectUserList(SysUser sysUser);
public List<SysUser> selectUserListTypeLogin(SysUser sysUser); public List<SysUser> selectUserListTypeLogin(SysUser sysUser);
public List<SysUser> selectDeptAncetorsByPernId(String deptId);
/** /**
* 根据条件分页查询已配用户角色列表 * 根据条件分页查询已配用户角色列表
...@@ -30,6 +31,11 @@ public interface SysUserMapper { ...@@ -30,6 +31,11 @@ public interface SysUserMapper {
*/ */
public List<SysUser> selectAllocatedList(SysUser user); public List<SysUser> selectAllocatedList(SysUser user);
public List<String> selectDeptRoleBydeptId(String deptId);
public List<String> selectDeptPlaceBydeptId(String deptId);
/** /**
* 根据条件分页查询未分配用户角色列表 * 根据条件分页查询未分配用户角色列表
* *
......
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
package com.ruoyi.system.service; package com.ruoyi.system.service;
import java.util.List; import java.util.List;
import java.util.Map;
import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
...@@ -18,6 +20,9 @@ public interface ISysDeptService ...@@ -18,6 +20,9 @@ public interface ISysDeptService
* @return 部门信息集合 * @return 部门信息集合
*/ */
public List<SysDept> selectDeptList(SysDept dept); public List<SysDept> selectDeptList(SysDept dept);
public List<SysDept> selectDept(SysDept dept);
public List<Map<String,Object>> selectDeptGroupByUserId(Long userId);
public SysDept selectParenById(Long depeId,Long parenId);
/** /**
* 查询部门树结构信息 * 查询部门树结构信息
......
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
...@@ -26,6 +26,8 @@ public interface ISysUserService { ...@@ -26,6 +26,8 @@ public interface ISysUserService {
* @return 用户信息集合信息 * @return 用户信息集合信息
*/ */
public List<SysUser> selectAllocatedList(SysUser user); public List<SysUser> selectAllocatedList(SysUser user);
public List<String> selectDeptRoleBydeptId(String deptId);
public List<String> selectDeptPlaceBydeptId(String deptId);
/** /**
* 根据条件分页查询未分配用户角色列表 * 根据条件分页查询未分配用户角色列表
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
...@@ -3,6 +3,7 @@ package com.ruoyi.system.service.impl; ...@@ -3,6 +3,7 @@ package com.ruoyi.system.service.impl;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -46,6 +47,30 @@ public class SysDeptServiceImpl implements ISysDeptService ...@@ -46,6 +47,30 @@ public class SysDeptServiceImpl implements ISysDeptService
public List<SysDept> selectDeptList(SysDept dept) public List<SysDept> selectDeptList(SysDept dept)
{ {
return deptMapper.selectDeptList(dept); return deptMapper.selectDeptList(dept);
}
@Override
public List<SysDept> selectDept(SysDept dept)
{
return deptMapper.selectDeptList(dept);
}
/**
* 根据用户查找所在的部门
* @param userId
* @return
*/
@Override
public List<Map<String, Object>> selectDeptGroupByUserId(Long userId) {
return deptMapper.selectDeptGroupByUserId(userId);
}
@Override
public SysDept selectParenById(Long deptId,Long parenId) {
return deptMapper.selectParenById(deptId,parenId);
} }
/** /**
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
...@@ -93,6 +93,16 @@ public class SysUserServiceImpl implements ISysUserService { ...@@ -93,6 +93,16 @@ public class SysUserServiceImpl implements ISysUserService {
return userMapper.selectAllocatedList(user); return userMapper.selectAllocatedList(user);
} }
@Override
public List<String> selectDeptRoleBydeptId(String deptId) {
return userMapper.selectDeptRoleBydeptId(deptId) ;
}
@Override
public List<String> selectDeptPlaceBydeptId(String deptId) {
return userMapper.selectDeptPlaceBydeptId(deptId) ;
}
/** /**
* 根据条件分页查询未分配用户角色列表 * 根据条件分页查询未分配用户角色列表
* *
......
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
...@@ -47,6 +47,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -47,6 +47,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by d.parent_id, d.order_num order by d.parent_id, d.order_num
</select> </select>
<select id="selectDeptGroupByUserId" parameterType="Long" resultType="Map">
SELECT d.dept_id as deptId,d.dept_name AS deptName,d.parent_id as parentId FROM sys_user u
LEFT JOIN sys_dd_user_dept ud on u.user_id = ud.user_id LEFT JOIN sys_dept d on ud.dept_id = d.dept_id
WHERE u.user_id = #{dept} AND d.del_flag = 0
</select>
<select id="selectParenById" resultMap="SysDeptResult">
<include refid="selectDeptVo"/>
where dept_id=#{deptId} and parent_id = #{parenId} and del_flag = '0'
</select>
<select id="selectSupDeptName" resultType="String">
select d.ancestors FROM sys_dept d WHERE d.dept_id = #{deptId}
</select>
<select id="selectDepartmentDept" resultMap="SysDeptResult">
<include refid="selectDeptVo"/>
where dept_name like concat('%', #{deptName}, '%') and del_flag = '0'
</select>
<select id="selectDeptListByRoleId" resultType="Long"> <select id="selectDeptListByRoleId" resultType="Long">
select d.dept_id select d.dept_id
from sys_dept d from sys_dept d
......
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
...@@ -167,6 +167,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -167,6 +167,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where u.user_name = #{userName} and u.del_flag = '0' where u.user_name = #{userName} and u.del_flag = '0'
</select> </select>
<select id="selectDeptAncetorsByPernId" parameterType="String" resultMap="SysUserResult">
SELECT u. *,d.* FROM sys_user u LEFT JOIN sys_user_dept ud on u.user_id = ud.user_id LEFT JOIN sys_dept d on ud.dept_id = d.dept_id
where d.ancestors like concat('%', #{deptId}, '%') GROUP BY u.user_id
</select>
<select id="selectDeptRoleBydeptId" parameterType="String" resultType="String">
SELECT su.login_name name FROM sys_user su LEFT JOIN sys_user_dept u on su.user_id = u.user_id LEFT JOIN sys_dept d on d.dept_id = u.dept_id
LEFT JOIN sys_user_role ur on u.user_id = ur.user_id LEFT JOIN sys_role r
on r.role_id = ur.role_id WHERE r.role_name="级部主任" and d.ancestors like concat('%', #{deptId}, '%') GROUP BY su.user_id
</select>
<select id="selectDeptPlaceBydeptId" parameterType="String" resultType="String">
SELECT u.user_name FROM sys_user u LEFT JOIN sys_user_dept ud on u.user_id = ud.user_id LEFT JOIN sys_dept d on d.dept_id = ud.dept_id
LEFT JOIN sys_user_role ur on ur.user_id = u.user_id LEFT JOIN sys_role r on r.role_id = ur.role_id
WHERE r.role_key ="sectionLeader"
AND d.ancestors LIKE concat('%', #{deptId}, '%') GROUP BY u.user_name
</select>
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult"> <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
<include refid="selectUserVo"/> <include refid="selectUserVo"/>
where u.user_id = #{userId} where u.user_id = #{userId}
......
ruoyi-ui/src/api/smartSchool/teacherFiles/teacherElectronicFile.js
...@@ -75,7 +75,7 @@ export function getteacherNotice(query) { ...@@ -75,7 +75,7 @@ export function getteacherNotice(query) {
params: query params: query
}) })
} }
//老师查看档案详情 //老师查看详情
export function getNoticeInfo(query) { export function getNoticeInfo(query) {
return request({ return request({
url: '/teacherFiles/files/list', url: '/teacherFiles/files/list',
...@@ -84,6 +84,14 @@ export function getNoticeInfo(query) { ...@@ -84,6 +84,14 @@ export function getNoticeInfo(query) {
}) })
} }
//老师查看列表
export function getTeacherTnfo(userId) {
return request({
url: '/teacherFiles/files/getTeachList/'+userId,
method: 'get',
})
}
//级部查看档案详情 //级部查看档案详情
export function getDepInfo(query) { export function getDepInfo(query) {
return request({ return request({
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacherFiles/TeacherFilesController.java
...@@ -42,6 +42,17 @@ public class TeacherFilesController extends BaseController ...@@ -42,6 +42,17 @@ public class TeacherFilesController extends BaseController
} }
/** /**
* 老师查看自己的档案任务
*/
@GetMapping("getTeachList/{userId}")
public TableDataInfo teachList(@PathVariable("userId") Long userId){
startPage();
List<TeacherFilesNotice> teacherFilesNotices = teacherFilesService.selctTeacherByUserId(userId);
return getDataTable(teacherFilesNotices);
}
/**
* 导出教师档案列表 * 导出教师档案列表
*/ */
@PreAuthorize("@ss.hasPermi('teacherFiles:files:export')") @PreAuthorize("@ss.hasPermi('teacherFiles:files:export')")
...@@ -72,6 +83,7 @@ public class TeacherFilesController extends BaseController ...@@ -72,6 +83,7 @@ public class TeacherFilesController extends BaseController
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TeacherFiles teacherFiles) public AjaxResult add(@RequestBody TeacherFiles teacherFiles)
{ {
teacherFiles.setState("0");
return toAjax(teacherFilesService.insertTeacherFiles(teacherFiles)); return toAjax(teacherFilesService.insertTeacherFiles(teacherFiles));
} }
...@@ -91,10 +103,10 @@ public class TeacherFilesController extends BaseController ...@@ -91,10 +103,10 @@ public class TeacherFilesController extends BaseController
*/ */
@PreAuthorize("@ss.hasPermi('teacherFiles:files:remove')") @PreAuthorize("@ss.hasPermi('teacherFiles:files:remove')")
@Log(title = "教师档案", businessType = BusinessType.DELETE) @Log(title = "教师档案", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long id) public AjaxResult remove(@PathVariable Long[] ids)
{ {
return toAjax(teacherFilesService.deleteTeacherFilesById(id)); return toAjax(teacherFilesService.deleteTeacherFilesByIds(ids));
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacherFiles/TeacherFilesNotice.java
...@@ -21,6 +21,8 @@ public class TeacherFilesNotice extends BaseEntity ...@@ -21,6 +21,8 @@ public class TeacherFilesNotice extends BaseEntity
/** id */ /** id */
private String id; private String id;
private Long fId;
/** 范围 */ /** 范围 */
@Excel(name = "范围") @Excel(name = "范围")
private String noticeRange; private String noticeRange;
...@@ -37,7 +39,9 @@ public class TeacherFilesNotice extends BaseEntity ...@@ -37,7 +39,9 @@ public class TeacherFilesNotice extends BaseEntity
@Excel(name = "通知名称") @Excel(name = "通知名称")
private String noticeName; private String noticeName;
/** 状态 */ /** 状态
* @Excel(name = "状态 (1未发布 2已发布 3已填写 4已提交 5已确认 9驳回)" )
* */
@Excel(name = "状态") @Excel(name = "状态")
private String noticeState; private String noticeState;
...@@ -51,5 +55,10 @@ public class TeacherFilesNotice extends BaseEntity ...@@ -51,5 +55,10 @@ public class TeacherFilesNotice extends BaseEntity
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime; private Date endTime;
/**
* 填写状态 (1未发布 2已发布 3已填写 4已提交 5已确认 9驳回)"
*/
private String state;
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolClass/SchoolClassMapper.java
...@@ -68,4 +68,6 @@ public interface SchoolClassMapper extends BaseMapper<SchoolClass> { ...@@ -68,4 +68,6 @@ public interface SchoolClassMapper extends BaseMapper<SchoolClass> {
List<Long> getClassesIdByGradeId(Long gradeId); List<Long> getClassesIdByGradeId(Long gradeId);
public Long selectDdClassId(String ddClssId); public Long selectDdClassId(String ddClssId);
List<SchoolClassVo> selectTeacherByTeachId(Long teachId);
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolCurriculum/SchoolCurriculumMapper.java
...@@ -2,8 +2,12 @@ package yangtz.cs.liu.campus.mapper.schoolCurriculum; ...@@ -2,8 +2,12 @@ package yangtz.cs.liu.campus.mapper.schoolCurriculum;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import yangtz.cs.liu.campus.domain.schoolCurriculum.SchoolCurriculum; import yangtz.cs.liu.campus.domain.schoolCurriculum.SchoolCurriculum;
@Mapper @Mapper
public interface SchoolCurriculumMapper extends BaseMapper<SchoolCurriculum> { public interface SchoolCurriculumMapper extends BaseMapper<SchoolCurriculum> {
@Select("select * from school_curriculum where course_name =#{name}")
SchoolCurriculum selectCourseName(String name);
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolgrade/SchoolGradeMapper.java
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.Map; import java.util.Map;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade; import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGradeMentor; import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGradeMentor;
import yangtz.cs.liu.campus.vo.schoolgrade.SchoolGradeMentorVo; import yangtz.cs.liu.campus.vo.schoolgrade.SchoolGradeMentorVo;
...@@ -25,8 +26,15 @@ public interface SchoolGradeMapper extends BaseMapper<SchoolGrade> { ...@@ -25,8 +26,15 @@ public interface SchoolGradeMapper extends BaseMapper<SchoolGrade> {
List<Long> getGradeIdsByYear(int schoolYear); List<Long> getGradeIdsByYear(int schoolYear);
@Select("SELECT school_year FROM school_grade GROUP BY school_year")
List<String> selectSchoolYearGruoUp();
//获取最新学年 //获取最新学年
int isNewSchoolYear(); int isNewSchoolYear();
SchoolGrade selectGradeByName(String name);
public List<String> getYearList(); public List<String> getYearList();
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/teacher/SchoolTeacherMapper.java
...@@ -48,6 +48,8 @@ public interface SchoolTeacherMapper extends BaseMapper<SchoolTeacher>{ ...@@ -48,6 +48,8 @@ public interface SchoolTeacherMapper extends BaseMapper<SchoolTeacher>{
*/ */
SchoolTeacher selectTeacher(String teacherIdCard); SchoolTeacher selectTeacher(String teacherIdCard);
SchoolTeacher selectTeacherByDdUerId(String dduserId);
/** /**
* 微信公众号(通过姓名查询) * 微信公众号(通过姓名查询)
* @param teacherName * @param teacherName
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/teacherFiles/TeacherFilesNoticeMapper.java
package yangtz.cs.liu.campus.mapper.teacherFiles; package yangtz.cs.liu.campus.mapper.teacherFiles;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice; import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNoticeTotal; import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNoticeTotal;
import yangtz.cs.liu.campus.vo.teacherFiles.SchoolClassByGradeVo; import yangtz.cs.liu.campus.vo.teacherFiles.SchoolClassByGradeVo;
...@@ -40,6 +41,10 @@ public interface TeacherFilesNoticeMapper ...@@ -40,6 +41,10 @@ public interface TeacherFilesNoticeMapper
*/ */
public int insertTeacherFilesNotice(TeacherFilesNotice teacherFilesNotice); public int insertTeacherFilesNotice(TeacherFilesNotice teacherFilesNotice);
@Select("SELECT fn.*,tf.state,tf.id as fId from teacher_files tf LEFT JOIN teacher_files_notice fn on fn.id= tf.notice_id WHERE tf.teacher_id = #{userId} and fn.notice_state = 2")
public List<TeacherFilesNotice> selctTeacherByUserId(Long userId);
/** /**
* 修改教师档案通知 * 修改教师档案通知
* *
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolLab/SchoolLabClassYearServiceImpl.java
...@@ -98,7 +98,13 @@ public class SchoolLabClassYearServiceImpl extends ServiceImpl<SchoolLabClassYea ...@@ -98,7 +98,13 @@ public class SchoolLabClassYearServiceImpl extends ServiceImpl<SchoolLabClassYea
@Override @Override
public SchoolLabClassYearVo selectSchoolLabClassYearById(Long id) public SchoolLabClassYearVo selectSchoolLabClassYearById(Long id)
{ {
return schoolLabClassYearMapper.selectSchoolLabClassYearById(id); SchoolLabClassYearVo schoolLabClassYearVo = schoolLabClassYearMapper.selectSchoolLabClassYearById(id);
LambdaQueryWrapper<SchoolLabClassYearRelation> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SchoolLabClassYearRelation::getLabClassYearId,schoolLabClassYearVo.getId());
List<SchoolLabClassYearRelation> relations = relationMapper.selectList(wrapper);
schoolLabClassYearVo.setSchoolLabClassYearRelationList(relations);
return schoolLabClassYearVo;
} }
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolgrade/ISchoolGradeImpl.java
...@@ -47,6 +47,12 @@ public class ISchoolGradeImpl extends ServiceImpl<SchoolGradeMapper, SchoolGrade ...@@ -47,6 +47,12 @@ public class ISchoolGradeImpl extends ServiceImpl<SchoolGradeMapper, SchoolGrade
return schoolGradeMapper.selectList(lqw); return schoolGradeMapper.selectList(lqw);
} }
@Override
public List<String> selectSchoolYearGruoUp() {
return schoolGradeMapper.selectSchoolYearGruoUp();
}
//判断所在班级所在级部（存在一个老师跨几个级部教学，比如体育老师，所以获取教授班级所在级部，随便选择某个级部即可） //判断所在班级所在级部（存在一个老师跨几个级部教学，比如体育老师，所以获取教授班级所在级部，随便选择某个级部即可）
@Override @Override
public Long getGradeId(Long userId) { public Long getGradeId(Long userId) {
...@@ -120,6 +126,12 @@ public class ISchoolGradeImpl extends ServiceImpl<SchoolGradeMapper, SchoolGrade ...@@ -120,6 +126,12 @@ public class ISchoolGradeImpl extends ServiceImpl<SchoolGradeMapper, SchoolGrade
return resList; return resList;
} }
@Override
public SchoolGrade selectGradeByName(String gradName) {
return schoolGradeMapper.selectGradeByName(gradName);
}
/** /**
* 升级 * 升级
* （初始化三条数据后，可进行升级操作，新插入一条级部信息，上两个级部的学年和年级自动+1） * （初始化三条数据后，可进行升级操作，新插入一条级部信息，上两个级部的学年和年级自动+1）
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/teacherFiles/TeacherFilesServiceImpl.java
...@@ -74,6 +74,12 @@ public class TeacherFilesServiceImpl implements ITeacherFilesService ...@@ -74,6 +74,12 @@ public class TeacherFilesServiceImpl implements ITeacherFilesService
return teacherFilesMapper.selectTeacherFilesList(teacherFiles); return teacherFilesMapper.selectTeacherFilesList(teacherFiles);
} }
@Override
public List<TeacherFilesNotice> selctTeacherByUserId(Long userId) {
return teacherFilesNoticeMapper.selctTeacherByUserId(userId);
}
/** /**
* 新增教师档案 * 新增教师档案
* *
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolgrade/ISchoolGradeService.java
...@@ -14,6 +14,8 @@ public interface ISchoolGradeService extends IService<SchoolGrade> { ...@@ -14,6 +14,8 @@ public interface ISchoolGradeService extends IService<SchoolGrade> {
List<SchoolGrade> queryList(SchoolGrade schoolGrade); List<SchoolGrade> queryList(SchoolGrade schoolGrade);
List<String> selectSchoolYearGruoUp();
Long getGradeId(Long userId); Long getGradeId(Long userId);
Long getMemberGrade(Long userId); Long getMemberGrade(Long userId);
...@@ -22,6 +24,7 @@ public interface ISchoolGradeService extends IService<SchoolGrade> { ...@@ -22,6 +24,7 @@ public interface ISchoolGradeService extends IService<SchoolGrade> {
List<GradeTreeSelect> buildGradeTreeList(List<SchoolGrade> gradeList); List<GradeTreeSelect> buildGradeTreeList(List<SchoolGrade> gradeList);
int upgrade(); int upgrade();
SchoolGrade selectGradeByName(String gradName);
//获取最新学年 //获取最新学年
int isNewSchoolYear(); int isNewSchoolYear();
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/student/ISchoolStudentService.java
...@@ -57,14 +57,14 @@ public interface ISchoolStudentService extends IService<SchoolStudent> { ...@@ -57,14 +57,14 @@ public interface ISchoolStudentService extends IService<SchoolStudent> {
* @param teacherId * @param teacherId
* @return * @return
*/ */
Long getDdUserId(String foUserId); List<SchoolStudent> getMemberByTeacher(Long teacherId);
/** /**
* 根据dduserId查找id * 根据dduserId查找id
* @param teacherId * @param teacherId
* @return * @return
*/ */
List<SchoolStudent> getMemberByTeacher(Long teacherId); Long getDdUserId(String foUserId);
/** /**
* 家长查看班级其他同学 * 家长查看班级其他同学
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/teacherFiles/ITeacherFilesService.java
package yangtz.cs.liu.campus.service.teacherFiles; package yangtz.cs.liu.campus.service.teacherFiles;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFiles; import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFiles;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesVO; import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesVO;
import java.util.List; import java.util.List;
...@@ -28,6 +29,7 @@ public interface ITeacherFilesService ...@@ -28,6 +29,7 @@ public interface ITeacherFilesService
* @return 教师档案集合 * @return 教师档案集合
*/ */
public List<TeacherFiles> selectTeacherFilesList(TeacherFiles teacherFiles); public List<TeacherFiles> selectTeacherFilesList(TeacherFiles teacherFiles);
public List<TeacherFilesNotice> selctTeacherByUserId(Long userId);
/** /**
* 新增教师档案 * 新增教师档案
......
smart-campus/src/main/java/yangtz/cs/liu/dingding/controller/DingJiaXiaoController.java
...@@ -8,6 +8,8 @@ import com.alibaba.fastjson2.JSONObject; ...@@ -8,6 +8,8 @@ import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.core.domain.entity.SchoolTeacher; import com.ruoyi.common.core.domain.entity.SchoolTeacher;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -18,12 +20,13 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -18,12 +20,13 @@ import org.springframework.web.bind.annotation.RestController;
import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass; import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass;
import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassHeadmaster; import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassHeadmaster;
import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassMentor; import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassMentor;
import yangtz.cs.liu.campus.domain.schoolCurriculum.SchoolCurriculum;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade; import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGradeMentor;
import yangtz.cs.liu.campus.domain.student.SchoolStudent; import yangtz.cs.liu.campus.domain.student.SchoolStudent;
import yangtz.cs.liu.campus.domain.student.SchoolStudentClassRelation; import yangtz.cs.liu.campus.domain.student.SchoolStudentClassRelation;
import yangtz.cs.liu.campus.domain.student.SchoolStudentClasses; import yangtz.cs.liu.campus.domain.student.SchoolStudentClasses;
import yangtz.cs.liu.campus.domain.student.SchoolStudentParent; import yangtz.cs.liu.campus.domain.student.SchoolStudentParent;
import yangtz.cs.liu.campus.mapper.schoolCurriculum.SchoolCurriculumMapper;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassHeadmasterService; import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassHeadmasterService;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassMentorService; import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassMentorService;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService; import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService;
...@@ -34,7 +37,6 @@ import yangtz.cs.liu.campus.service.student.ISchoolStudentClassesService; ...@@ -34,7 +37,6 @@ import yangtz.cs.liu.campus.service.student.ISchoolStudentClassesService;
import yangtz.cs.liu.campus.service.student.ISchoolStudentParentService; import yangtz.cs.liu.campus.service.student.ISchoolStudentParentService;
import yangtz.cs.liu.campus.service.student.ISchoolStudentService; import yangtz.cs.liu.campus.service.student.ISchoolStudentService;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService;
import yangtz.cs.liu.campus.vo.student.SchoolStudentVO;
import yangtz.cs.liu.campus.vo.teacher.SchoolTeacherVO; import yangtz.cs.liu.campus.vo.teacher.SchoolTeacherVO;
import yangtz.cs.liu.dingding.utils.AccessTokenUtils; import yangtz.cs.liu.dingding.utils.AccessTokenUtils;
import yangtz.cs.liu.dingding.vo.DingJiaXiaoVo; import yangtz.cs.liu.dingding.vo.DingJiaXiaoVo;
...@@ -95,11 +97,18 @@ public class DingJiaXiaoController { ...@@ -95,11 +97,18 @@ public class DingJiaXiaoController {
@Autowired @Autowired
ISysUserService sysUserService; ISysUserService sysUserService;
@Autowired
SysDeptMapper sysDeptMapper;
@Autowired
SchoolCurriculumMapper schoolCurriculumMapper;
public List<String> userTypes = new ArrayList<String>(){ public List<String> userTypes = new ArrayList<String>(){
{ {
this.add("teacher"); this.add("teacher");
this.add("guardian");
this.add("student"); this.add("student");
this.add("guardian");
} }
}; };
...@@ -296,11 +305,6 @@ public class DingJiaXiaoController { ...@@ -296,11 +305,6 @@ public class DingJiaXiaoController {
continue; continue;
} }
SchoolTeacher classHeadTeacher = schoolTeacherCopies.get(0); SchoolTeacher classHeadTeacher = schoolTeacherCopies.get(0);
//职工跟年级关系
SchoolGradeMentor schoolGradeMentor = new SchoolGradeMentor();
schoolGradeMentor.setTeacherId(classHeadTeacher.getId());
schoolGradeMentor.setGradeId(date.getGradeId());
schoolGradeMentorService.save(schoolGradeMentor);
if ("1".equals(teachDate.getIsAdviser())){ if ("1".equals(teachDate.getIsAdviser())){
//当前老师是班主任 记录班主任跟班级关系 //当前老师是班主任 记录班主任跟班级关系
SchoolClassHeadmaster schoolClassHeadmaster = new SchoolClassHeadmaster(); SchoolClassHeadmaster schoolClassHeadmaster = new SchoolClassHeadmaster();
...@@ -315,11 +319,17 @@ public class DingJiaXiaoController { ...@@ -315,11 +319,17 @@ public class DingJiaXiaoController {
schoolClassss.setTeacherTel(classHeadTeacher.getTeacherTel()); schoolClassss.setTeacherTel(classHeadTeacher.getTeacherTel());
iSchoolClassService.updateById(schoolClassss); iSchoolClassService.updateById(schoolClassss);
}else { }else {
//查找部门 课程没有编写
SysUser sysUser = sysUserService.selectUserById(classHeadTeacher.getId());
String deptName = sysUser.getDept().getDeptName();
//根据部门查找课程信息
SchoolCurriculum schoolCurriculum = schoolCurriculumMapper.selectCourseName(deptName);
//任课老师 跟班级关系 //任课老师 跟班级关系
SchoolClassMentor schoolClassMentor = new SchoolClassMentor(); SchoolClassMentor schoolClassMentor = new SchoolClassMentor();
schoolClassMentor.setTeacherId(classHeadTeacher.getId()); schoolClassMentor.setTeacherId(classHeadTeacher.getId());
schoolClassMentor.setClassId(date.getId()); schoolClassMentor.setClassId(date.getId());
//查找部门 课程没有编写 schoolClassMentor.setCourseName(schoolCurriculum.getCourseName());
schoolClassMentor.setCourseId(schoolCurriculum.getId());
schoolClassMentorService.save(schoolClassMentor); schoolClassMentorService.save(schoolClassMentor);
} }
} }
...@@ -348,21 +358,13 @@ public class DingJiaXiaoController { ...@@ -348,21 +358,13 @@ public class DingJiaXiaoController {
schoolStudentClasses.setTeacherName(school.getTeacherName()); schoolStudentClasses.setTeacherName(school.getTeacherName());
schoolStudentClassesService.save(schoolStudentClasses); schoolStudentClassesService.save(schoolStudentClasses);
} }
} else if (type.equals("guardian")) { } else if (type.equals("guardian")) {
//监护人 //监护人
guardianUserInfos = this.addUserList(token, type, date.getDdClassId()); guardianUserInfos = this.addUserList(token, type, date.getDdClassId());
for (DingJiaXiaoVo.StudentUserInfo guarDate : guardianUserInfos){ for (DingJiaXiaoVo.StudentUserInfo guarDate : guardianUserInfos){
//找寻学生 //找寻学生
String toUserId = this.getToUserId(token, guarDate.getUserId(), date.getDdClassId()); String toUserId = this.getToUserId(token, guarDate.getUserId(), date.getDdClassId());
SchoolStudentVO schoolStudentVO = new SchoolStudentVO(); Long ddUserId = schoolStudentService.getDdUserId(toUserId);
schoolStudentVO.setDdUserId(toUserId);
List<SchoolStudentVO> schoolStudentVOS = schoolStudentService.queryList(schoolStudentVO);
Long studenId =null;
if (!schoolStudentVOS.isEmpty()){
studenId = schoolStudentVOS.get(0).getId();
}
//创建用户user表 //创建用户user表
SysUser jUser = new SysUser(); SysUser jUser = new SysUser();
...@@ -375,12 +377,13 @@ public class DingJiaXiaoController { ...@@ -375,12 +377,13 @@ public class DingJiaXiaoController {
jUser.setStatus("0"); jUser.setStatus("0");
jUser.setDelFlag("0"); jUser.setDelFlag("0");
jUser.setUnionId(guarDate.getUnionid()); jUser.setUnionId(guarDate.getUnionid());
jUser.setDdUserId(guarDate.getUserId());
jUser.setRoleIds(new Long[]{111L}); jUser.setRoleIds(new Long[]{111L});
jUser.setStudentId(studenId); jUser.setStudentId(ddUserId);
sysUserService.insertUser(jUser); sysUserService.insertUser(jUser);
//家长表 //家长表
SchoolStudentParent schoolStudentParent = new SchoolStudentParent() ; SchoolStudentParent schoolStudentParent = new SchoolStudentParent() ;
schoolStudentParent.setStudentId(studenId); schoolStudentParent.setStudentId(ddUserId);
schoolStudentParent.setUserId(jUser.getUserId()); schoolStudentParent.setUserId(jUser.getUserId());
schoolStudentParent.setParentName(guarDate.getName()); schoolStudentParent.setParentName(guarDate.getName());
schoolStudentParent.setTelephone(guarDate.getMobile()); schoolStudentParent.setTelephone(guarDate.getMobile());
...@@ -394,11 +397,11 @@ public class DingJiaXiaoController { ...@@ -394,11 +397,11 @@ public class DingJiaXiaoController {
return ""; return "完成";
} }
//获取监护人详情 获取学生userid //获取监护人详情 获取学生userid
private String getToUserId(String token,String fromUserId,String classId){ public String getToUserId(String token,String fromUserId,String classId){
String toUserId = null; String toUserId = null;
JSONObject bjParme = new JSONObject(); JSONObject bjParme = new JSONObject();
bjParme.put("from_userid",fromUserId); bjParme.put("from_userid",fromUserId);
...@@ -406,7 +409,7 @@ public class DingJiaXiaoController { ...@@ -406,7 +409,7 @@ public class DingJiaXiaoController {
String bjPost = HttpUtil.post("https://oapi.dingtalk.com/topapi/edu/user/relation/get?access_token="+token, bjParme); String bjPost = HttpUtil.post("https://oapi.dingtalk.com/topapi/edu/user/relation/get?access_token="+token, bjParme);
JSONObject bjObject = JSONObject.parseObject(bjPost); JSONObject bjObject = JSONObject.parseObject(bjPost);
if ((Integer) bjObject.get("errcode") != 0){ if ((Integer) bjObject.get("errcode") != 0){
throw new RuntimeException("获取班级列表失败"); throw new RuntimeException("获取班级列表失败"+bjPost);
} }
JSONArray jsonArray = bjObject.getJSONObject("result").getJSONArray("relations"); JSONArray jsonArray = bjObject.getJSONObject("result").getJSONArray("relations");
for (int i= 0; i< jsonArray.size();i++){ for (int i= 0; i< jsonArray.size();i++){
......
smart-campus/src/main/java/yangtz/cs/liu/dingding/controller/dingEvent/DingEventController.java
...@@ -77,7 +77,40 @@ public class DingEventController { ...@@ -77,7 +77,40 @@ public class DingEventController {
} else if ("bpms_task_change".equals(eventType)){ } else if ("bpms_task_change".equals(eventType)){
// 处理审批任务事件 // 处理审批任务事件
eventJson.get(""); eventJson.get("");
} else { } else if ("edu_user_insert".equals(eventType)){
// 家校人员身份新增
ddUserService.xjUserAdd(eventJson);
}else if ("edu_user_update".equals(eventType)){
// 家校人员身份更新
eventJson.get("");
}else if ("edu_user_delete".equals(eventType)){
// 家校人员身份删除
eventJson.get("");
}else if ("edu_user_relation_insert".equals(eventType)){
// 家校人员关系新增
eventJson.get("");
}else if ("edu_user_relation_update".equals(eventType)){
// 家校人员关系更新
eventJson.get("");
}
else if ("edu_user_relation_delete".equals(eventType)){
// 家校人员关系删除
eventJson.get("");
}else if ("edu_dept_insert".equals(eventType)){
// 家校部门 节点新增
eventJson.get("");
}
else if ("edu_dept_update".equals(eventType)){
// 家校部门 节点更新
eventJson.get("");
}else if ("edu_dept_delete".equals(eventType)){
// 家校部门 节点更新
eventJson.get("");
}
else {
// 添加其他已注册的 // 添加其他已注册的
log.info("发生了：" + eventType + "事件"); log.info("发生了：" + eventType + "事件");
} }
......
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/experiment/ExperimentLevelController.java
...@@ -4,15 +4,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; ...@@ -4,15 +4,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import java.util.Calendar; import java.util.Calendar;
import java.util.List; import java.util.List;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolLabClassYear; import yangtz.cs.liu.campus.domain.schoolLab.SchoolLabClassYear;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherExperimentApply; import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherExperimentApply;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherLabApply; import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherLabApply;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
import yangtz.cs.liu.campus.mapper.schoolLab.SchoolTeacherLabApplyMapper; import yangtz.cs.liu.campus.mapper.schoolLab.SchoolTeacherLabApplyMapper;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolExperimentPlanService; import yangtz.cs.liu.campus.service.schoolLab.ISchoolExperimentPlanService;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolLabClassYearService; import yangtz.cs.liu.campus.service.schoolLab.ISchoolLabClassYearService;
...@@ -44,9 +50,13 @@ public class ExperimentLevelController extends BaseController { ...@@ -44,9 +50,13 @@ public class ExperimentLevelController extends BaseController {
@Autowired @Autowired
private ISchoolGradeService schoolGradeService; private ISchoolGradeService schoolGradeService;
@Autowired @Autowired
private ISchoolGradeService gradeService; private ISysUserService userService;
@Autowired
private ISysDeptService deptService;
/** /**
* 获取当前学年+学期 * 获取当前学年+学期
*/ */
...@@ -112,8 +122,10 @@ public class ExperimentLevelController extends BaseController { ...@@ -112,8 +122,10 @@ public class ExperimentLevelController extends BaseController {
@GetMapping("/getGrades") @GetMapping("/getGrades")
public AjaxResult getGrade(SchoolLabClassYearVo schoolLabClassYearVo) public AjaxResult getGrade(SchoolLabClassYearVo schoolLabClassYearVo)
{ //获取最新学年 { //获取最新学年
int schoolYear = gradeService.isNewSchoolYear(); int schoolYear = schoolGradeService.isNewSchoolYear();
return AjaxResult.success(schoolExperimentPlanService.getGrade(schoolYear,schoolLabClassYearVo.getUserId())); //获取学年分组信息
List<String> strings = schoolGradeService.selectSchoolYearGruoUp();
return AjaxResult.success(strings);
} }
/** /**
...@@ -218,6 +230,19 @@ public class ExperimentLevelController extends BaseController { ...@@ -218,6 +230,19 @@ public class ExperimentLevelController extends BaseController {
*/ */
@GetMapping("/getGrade/{userId}") @GetMapping("/getGrade/{userId}")
public AjaxResult getGrade(@PathVariable("userId") Long userId) { public AjaxResult getGrade(@PathVariable("userId") Long userId) {
return AjaxResult.success(schoolGradeService.getGradeId(userId)); Long gradeId =null;
SysUser sysUser = userService.selectUserById(userId);
String ancestors = sysUser.getDept().getAncestors();
if (ancestors.length()!=2){
String[] split = ancestors.split(",");
SysDept sysDept = deptService.selectDeptById(Long.valueOf(split[2]));
//根据级部名称去查询id
SchoolGrade schoolGrade = schoolGradeService.selectGradeByName(sysDept.getDeptName());
gradeId = schoolGrade.getId();
}else {
return AjaxResult.success("当前老师不在级部内");
}
return AjaxResult.success(gradeId);
} }
} }
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/leave/WxTeacherLeaveController.java
...@@ -30,6 +30,7 @@ import org.springframework.validation.annotation.Validated; ...@@ -30,6 +30,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.activiti.domain.HistoricActivity; import yangtz.cs.liu.activiti.domain.HistoricActivity;
import yangtz.cs.liu.activiti.service.IProcessService; import yangtz.cs.liu.activiti.service.IProcessService;
import yangtz.cs.liu.campus.controller.A;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade; import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
import yangtz.cs.liu.campus.domain.student.SchoolStudentLeave; import yangtz.cs.liu.campus.domain.student.SchoolStudentLeave;
import yangtz.cs.liu.campus.domain.teacher.SchoolTeacherLeave; import yangtz.cs.liu.campus.domain.teacher.SchoolTeacherLeave;
...@@ -174,8 +175,6 @@ public class WxTeacherLeaveController extends BaseController { ...@@ -174,8 +175,6 @@ public class WxTeacherLeaveController extends BaseController {
schoolTeacherLeave.setApplyUserId(schoolTeacherLeave.getTeacherId()); schoolTeacherLeave.setApplyUserId(schoolTeacherLeave.getTeacherId());
schoolTeacherLeave.setApplyUser(schoolTeacherLeave.getTeacherName()); schoolTeacherLeave.setApplyUser(schoolTeacherLeave.getTeacherName());
//获取当前用户是教工还是职工 //获取当前用户是教工还是职工
SysUser user = userService.selectUserById(schoolTeacherLeave.getTeacherId());
schoolTeacherLeave.setApplyType(user.getEmployeeType());
schoolTeacherLeaveService.judgeDate(schoolTeacherLeave); schoolTeacherLeaveService.judgeDate(schoolTeacherLeave);
return toAjax(schoolTeacherLeaveService.save(schoolTeacherLeave)); return toAjax(schoolTeacherLeaveService.save(schoolTeacherLeave));
} }
...@@ -189,8 +188,7 @@ public class WxTeacherLeaveController extends BaseController { ...@@ -189,8 +188,7 @@ public class WxTeacherLeaveController extends BaseController {
schoolTeacherLeave.setApplyUserId(schoolTeacherLeave.getTeacherId()); schoolTeacherLeave.setApplyUserId(schoolTeacherLeave.getTeacherId());
schoolTeacherLeave.setApplyUser(schoolTeacherLeave.getTeacherName()); schoolTeacherLeave.setApplyUser(schoolTeacherLeave.getTeacherName());
//获取当前用户是教工还是职工 //获取当前用户是教工还是职工
SysUser user = userService.selectUserById(schoolTeacherLeave.getTeacherId()); schoolTeacherLeave.setApplyType(schoolTeacherLeave.getApplyType());
schoolTeacherLeave.setApplyType(user.getEmployeeType());
schoolTeacherLeaveService.judgeDate(schoolTeacherLeave); schoolTeacherLeaveService.judgeDate(schoolTeacherLeave);
schoolTeacherLeaveService.save(schoolTeacherLeave); schoolTeacherLeaveService.save(schoolTeacherLeave);
AjaxResult ajax = submission(schoolTeacherLeave.getId()); AjaxResult ajax = submission(schoolTeacherLeave.getId());
...@@ -435,6 +433,112 @@ public class WxTeacherLeaveController extends BaseController { ...@@ -435,6 +433,112 @@ public class WxTeacherLeaveController extends BaseController {
//职工 //职工
return AjaxResult.success(deptService.selectDeptTreeList(new SysDept())); return AjaxResult.success(deptService.selectDeptTreeList(new SysDept()));
} }
/**
* 根据当前用户找到其所在的组织
*/
@GetMapping("/getUserDept/{userId}")
public AjaxResult getUserDept (@PathVariable("userId") Long userId){
List<Map<String, Object>> userDeptDate = new ArrayList<>();
//找到个人所在的所有部门
List<Map<String, Object>> maps = deptService.selectDeptGroupByUserId(userId);
//拼接所有上级部门
for (Map date :maps){
Long parentId =null;
Long deptId = null;
Map map = new HashMap<>();
StringBuffer sb = new StringBuffer();
Long deptIds = (Long)date.get("deptId");
String deptName = (String)date.get("deptName");
deptId = (Long)date.get("parentId");
sb.append(deptName);
Boolean flag = true;
// 查找上级
do {
//获取父级部门
SysDept sysDept = deptService.selectDeptById(deptId);
if (null != sysDept){
flag = true;
//往前拼接部门名称
sb.insert(0,sysDept.getDeptName()+"/");
deptId = sysDept.getParentId();
}else {
flag =false;
}
}while (flag);
//截取掉第一个部门
String deptNameGroup = sb.toString();
//部门
String substring = deptNameGroup.substring(deptNameGroup.indexOf("/") + 1);
map.put("deptName",substring);
map.put("deptId",deptIds);
userDeptDate.add(map);
}
return AjaxResult.success(userDeptDate);
}
/**
* 查找 当前部门级部主任
*/
@GetMapping("/getDeptGrapRole")
public AjaxResult getDeptGrapRole(SysDept dept){
String deptName =dept.getDeptName();
Long deptId = dept.getDeptId();
Map<String,String> map = new HashMap<>();
//判断当前部门
if (deptName.contains("级部")){
//教工
map.put("employeeType","0") ;
//查找当前的级部
String substring = deptName.substring(0, deptName.indexOf("/"));
SysDept sysDept = new SysDept();
sysDept.setDeptName(substring);
List<SysDept> sysDepts = deptService.selectDept(sysDept);
//级部信息
SysDept njgroup = sysDepts.get(0);
//查找当前级部的角色
List<String> strings = userService.selectDeptRoleBydeptId(njgroup.getDeptId().toString());
StringBuffer sb = new StringBuffer();
String substring1 ="";
for (String st :strings){
sb.append(st);
sb.append(",");
}
if (!StringUtils.isEmpty(sb.toString())){
substring1 = sb.substring(0, sb.length() - 1);
}
map.put("userName",substring1);
}else {
//职工
map.put("employeeType","1") ;
//从根部查找第三级 查找办公室主任
SysDept sysDept = new SysDept();
sysDept.setDeptId(deptId);
List<SysDept> sysDepts = deptService.selectDept(sysDept);
SysDept kesDate = sysDepts.get(0);
//获取父级信息
String ancestors = kesDate.getAncestors();
String[] split = ancestors.split(",");
//取到三级id
String daptParmId = split[2];
SysDept sysDept1 = deptService.selectDeptById(Long.valueOf(daptParmId));
//查找科室主任
List<String> strings = userService.selectDeptPlaceBydeptId(sysDept1.getDeptId().toString());
StringBuffer stringBuffer = new StringBuffer();
String substring ="";
for (String date : strings){
stringBuffer.append(date);
stringBuffer.append(",");
}
if (!StringUtils.isEmpty(stringBuffer.toString())){
String nameStr = stringBuffer.toString();
substring = nameStr.substring(0, nameStr.length() - 1);
}
map.put("userName",substring) ;
}
return AjaxResult.success(map);
}
/** /**
* 获取当前登录人所在部门或级部 * 获取当前登录人所在部门或级部
...@@ -478,12 +582,12 @@ public class WxTeacherLeaveController extends BaseController { ...@@ -478,12 +582,12 @@ public class WxTeacherLeaveController extends BaseController {
* 教工传参，请假开始日期（年月日）及第几节课，结束日期及第几节课 * 教工传参，请假开始日期（年月日）及第几节课，结束日期及第几节课
* 职工传参，请假开始时间，结束时间（年月日 时分秒） * 职工传参，请假开始时间，结束时间（年月日 时分秒）
*/ */
@GetMapping("/getTotalTime/{userId}") @GetMapping("/getTotalTime/{userId}/{employeeType}")
public AjaxResult getTotalTime(@PathVariable Long userId, SchoolTeacherLeave schoolTeacherLeave) { public AjaxResult getTotalTime(@PathVariable("userId") Long userId,@PathVariable("employeeType") String employeeTypes, SchoolTeacherLeave schoolTeacherLeave) {
AjaxResult ajax = AjaxResult.success(); AjaxResult ajax = AjaxResult.success();
double day = 0.0; double day = 0.0;
//判断用户是职工还是教工 //判断用户是职工还是教工
String employeeType = userService.selectUserById(userId).getEmployeeType(); String employeeType = employeeTypes;
schoolTeacherLeave.setApplyType(employeeType); schoolTeacherLeave.setApplyType(employeeType);
schoolTeacherLeaveService.judgeDate(schoolTeacherLeave); schoolTeacherLeaveService.judgeDate(schoolTeacherLeave);
//获取周末，节假日日期 //获取周末，节假日日期
......
smart-campus/src/main/resources/mapper/schoolClass/SchoolClassMapper.xml
...@@ -160,8 +160,13 @@ ...@@ -160,8 +160,13 @@
</select> </select>
<select id="selectDdClassId" resultType="java.lang.Long"> <select id="selectDdClassId" resultType="java.lang.Long">
select sg.id from school_class_copy sg select sg.id from school_class sg
where sg.del_flag = '0' and sg.dd_class_id=#{ddClssId} where sg.del_flag = '0' and sg.dd_class_id=#{ddClssId}
</select> </select>
<select id="selectTeacherByTeachId" resultType="yangtz.cs.liu.wechat.vo.schoolClass.SchoolClassVo">
select * from school_class
where del_flag = '0' and teacher_id = #{teachId}
</select>
</mapper> </mapper>
smart-campus/src/main/resources/mapper/schoolgrade/SchoolGradeMapper.xml
...@@ -50,6 +50,14 @@ ...@@ -50,6 +50,14 @@
select max(school_year) nowYear from school_grade where del_flag = '0' select max(school_year) nowYear from school_grade where del_flag = '0'
</select> </select>
<select id="selectGradeByName" resultType="yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade" >
select * from school_grade g where del_flag = '0' and g.grade_name = #{name}
</select>
<select id="selectNowSchoolGrade" resultType="yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade"> <select id="selectNowSchoolGrade" resultType="yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade">
<include refid="selectSchoolGradeVo"/> <include refid="selectSchoolGradeVo"/>
where school_year = (select max(school_year) from school_grade ) where school_year = (select max(school_year) from school_grade )
......
smart-campus/src/main/resources/mapper/teacher/SchoolTeacherMapper.xml
...@@ -286,6 +286,12 @@ ...@@ -286,6 +286,12 @@
where id_card = #{idCard} and del_flag = '0' where id_card = #{idCard} and del_flag = '0'
</select> </select>
<select id="selectTeacherByDdUerId" resultType="com.ruoyi.common.core.domain.entity.SchoolTeacher">
<include refid="selectSchoolTeacherVo"/>
where dd_user_id = #{dduserId} and del_flag = '0'
</select>
<select id="selectUserByTeacherName" resultType="com.ruoyi.common.core.domain.entity.SchoolTeacher"> <select id="selectUserByTeacherName" resultType="com.ruoyi.common.core.domain.entity.SchoolTeacher">
<include refid="selectSchoolTeacherVo"/> <include refid="selectSchoolTeacherVo"/>
where teacher_name = #{teacherName} and del_flag = '0' where teacher_name = #{teacherName} and del_flag = '0'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment