Skip to content

D
dd_school
Commit dd949e4d by baochunxin
Options

优化后端接口，提交家校通讯录更新

parent c7646baf
Showing with 406 additions and 17 deletions
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
......@@ -27,6 +27,7 @@ public interface ISysRoleService
* @return 角色列表
*/
public List<SysRole> selectRolesByUserId(Long userId);
public List<SysRole> selectRolesByUserIdDdApp(Long userId);
/**
* 根据用户ID查询角色权限
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
......@@ -83,6 +83,25 @@ public class SysRoleServiceImpl implements ISysRoleService
return roles;
}
public List<SysRole> selectRolesByUserIdDdApp(Long userId)
{
List<SysRole> userRoles = roleMapper.selectRolePermissionByUserId(userId);
List<SysRole> roles = roleMapper.selectRoleList(new SysRole());
for (SysRole role : roles)
{
for (SysRole userRole : userRoles)
{
if (role.getRoleId().longValue() == userRole.getRoleId().longValue())
{
role.setFlag(true);
break;
}
}
}
return roles;
}
/**
* 根据用户ID查询权限
*
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolClass/SchoolClassMapper.java
......@@ -43,6 +43,9 @@ public interface SchoolClassMapper extends BaseMapper<SchoolClass> {
* @return
*/
List<SchoolClassVo> getUserClassByTeacher(Long teacherId);
List<SchoolClassVo> selectSchoolClassSchoolYear(String schoolYear);
List<SchoolClassVo> getTeacherClass(@Param("teacherId") Long teacherId,
@Param("schoolYear") int schoolYear);
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolClass/SchoolClassImpl.java
......@@ -151,6 +151,12 @@ public class SchoolClassImpl extends ServiceImpl<SchoolClassMapper, SchoolClass>
return schoolClassMapper.getTeacherClass(teacherId,schoolYear);
}
@Override
public List<SchoolClassVo> selectSchoolClassSchoolYear(String schoolYear) {
return schoolClassMapper.selectSchoolClassSchoolYear(schoolYear);
}
@Override
public void checkImport(List<SchoolClassDrVo> list) {
//是否为空
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolLab/SchoolTeacherExperimentApplyServiceImpl.java
......@@ -20,6 +20,7 @@ import yangtz.cs.liu.campus.mapper.schoolLab.SchoolTeacherExperimentApplyMapper;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherExperimentApply;
import yangtz.cs.liu.campus.mapper.schoolLab.SchoollTeacherExperimentApplyLabsMapper;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolTeacherExperimentApplyService;
import yangtz.cs.liu.campus.service.schoolLab.ISchoollTeacherExperimentApplyLabsService;
import yangtz.cs.liu.campus.vo.schoolLab.SchoolTeacherExperimentApplyVo;
/**
......@@ -33,7 +34,8 @@ public class SchoolTeacherExperimentApplyServiceImpl extends ServiceImpl<SchoolT
{
@Autowired
private SchoolTeacherExperimentApplyMapper schoolTeacherExperimentApplyMapper;
@Autowired
private ISchoollTeacherExperimentApplyLabsService schoollTeacherExperimentApplyLabsService;
/**
* 查询教师个人实验申请
*
......@@ -43,7 +45,12 @@ public class SchoolTeacherExperimentApplyServiceImpl extends ServiceImpl<SchoolT
@Override
public SchoolTeacherExperimentApplyVo selectSchoolTeacherExperimentApplyById(Long id)
{
return schoolTeacherExperimentApplyMapper.selectSchoolTeacherExperimentApplyById(id);
SchoolTeacherExperimentApplyVo schoolTeacherExperimentApplyVo = schoolTeacherExperimentApplyMapper.selectSchoolTeacherExperimentApplyById(id);
LambdaQueryWrapper<SchoolTeacherExperimentApplyLabs> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SchoolTeacherExperimentApplyLabs::getTeacherExperimentApplyId,schoolTeacherExperimentApplyVo.getId());
List<SchoolTeacherExperimentApplyLabs> schoolTeacherExperimentApplyLabs = schoollTeacherExperimentApplyLabsService.list(wrapper);
schoolTeacherExperimentApplyVo.setSchoolTeacherExperimentApplyLabsList(schoolTeacherExperimentApplyLabs);
return schoolTeacherExperimentApplyVo;
}
/**
......@@ -55,7 +62,14 @@ public class SchoolTeacherExperimentApplyServiceImpl extends ServiceImpl<SchoolT
@Override
public List<SchoolTeacherExperimentApplyVo> selectSchoolTeacherExperimentApplyList(SchoolTeacherExperimentApplyVo schoolTeacherExperimentApplyVo)
{
return schoolTeacherExperimentApplyMapper.selectSchoolTeacherExperimentApplyList(schoolTeacherExperimentApplyVo);
List<SchoolTeacherExperimentApplyVo> schoolTeacherExperimentApplyVos = schoolTeacherExperimentApplyMapper.selectSchoolTeacherExperimentApplyList(schoolTeacherExperimentApplyVo);
for ( SchoolTeacherExperimentApplyVo date : schoolTeacherExperimentApplyVos){
LambdaQueryWrapper<SchoolTeacherExperimentApplyLabs> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SchoolTeacherExperimentApplyLabs::getTeacherExperimentApplyId,date.getId());
List<SchoolTeacherExperimentApplyLabs> schoolTeacherExperimentApplyLabs = schoollTeacherExperimentApplyLabsService.list(wrapper);
date.setSchoolTeacherExperimentApplyLabsList(schoolTeacherExperimentApplyLabs);
}
return schoolTeacherExperimentApplyVos;
}
@Override
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolClass/ISchoolClassService.java
......@@ -39,6 +39,9 @@ public interface ISchoolClassService extends IService<SchoolClass> {
List<SchoolClassVo> getTeacherClass(Long teacherId);
List<SchoolClassVo> selectSchoolClassSchoolYear(String schoolYear);
// /**
// * 校验
// * @param list
......
smart-campus/src/main/java/yangtz/cs/liu/dingding/controller/DdAppLoginController.java
......@@ -78,7 +78,6 @@ public class DdAppLoginController {
OapiUserGetuserinfoResponse response;
try {
response = client.execute(request, access_token);
System.out.println("-------------"+request);
} catch (ApiException e) {
// TODO Auto-generated catch block
e.printStackTrace();
......
smart-campus/src/main/java/yangtz/cs/liu/dingding/controller/DingJiaXiaoController.java
......@@ -6,15 +6,41 @@ import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.core.domain.entity.SchoolTeacher;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.service.ISysUserService;
import org.apache.regexp.RE;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import yangtz.cs.liu.campus.controller.schoolClass.SchoolClassController;
import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass;
import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassHeadmaster;
import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassMentor;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
import yangtz.cs.liu.campus.domain.student.SchoolStudent;
import yangtz.cs.liu.campus.domain.student.SchoolStudentClassRelation;
import yangtz.cs.liu.campus.domain.student.SchoolStudentClasses;
import yangtz.cs.liu.campus.domain.student.SchoolStudentParent;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassHeadmasterService;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassMentorService;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeService;
import yangtz.cs.liu.campus.service.student.ISchoolStudentClassRelationService;
import yangtz.cs.liu.campus.service.student.ISchoolStudentClassesService;
import yangtz.cs.liu.campus.service.student.ISchoolStudentParentService;
import yangtz.cs.liu.campus.service.student.ISchoolStudentService;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService;
import yangtz.cs.liu.dingding.utils.AccessTokenUtils;
import yangtz.cs.liu.dingding.vo.DingJiaXiaoVo;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 家校通讯录
......@@ -30,6 +56,40 @@ public class DingJiaXiaoController {
final String userUrl ="https://oapi.dingtalk.com/topapi/edu/user/list?access_token=";
//年级表
@Autowired
ISchoolGradeService schoolGradeService;
//职工与年级关系
@Autowired
ISchoolGradeMentorService schoolGradeMentorService;
//学校班级
@Autowired
ISchoolClassService iSchoolClassService;
//班主任和班级关系
@Autowired
ISchoolClassHeadmasterService iSchoolClassHeadmasterService;
//任课老师和班级关系
@Autowired
ISchoolClassMentorService schoolClassMentorService;
//学生表
@Autowired
ISchoolStudentService schoolStudentService;
//学生与班级关系
@Autowired
ISchoolStudentClassRelationService iSchoolStudentClassRelationService;
//学生历史班级表
@Autowired
ISchoolStudentClassesService schoolStudentClassesService;
//家长信息表
@Autowired
ISchoolStudentParentService iSchoolStudentParentService;
//老师表
@Autowired
ISchoolTeacherService schoolTeacherService;
//用户表
@Autowired
ISysUserService sysUserService;
public List<String> userTypes = new ArrayList<String>(){
{
this.add("teacher");
......@@ -122,17 +182,11 @@ public class DingJiaXiaoController {
DingJiaXiaoVo.ClassInfo classInfo = new DingJiaXiaoVo().new ClassInfo();
classInfo.setClassId((Integer) classDate.get("dept_id"));
classInfo.setClassName((String) classDate.get("name"));
/**
* 学生信息
*/
//学生信息
List<DingJiaXiaoVo.StudentUserInfo> studentUserInfos = new ArrayList<>();
/**
* 老师信息
*/
//老师信息
List<DingJiaXiaoVo.StudentUserInfo> teacherUserInfos = new ArrayList<>();
/**
* 监护人信息
*/
//监护人信息*
List<DingJiaXiaoVo.StudentUserInfo> guardianUserInfos = new ArrayList<>();
//分页查询，每次查询数据最大只有30条，分5次查询 一个班判断最大150人
......@@ -158,7 +212,6 @@ public class DingJiaXiaoController {
}
dingJiaXiaoVo.setClassInfoList(classInfoList);
njInfoList.add(dingJiaXiaoVo);
}
}
return njInfoList;
......@@ -179,7 +232,7 @@ public class DingJiaXiaoController {
String ryPost = HttpUtil.post(userUrl+token, ryParme);
JSONObject ryObject = JSONObject.parseObject(ryPost);
if ((Integer) ryObject.get("errcode") != 0){
throw new RuntimeException("获取班级人员列表失败");
throw new RuntimeException("获取班级人员列表失败"+ryObject.toString());
}
JSONObject ryResult = (JSONObject)ryObject.get("result");
JSONArray xyDetailsArray = JSONArray.of(ryResult.get("details"));
......@@ -194,7 +247,9 @@ public class DingJiaXiaoController {
studentUserInfo.setUnionid(userInfo.get("unionid")==null?null:userInfo.get("unionid").toString());
studentUserInfo.setName(userInfo.get("name").toString());
studentUserInfo.setIsAdviser(userInfo.getJSONObject("feature").get("is_adviser") ==null ? null:userInfo.getJSONObject("feature").get("is_adviser").toString());
studentUserInfo.setStudentNo(userInfo.get("student_no")==null?null:userInfo.get("student_no").toString());
studentUserInfo.setStudentNo(userInfo.getJSONObject("feature").get("student_no") ==null ? null:userInfo.getJSONObject("feature").get("student_no").toString());
String tel = this.getTel(studentUserInfo.getUserId(), token);
studentUserInfo.setMobile(tel);
userList.add(studentUserInfo);
}
}
......@@ -203,4 +258,239 @@ public class DingJiaXiaoController {
}
/**
* 钉钉数据同步到数据，
* //班级、级部 、学生、家长、老师、班级关系、
*/
@GetMapping("/updateJiaXiaoTX")
public void updateJiaXiaoTX(){
//获取钉钉数据
List<DingJiaXiaoVo> list = this.getList();
//循环更新
for (DingJiaXiaoVo njDate : list){
//更新年级
String gradeName = njDate.getGradeName();
Integer gradeId = njDate.getGradeId();
SchoolGrade schoolGrade = new SchoolGrade();
schoolGrade.setGradeName(gradeName.substring(gradeName.length()- 5)+"部");
schoolGrade.setGradeValue(this.gradeSubt(gradeName.substring(3)));
schoolGrade.setGradeYear(gradeName.substring(gradeName.length()- 5,4));
schoolGrade.setSchoolYear(gradeName.substring(gradeName.length()- 5,4));
schoolGrade.setRemark(gradeName);
schoolGrade.setId(Long.valueOf(gradeId));
schoolGradeService.save(schoolGrade);
//获取班级
List<DingJiaXiaoVo.ClassInfo> classInfoList = njDate.getClassInfoList();
//遍历班级
for (DingJiaXiaoVo.ClassInfo classDate : classInfoList){
String teacherName =null;
Integer classId = classDate.getClassId();
String className = classDate.getClassName();
Map<String,String> fromUserId = this.getFromUserId(Long.valueOf(classId), accessTokenUtils.getToken());
SchoolClass schoolClass = new SchoolClass();
schoolClass.setSchoolYear(Integer.valueOf(schoolGrade.getSchoolYear()));
schoolClass.setClassType("4");
schoolClass.setGradeValue(Integer.valueOf(schoolGrade.getGradeYear()));
schoolClass.setGradeName(schoolGrade.getGradeName());
schoolClass.setId(Long.valueOf(classId));
schoolClass.setClassName(className);
schoolClass.setClassValue(Integer.valueOf(className.substring(className.length()-2,1)));
schoolClass.setClassAlias(className);
schoolClass.setGradeId(schoolGrade.getId());
schoolClass.setGradeId(schoolGrade.getId());
//班级
iSchoolClassService.save(schoolClass);
//老师
List<DingJiaXiaoVo.StudentUserInfo> teacherUserInfos = classDate.getTeacherUserInfos();
for (DingJiaXiaoVo.StudentUserInfo date : teacherUserInfos){
SysUser sysUser = new SysUser();
sysUser.setUserId(Long.valueOf(date.getUserId()));
// sysUser.setDept(); 部门没有
sysUser.setLoginName(date.getName());
sysUser.setUserName(date.getName());
sysUser.setUserType("01");
sysUser.setUserLoginType("0");
sysUser.setPhonenumber(date.getMobile());
sysUser.setPassword(SecurityUtils.encryptPassword("123456"));
sysUser.setStatus("0");
sysUser.setDelFlag("0");
sysUser.setUnionId(date.getUnionid());
sysUser.setRoleIds(new Long[]{111L});
//用户表
sysUserService.insertUser(sysUser);
SchoolTeacher schoolTeacher = new SchoolTeacher();
schoolTeacher.setTeacherName(date.getName());
// schoolTeacher.setSex(); 性别没有
schoolTeacher.setNation("汉族");
// schoolTeacher.setTeacherCode(); 工作编号
schoolTeacher.setUserId(sysUser.getUserId());
schoolTeacher.setTeacherTel(date.getMobile());
schoolTeacher.setUnionId(date.getUnionid());
// schoolTeacher.setDeptId(); schoolTeacher.setDeptName(); 部门没有
//老师表
schoolTeacherService.save(schoolTeacher);
//老师与班级关系表 缺少课程信息
// SchoolClassMentor schoolClassMentor = new SchoolClassMentor();
// schoolClassMentor.setTeacherId(schoolTeacher.getId());
// schoolClassMentorService.save(schoolClassMentor);
if (date.getIsAdviser().equals("1")){
schoolClass.setTeacherId(schoolTeacher.getId());
schoolClass.setTeacherName(date.getName());
schoolClass.setTeacherTel(date.getMobile());
teacherName = date.getName();
SchoolClassHeadmaster schoolClassHeadmaster = new SchoolClassHeadmaster();
schoolClassHeadmaster.setTeacherId(schoolTeacher.getId());
schoolClassHeadmaster.setClassId(Long.valueOf(classId));
//班主任和班级关系
iSchoolClassHeadmasterService.save(schoolClassHeadmaster);
}
}
//学生
List<DingJiaXiaoVo.StudentUserInfo> studentUserInfos = classDate.getStudentUserInfos();
for (DingJiaXiaoVo.StudentUserInfo date : studentUserInfos){
//学生表
SchoolStudent schoolStudent = new SchoolStudent();
schoolStudent.setStudentName(date.getName());
// schoolStudent.setSex();
schoolStudent.setClassId(Long.valueOf(classId));
// schoolStudent.setIdCard(); 身份证号
schoolStudent.setNation("汉族");
schoolStudent.setNationalNumber(date.getStudentNo());
schoolStudent.setEnrollmentYear(gradeName.substring(gradeName.length()- 5,4));
schoolStudent.setStudentStatus("1");
schoolStudent.setId(Long.valueOf(date.getUserId()));
schoolStudentService.save(schoolStudent);
//学生与班级关系
SchoolStudentClassRelation schoolStudentClassRelation = new SchoolStudentClassRelation();
schoolStudentClassRelation.setClassId(Long.valueOf(classId));
schoolStudentClassRelation.setStudentId(schoolStudent.getId());
iSchoolStudentClassRelationService.save(schoolStudentClassRelation);
//学生历史班级表
SchoolStudentClasses schoolStudentClasses = new SchoolStudentClasses();
schoolStudentClasses.setTeacherName(teacherName);
schoolStudentClasses.setStudentId(schoolStudent.getId());
schoolStudentClasses.setGrade(gradeName.substring(gradeName.length()- 5,4));
schoolStudentClasses.setClasses(className);
schoolStudentClassesService.save(schoolStudentClasses);
}
//监护人
List<DingJiaXiaoVo.StudentUserInfo> guardianUserInfos = classDate.getGuardianUserInfos();
for (DingJiaXiaoVo.StudentUserInfo date : guardianUserInfos){
String studentId = fromUserId.get(date.getUserId());
//创建家长用户
SysUser jUser = new SysUser();
jUser.setUserId(Long.valueOf(date.getUserId()));
// sysUser.setDept(); 部门没有
jUser.setLoginName(date.getName());
jUser.setUserName(date.getName());
jUser.setUserType("01");
jUser.setUserLoginType("1");
jUser.setPhonenumber(date.getMobile());
jUser.setPassword(SecurityUtils.encryptPassword("123456"));
jUser.setStatus("0");
jUser.setDelFlag("0");
jUser.setUnionId(date.getUnionid());
jUser.setRoleIds(new Long[]{111L});
jUser.setStudentId(Long.valueOf(studentId));
sysUserService.insertUser(jUser);
//维护家长表
SchoolStudentParent schoolStudentParent = new SchoolStudentParent();
schoolStudentParent.setStudentId(Long.valueOf(studentId));
schoolStudentParent.setUserId(jUser.getUserId());
schoolStudentParent.setParentName(date.getName());
schoolStudentParent.setTelephone(date.getMobile());
Integer patriarch = this.getPatriarch(date.getName().substring(date.getName().length() - 2));
schoolStudentParent.setRelationship(patriarch.toString());
iSchoolStudentParentService.save(schoolStudentParent);
}
iSchoolClassService.updateById(schoolClass);
}
}
}
private Integer gradeSubt(String grade){
Integer gId = null;
switch (grade){
case "六年级": return gId = 6;
case "七年级": return gId = 7;
case "八年级": return gId = 8;
case "九年级": return gId = 9;
case "一年级": return gId = 1;
case "二年级": return gId = 2;
case "三年级": return gId = 3;
case "四年级": return gId = 4;
case "五年级": return gId = 5;
}
return gId;
}
private Integer getPatriarch(String patriarch){
Integer gId = null;
switch (patriarch){
case "爸爸": return gId = 0;
case "妈妈": return gId = 1;
case "爷爷": return gId = 2;
case "奶奶": return gId = 3;
case "叔叔": return gId = 4;
case "姑姑": return gId = 5;
case "外婆": return gId = 6;
case "外公": return gId = 7;
case "哥哥": return gId = 8;
case "姐姐": return gId = 9;
case "阿姨": return gId = 10;
case "家长": return gId = 11;
}
return gId;
}
/**
* 调用钉钉公共接口，获取用户手机号
*/
public String getTel(String userId ,String assToKen){
JSONObject userParme = new JSONObject();
userParme.put("userid",userId);
String userPost = HttpUtil.post("https://oapi.dingtalk.com/topapi/v2/user/get?access_token="+assToKen, userParme);
JSONObject jsonObject = JSONObject.parseObject(userPost);
if (jsonObject.getJSONObject("result").get("mobile")==null){
return null;
}else {
return jsonObject.getJSONObject("result").get("mobile").toString();
}
}
/**
* 获取班级 家 学关系
*/
public Map<String,String> getFromUserId(Long classId ,String assToKen){
Map<String,String> map = new HashMap();
JSONObject userParme = new JSONObject();
userParme.put("class_id",classId);
String userPost = HttpUtil.post("https://oapi.dingtalk.com/topapi/edu/user/relation/list?access_token="+assToKen, userParme);
JSONObject jsonObject = JSONObject.parseObject(userPost);
JSONArray jsonArray = jsonObject.getJSONObject("result").getJSONArray("relations");
for (int i =0 ; i< jsonArray.size(); i++ ){
JSONObject jsonDate= jsonArray.getJSONObject(i);
String fromUserid = jsonDate.get("from_userid").toString();
String toUserid = jsonDate.get("to_userid").toString();
map.put(fromUserid,toUserid);
}
return map;
}
}
smart-campus/src/main/java/yangtz/cs/liu/dingding/vo/DingJiaXiaoVo.java
......@@ -97,6 +97,11 @@ public class DingJiaXiaoVo {
*/
String studentNo;
/**
* 手机号
*/
String mobile;
}
......
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/experiment/TeacherExperimentController.java
......@@ -3,14 +3,19 @@ package yangtz.cs.liu.wechat.controller.experiment;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.MpLoginUser;
import com.ruoyi.framework.util.UserInfoUtil;
import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolLabClassYear;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherExperimentApply;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherLabApply;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolLabClassYearService;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolTeacherExperimentApplyService;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolTeacherLabApplyService;
......@@ -38,6 +43,10 @@ public class TeacherExperimentController extends BaseController {
@Autowired
ISchoolLabClassYearService schoolLabClassYearService;
//学校班级
@Autowired
ISchoolClassService iSchoolClassService;
/**
* 个人申请记录
*/
......@@ -89,6 +98,11 @@ public class TeacherExperimentController extends BaseController {
@Autowired
ISysUserService userService;
@Autowired
ISysRoleService roleService;
@Autowired
ISysDictDataService dictDataService;
/**
* 获取班级
*/
......@@ -139,6 +153,28 @@ public class TeacherExperimentController extends BaseController {
}
/**
* 获取当前登录角色学科
*/
@GetMapping("/getSubject")
public AjaxResult getSubject(){
Long userId = userInfoUtil.getMpLoginUser().getUserId();
List<SysRole> sysRoles = roleService.selectRolesByUserIdDdApp(userId);
for (SysRole role : sysRoles) {
if (role.getRoleKey().equals("phy_lab_admin")){
return AjaxResult.success(dictDataService.selectDictLabel("lab_sub","1"));
}else if (role.getRoleKey().equals("che_lab_admin")){
return AjaxResult.success(dictDataService.selectDictLabel("lab_sub","2"));
}else if (role.getRoleKey().equals("bio_lab_admin")){
return AjaxResult.success(dictDataService.selectDictLabel("lab_sub","3"));
}
}
return AjaxResult.success("当前用户未分配学科角色");
}
/**
*新增申请
*/
@PostMapping("/apply/add")
......@@ -170,7 +206,7 @@ public class TeacherExperimentController extends BaseController {
/**
* 删除教师个人实验申请
*/
@PostMapping("/apply/{ids}")
@DeleteMapping("/apply/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(schoolTeacherExperimentApplyService.deleteSchoolTeacherExperimentApplyByIds(ids));
......
smart-campus/src/main/resources/mapper/schoolClass/SchoolClassMapper.xml
......@@ -38,6 +38,16 @@
order by g.grade_value, g.class_value
</select>
<select id="selectSchoolClassSchoolYear" resultMap="SchoolClassResult">
select g.grade_value, g.grade_name, g.class_value, g.class_name, g.school_year, g.id
from school_class g
where g.del_flag = '0'
and g.school_year = #{schoolYear}
order by g.grade_value, g.class_value
</select>
<select id="getUserClassByParent" resultType="SchoolClass">
SELECT sg.pic_url,
sg.class_value,
......
smart-campus/src/main/resources/mapper/schoolLab/SchoolTeacherLabApplyMapper.xml
......@@ -70,6 +70,9 @@
<if test="applyName != null and applyName != ''"> and tla.apply_name like concat('%', #{applyName}, '%')</if>
<if test="applyTime != null "> and tla.apply_time = #{applyTime}</if>
<if test="state != null "> and tla.state = #{state}</if>
<if test="querText != null ">
and concat(tla.experiment_name,tla.grade) like concat('%', #{querText}, '%')
</if>
<if test="subs != null ">
and tla.sub in
<foreach item="sub" collection="subs" open="(" separator="," close=")">
......
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