Skip to content

J
jgjy
提交 e5dff0e6 authored 作者: zhouzhigang's avatar zhouzhigang
浏览文件
操作

--no commit message

上级 6c426875
隐藏空白字符变更
内嵌 并排
正在显示 包含 368 行增加 和 19 行删除
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/controller/basicteachingplan/FgBasicTeachingPlanController.java
浏览文件 @ e5dff0e6
......@@ -31,6 +31,7 @@ import com.zrqx.core.util.page.PageParam;
import com.zrqx.core.util.response.CallBack;
import com.zrqx.core.vo.member.fg.basicteachingplan.FgBasicTeachingPlanExcelVo;
import com.zrqx.core.vo.member.fg.basicteachingplan.FgBasicTeachingPlanVo;
import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo;
import com.zrqx.core.vo.schoolsysuser.fg.basicteachingplan.BasicPlanErrVo;
import io.swagger.annotations.Api;
......@@ -100,6 +101,19 @@ public class FgBasicTeachingPlanController {
}
@ApiOperation(value = "部门列表（筛选）", notes = "部门列表（筛选）")
@GetMapping(value = MemberRequestPath.DEPARTMENT + MemberRequestPath.LIST)
public CallBack<List<IdAndNameVo>> listdpt(QueryAcademicLevelForm form) {
return CallBack.success(fgBasicTeachingPlanService.listdpt(form));
}
@ApiOperation(value = "专业列表（筛选）", notes = "专业列表（筛选）")
@GetMapping(value = MemberRequestPath.MAJOR + MemberRequestPath.LIST)
public CallBack<List<IdAndNameVo>> listMajor(QueryAcademicLevelForm form) {
return CallBack.success(fgBasicTeachingPlanService.listMajor(form));
}
@ApiOperation(value = "查询上一次保存信息",notes = "查询上一次保存信息")
@GetMapping(value = MemberRequestPath.GET)
public CallBack<BasicTeachingPlan> get(){
......
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/controller/classmanagement/FgClassManagementController.java
浏览文件 @ e5dff0e6
......@@ -30,6 +30,7 @@ import com.zrqx.core.util.excelutil.ExcelUtil;
import com.zrqx.core.util.page.PageInfo;
import com.zrqx.core.util.page.PageParam;
import com.zrqx.core.util.response.CallBack;
import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo;
import com.zrqx.core.vo.schoolsysuser.fg.classmanagement.ClassManagementVo;
import com.zrqx.core.vo.schoolsysuser.fg.classmanagement.ClassmanagementErrVo;
import com.zrqx.core.vo.schoolsysuser.fg.classmanagement.ExcelClassManagementVo;
......@@ -127,5 +128,18 @@ public class FgClassManagementController {
// 获取系统中存在的学级并去重
return CallBack.success(fgClassManagementService.listAcademicLevel(form));
}
@ApiOperation(value = "部门列表（筛选）", notes = "部门列表（筛选）")
@GetMapping(value = MemberRequestPath.DEPARTMENT + MemberRequestPath.LIST)
public CallBack<List<IdAndNameVo>> listdpt(QueryAcademicLevelForm form) {
return CallBack.success(fgClassManagementService.listDpt(form));
}
@ApiOperation(value = "专业列表（筛选）", notes = "专业列表（筛选）")
@GetMapping(value = MemberRequestPath.MAJOR + MemberRequestPath.LIST)
public CallBack<List<IdAndNameVo>> listMajor(QueryAcademicLevelForm form) {
return CallBack.success(fgClassManagementService.listMajor(form));
}
}
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/controller/student/FgStudentController.java
浏览文件 @ e5dff0e6
......@@ -15,13 +15,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import com.zrqx.core.commons.redis.FgRedisManage;
import com.zrqx.core.constant.member.MemberRequestPath;
import com.zrqx.core.enums.ResponseCodeEnum;
import com.zrqx.core.enums.member.member.MemberSexEnum;
import com.zrqx.core.exception.BaseException;
import com.zrqx.core.exception.BusinessValidateException;
import com.zrqx.core.form.member.fg.basicteachingplan.QueryAcademicLevelForm;
import com.zrqx.core.form.school.sysuser.fg.student.QueryStudentForm;
import com.zrqx.core.model.member.student.Student;
......@@ -31,6 +29,7 @@ import com.zrqx.core.util.excelutil.ExcelUtil;
import com.zrqx.core.util.page.PageInfo;
import com.zrqx.core.util.page.PageParam;
import com.zrqx.core.util.response.CallBack;
import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo;
import com.zrqx.core.vo.schoolsysuser.fg.student.ExcelStudentVo;
import com.zrqx.core.vo.schoolsysuser.fg.student.FgSteudentVo;
import com.zrqx.core.vo.schoolsysuser.fg.student.StudentVo;
......@@ -143,7 +142,17 @@ public class FgStudentController {
}
@ApiOperation(value = "部门列表（筛选）", notes = "部门列表（筛选）")
@GetMapping(value = MemberRequestPath.DEPARTMENT + MemberRequestPath.LIST)
public CallBack<List<IdAndNameVo>> listdpt(QueryAcademicLevelForm form) {
return CallBack.success(fgStudentService.listDpt(form));
}
@ApiOperation(value = "专业列表（筛选）", notes = "专业列表（筛选）")
@GetMapping(value = MemberRequestPath.MAJOR + MemberRequestPath.LIST)
public CallBack<List<IdAndNameVo>> listMajor(QueryAcademicLevelForm form) {
return CallBack.success(fgStudentService.listMajor(form));
}
}
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/manage/studentorder/StudentOrderManageImpl.java
浏览文件 @ e5dff0e6
......@@ -2,6 +2,8 @@ package com.zrqx.school.sysuser.manage.studentorder;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
......@@ -17,6 +19,8 @@ import com.zrqx.school.sysuser.mapper.studentorder.StudentOrderMapper;
@Component
public class StudentOrderManageImpl extends BaseManageImpl<StudentOrder,Integer> implements StudentOrderManage{
Logger logger = LoggerFactory.getLogger(StudentOrderManageImpl.class);
@Autowired
private StudentOrderMapper studentOrderMapper;
@Autowired
......@@ -47,7 +51,13 @@ public class StudentOrderManageImpl extends BaseManageImpl<StudentOrder,Integer>
StudentOrder stuOrder = new StudentOrder();
stuOrder.setIsNot(BooleanStatusEnum.YES.getCode());
stuOrder.setStudentId(id);
StudentOrder order = studentOrderMapper.selectOne(stuOrder);
StudentOrder order = null;
try{
order = studentOrderMapper.selectOne(stuOrder);
}catch(Exception e){
logger.error("StudentOrderManageImpl ## StudentOrder" + e.getMessage());
}
return order;
}
......
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/mapper/basicteachingplan/FgBasicTeachingPlanMapper.java
浏览文件 @ e5dff0e6
......@@ -13,6 +13,7 @@ import com.zrqx.core.form.member.fg.basicteachingplan.QueryAcademicLevelForm;
import com.zrqx.core.mapper.BaseMapper;
import com.zrqx.core.model.member.basicteachingplan.BasicTeachingPlan;
import com.zrqx.core.vo.member.fg.basicteachingplan.FgBasicTeachingPlanVo;
import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo;
import com.zrqx.core.vo.schoolsysuser.fg.publicbasicrelation.FgPublicBasicRelationVo;
@Mapper
......@@ -60,6 +61,54 @@ public interface FgBasicTeachingPlanMapper extends BaseMapper<BasicTeachingPlan>
+ " </script> ")
List<Integer> listAcademicLevel(@Param("query") QueryAcademicLevelForm form);
/**
* 部门筛选列表
* @param form
* @return
* @auther zzg
* @data 2019年9月3日 上午10:53:47
*/
@Select(" <script> "
+ " SELECT s.departmentId as id "
+ " FROM me_basic_teaching_plan s WHERE 1=1 "
+ " <if test = ' query.relationId != null '> "
+ " and s.relationId = #{query.relationId} "
+ " </if> "
+ " <if test = '" + NOTBLANK + "(query.type)'> "
+ " and s.type = #{query.type} "
+ " </if> "
+ " group by s.departmentId "
+ " </script> ")
List<IdAndNameVo> listDpt(@Param("query") QueryAcademicLevelForm form);
/**
* 专业筛选列表
* @param form
* @return
* @auther zzg
* @data 2019年9月3日 上午10:54:11
*/
@Select(" <script> "
+ " SELECT s.majorId as id "
+ " FROM me_basic_teaching_plan s WHERE 1=1 "
+ " <if test = ' query.relationId != null '> "
+ " and s.relationId = #{query.relationId} "
+ " </if> "
+ " <if test = '" + NOTBLANK + "(query.type)'> "
+ " and s.type = #{query.type} "
+ " </if> "
+ " <if test = ' query.departmentId != null '> "
+ " and s.departmentId = #{query.departmentId} "
+ " </if> "
+ " group by s.majorId "
+ " </script> ")
List<IdAndNameVo> listMajor(@Param("query") QueryAcademicLevelForm form);
@Select(" <script> "
+ " select p.*,p.id as lessonId, t.majorId from me_public_lessons p "
......
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/mapper/classmanagement/FgClassManagementMapper.java
浏览文件 @ e5dff0e6
......@@ -11,6 +11,7 @@ import com.zrqx.core.form.member.fg.basicteachingplan.QueryAcademicLevelForm;
import com.zrqx.core.form.school.sysuser.fg.classmanagement.QueryClassManagementForm;
import com.zrqx.core.mapper.BaseMapper;
import com.zrqx.core.model.member.classmanagement.ClassManagement;
import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo;
import com.zrqx.core.vo.schoolsysuser.fg.classmanagement.ClassManagementVo;
@Mapper
......@@ -81,5 +82,54 @@ public interface FgClassManagementMapper extends BaseMapper<ClassManagement>{
+ " </script> ")
List<Integer> listAcademicLevel(@Param("query") QueryAcademicLevelForm form);
/**
* 部门列表（筛选）
* @param form
* @return
* @auther zzg
* @data 2019年9月3日 上午11:06:11
*/
@Select(" <script> "
+ " SELECT s.departmentId as id "
+ " FROM me_class_mamagement s WHERE 1=1 "
+ " <if test = ' query.relationId != null '> "
+ " and s.relationId = #{query.relationId} "
+ " </if> "
+ " <if test = '" + NOTBLANK + "(query.type)'> "
+ " and s.type = #{query.type} "
+ " </if> "
+ " group by s.departmentId "
+ " </script> ")
List<IdAndNameVo> listDpt(@Param("query") QueryAcademicLevelForm form);
/**
* 专业列表（筛选）
* @param form
* @return
* @auther zzg
* @data 2019年9月3日 上午11:07:13
*/
@Select(" <script> "
+ " SELECT s.majorId as id "
+ " FROM me_class_mamagement s WHERE 1=1 "
+ " <if test = ' query.relationId != null '> "
+ " and s.relationId = #{query.relationId} "
+ " </if> "
+ " <if test = '" + NOTBLANK + "(query.type)'> "
+ " and s.type = #{query.type} "
+ " </if> "
+ " <if test = ' query.departmentId != null '> "
+ " and s.departmentId = #{query.departmentId} "
+ " </if> "
+ " group by s.majorId "
+ " </script> ")
List<IdAndNameVo> listMajor(@Param("query") QueryAcademicLevelForm form);
}
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/mapper/student/FgStudentMapper.java
浏览文件 @ e5dff0e6
......@@ -12,6 +12,7 @@ import com.zrqx.core.form.school.sysuser.fg.payset.QueryPayRecordForm;
import com.zrqx.core.form.school.sysuser.fg.student.QueryStudentForm;
import com.zrqx.core.mapper.BaseMapper;
import com.zrqx.core.model.member.student.Student;
import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo;
import com.zrqx.core.vo.schoolsysuser.fg.student.FgSteudentVo;
import com.zrqx.core.vo.schoolsysuser.fg.student.StudentVo;
import com.zrqx.core.vo.schoolsysuser.fg.studentorder.StudentOrderVo;
......@@ -86,6 +87,55 @@ public interface FgStudentMapper extends BaseMapper<Student>{
+ " </script> ")
List<Integer> listAcademicLevel(@Param("query") QueryAcademicLevelForm form);
/**
* 部门列表（筛选）
* @param form
* @return
* @auther zzg
* @data 2019年9月3日 上午11:18:29
*/
@Select(" <script> "
+ " SELECT s.departmentId as id "
+ " FROM me_student s WHERE 1=1 "
+ " <if test = ' query.relationId != null '> "
+ " and s.relationId = #{query.relationId} "
+ " </if> "
+ " <if test = '" + NOTBLANK + "(query.type)'> "
+ " and s.type = #{query.type} "
+ " </if> "
+ " group by s.departmentId "
+ " </script> ")
List<IdAndNameVo> listDpt(@Param("query") QueryAcademicLevelForm form);
/**
* 专业列表（筛选）
* @param form
* @return
* @auther zzg
* @data 2019年9月3日 上午11:18:29
*/
@Select(" <script> "
+ " SELECT s.majorId as id "
+ " FROM me_student s WHERE 1=1 "
+ " <if test = ' query.relationId != null '> "
+ " and s.relationId = #{query.relationId} "
+ " </if> "
+ " <if test = '" + NOTBLANK + "(query.type)'> "
+ " and s.type = #{query.type} "
+ " </if> "
+ " group by s.departmentId "
+ " </script> ")
List<IdAndNameVo> listMajor(@Param("query") QueryAcademicLevelForm form);
......
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/basicteachingplan/FgBasicTeachingPlanService.java
浏览文件 @ e5dff0e6
......@@ -11,6 +11,7 @@ import com.zrqx.core.service.BaseService;
import com.zrqx.core.util.page.PageInfo;
import com.zrqx.core.util.page.PageParam;
import com.zrqx.core.vo.member.fg.basicteachingplan.FgBasicTeachingPlanVo;
import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo;
import com.zrqx.core.vo.schoolsysuser.fg.basicteachingplan.ExportPlanErrVo;
public interface FgBasicTeachingPlanService extends BaseService<BasicTeachingPlan,Integer>{
......@@ -79,5 +80,23 @@ public interface FgBasicTeachingPlanService extends BaseService<BasicTeachingPla
* @date: 2019年7月29日 上午10:01:28
*/
ExportPlanErrVo importPlan(MultipartFile file) throws Exception;
/**
* 部门列表（筛选）
* @param form
* @return
* @auther zzg
* @data 2019年9月3日 上午10:46:07
*/
List<IdAndNameVo> listdpt(QueryAcademicLevelForm form);
/**
* 专业列表（筛选）
* @param form
* @return
* @auther zzg
* @data 2019年9月3日 上午10:46:07
*/
List<IdAndNameVo> listMajor(QueryAcademicLevelForm form);
}
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/basicteachingplan/FgBasicTeachingPlanServiceImpl.java
浏览文件 @ e5dff0e6
......@@ -26,10 +26,14 @@ import com.zrqx.core.util.bean.BeanUtils;
import com.zrqx.core.util.excelutil.ExcelUtil;
import com.zrqx.core.util.page.PageInfo;
import com.zrqx.core.util.page.PageParam;
import com.zrqx.core.util.response.CallBack;
import com.zrqx.core.vo.member.department.DepartmentMemberVo;
import com.zrqx.core.vo.member.fg.basicteachingplan.FgBasicTeachingPlanVo;
import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo;
import com.zrqx.core.vo.schoolsysuser.fg.basicteachingplan.BasicPlanErrVo;
import com.zrqx.core.vo.schoolsysuser.fg.basicteachingplan.ExportPlanErrVo;
import com.zrqx.core.vo.schoolsysuser.fg.basicteachingplan.ImportPlanExcelVo;
import com.zrqx.school.sysuser.client.BgMemberClient;
import com.zrqx.school.sysuser.manage.department.FgDepartmentManage;
import com.zrqx.school.sysuser.manage.dictionarydata.FgDictionaryDataManage;
import com.zrqx.school.sysuser.manage.export.ExportManage;
......@@ -63,6 +67,8 @@ public class FgBasicTeachingPlanServiceImpl extends BaseModelServiceImpl<BasicTe
private FgDictionaryDataManage fgDictionaryDataManage;
@Autowired
private ExportManage exportManage;
@Autowired
private BgMemberClient bgMemberClient;
@Override
......@@ -262,6 +268,37 @@ public class FgBasicTeachingPlanServiceImpl extends BaseModelServiceImpl<BasicTe
planVo.setErrId(entity.getId());
return planVo;
}
@Override
public List<IdAndNameVo> listdpt(QueryAcademicLevelForm form) {
form.setRelationId(redis.getMember().getRelationId());
form.setType(redis.getMember().getType());
List<IdAndNameVo> list = fgBasicTeachingPlanMapper.listDpt(form);
list.forEach(vo ->{
//远程调用会员服务查询部门名称
CallBack<DepartmentMemberVo> callback = bgMemberClient.get(vo.getId());
if(callback.isStatus()){
vo.setName(callback.getData().getName());
}
});
return list;
}
@Override
public List<IdAndNameVo> listMajor(QueryAcademicLevelForm form) {
form.setRelationId(redis.getMember().getRelationId());
form.setType(redis.getMember().getType());
List<IdAndNameVo> list = fgBasicTeachingPlanMapper.listMajor(form);
list.forEach(vo ->{
Major major = fgMajorService.selectByPrimaryKey(vo.getId());
vo.setName(major.getName());
});
return list;
}
}
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/classmanagement/FgClassManagementService.java
浏览文件 @ e5dff0e6
......@@ -6,6 +6,7 @@ import com.zrqx.core.model.member.classmanagement.ClassManagement;
import com.zrqx.core.service.BaseService;
import com.zrqx.core.util.page.PageInfo;
import com.zrqx.core.util.page.PageParam;
import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo;
import com.zrqx.core.vo.schoolsysuser.fg.classmanagement.ClassManagementVo;
import com.zrqx.core.vo.schoolsysuser.fg.classmanagement.ExportClassErrVo;
import org.springframework.web.multipart.MultipartFile;
......@@ -118,5 +119,24 @@ public interface FgClassManagementService extends BaseService<ClassManagement,In
*@date: 2019/8/9 14:13
*/
List<ClassManagementVo> queryDetailsByBptId(Integer bptId, Integer relationID, String type);
/**
* 部门列表（筛选）
* @param form
* @return
* @auther zzg
* @data 2019年9月3日 上午11:03:37
*/
List<IdAndNameVo> listDpt(QueryAcademicLevelForm form);
/**
* 专业列表（筛选）
* @param form
* @return
* @auther zzg
* @data 2019年9月3日 上午11:03:37
*/
List<IdAndNameVo> listMajor(QueryAcademicLevelForm form);
}
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/classmanagement/FgClassManagementServiceImpl.java
浏览文件 @ e5dff0e6
......@@ -15,10 +15,14 @@ import com.zrqx.core.util.bean.BeanUtils;
import com.zrqx.core.util.excelutil.ExcelUtil;
import com.zrqx.core.util.page.PageInfo;
import com.zrqx.core.util.page.PageParam;
import com.zrqx.core.util.response.CallBack;
import com.zrqx.core.vo.member.department.DepartmentMemberVo;
import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo;
import com.zrqx.core.vo.schoolsysuser.fg.classmanagement.ClassManagementVo;
import com.zrqx.core.vo.schoolsysuser.fg.classmanagement.ClassmanagementErrVo;
import com.zrqx.core.vo.schoolsysuser.fg.classmanagement.ExportClassErrVo;
import com.zrqx.core.vo.schoolsysuser.fg.classmanagement.ImportClassVo;
import com.zrqx.school.sysuser.client.BgMemberClient;
import com.zrqx.school.sysuser.manage.department.FgDepartmentManage;
import com.zrqx.school.sysuser.manage.export.ExportManage;
import com.zrqx.school.sysuser.mapper.basicteachingplan.FgBasicTeachingPlanMapper;
......@@ -50,6 +54,8 @@ public class FgClassManagementServiceImpl extends BaseModelServiceImpl<ClassMana
private ExportManage exportManage;
@Autowired
private FgDepartmentManage fgDepartmentManage;
@Autowired
private BgMemberClient bgMemberClient;
@Override
public BaseMapper<ClassManagement> getMapper() {
......@@ -263,4 +269,38 @@ public class FgClassManagementServiceImpl extends BaseModelServiceImpl<ClassMana
return fgClassManagementMapper.list(form);
}
@Override
public List<IdAndNameVo> listDpt(QueryAcademicLevelForm form) {
form.setRelationId(redis.getMember().getRelationId());
form.setType(redis.getMember().getType());
List<IdAndNameVo> list = fgClassManagementMapper.listDpt(form);
list.forEach(vo ->{
//远程调用会员服务查询部门 名称
CallBack<DepartmentMemberVo> callback = bgMemberClient.get(vo.getId());
if(callback.isStatus()){
vo.setName(callback.getData().getName());
}
});
return list;
}
@Override
public List<IdAndNameVo> listMajor(QueryAcademicLevelForm form) {
form.setRelationId(redis.getMember().getRelationId());
form.setType(redis.getMember().getType());
List<IdAndNameVo> list = fgClassManagementMapper.listMajor(form);
list.forEach(vo ->{
Major major = fgMajorService.selectByPrimaryKey(vo.getId());
vo.setName(major.getName());
});
return list;
}
}
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/student/FgStudentService.java
浏览文件 @ e5dff0e6
......@@ -14,6 +14,7 @@ import com.zrqx.core.model.member.student.Student;
import com.zrqx.core.service.BaseService;
import com.zrqx.core.util.page.PageInfo;
import com.zrqx.core.util.page.PageParam;
import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo;
import com.zrqx.core.vo.schoolsysuser.fg.student.ExportStuErrVo;
import com.zrqx.core.vo.schoolsysuser.fg.student.FgSteudentVo;
import com.zrqx.core.vo.schoolsysuser.fg.student.StudentVo;
......@@ -133,6 +134,23 @@ public interface FgStudentService extends BaseService<Student,Integer>{
*/
List<Integer> listAcademicLevel(QueryAcademicLevelForm form);
/**
* 部门列表（筛选）
* @param form
* @return
* @auther zzg
* @data 2019年9月3日 上午11:03:37
*/
List<IdAndNameVo> listDpt(QueryAcademicLevelForm form);
/**
* 专业列表（筛选）
* @param form
* @return
* @auther zzg
* @data 2019年9月3日 上午11:03:37
*/
List<IdAndNameVo> listMajor(QueryAcademicLevelForm form);
}
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/student/FgStudentServiceImpl.java
浏览文件 @ e5dff0e6
......@@ -3,9 +3,6 @@ package com.zrqx.school.sysuser.service.student;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -13,44 +10,37 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import com.zrqx.core.commons.redis.FgRedisManage;
import com.zrqx.core.commons.redis.Redis;
import com.zrqx.core.enums.member.member.MemberSexEnum;
import com.zrqx.core.enums.sysuser.member.MemberStatusEnum;
import com.zrqx.core.exception.BusinessValidateException;
import com.zrqx.core.form.member.bg.department.QueryTypeAndRelationIdForm;
import com.zrqx.core.form.member.fg.basicteachingplan.QueryAcademicLevelForm;
import com.zrqx.core.form.member.fg.permissions.LoginForm;
import com.zrqx.core.form.member.fg.permissions.LoginMemberInfo;
import com.zrqx.core.form.school.sysuser.fg.student.QueryStudentForm;
import com.zrqx.core.mapper.BaseMapper;
import com.zrqx.core.model.member.basicteachingplan.BasicTeachingPlan;
import com.zrqx.core.model.member.classmanagement.ClassManagement;
import com.zrqx.core.model.member.major.Major;
import com.zrqx.core.model.member.member.Member;
import com.zrqx.core.model.member.member.MemberLoginLog;
import com.zrqx.core.model.member.student.Student;
import com.zrqx.core.model.school.export.Export;
import com.zrqx.core.service.BaseModelServiceImpl;
import com.zrqx.core.util.bean.BeanUtils;
import com.zrqx.core.util.encry.MD5Util;
import com.zrqx.core.util.excelutil.ExcelUtil;
import com.zrqx.core.util.ip.CusAccessObjectUtil;
import com.zrqx.core.util.page.PageInfo;
import com.zrqx.core.util.page.PageParam;
import com.zrqx.core.util.response.CallBack;
import com.zrqx.core.vo.member.fg.member.FgMemberVo;
import com.zrqx.core.vo.member.department.DepartmentMemberVo;
import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo;
import com.zrqx.core.vo.schoolsysuser.fg.student.ExportStuErrVo;
import com.zrqx.core.vo.schoolsysuser.fg.student.FgSteudentVo;
import com.zrqx.core.vo.schoolsysuser.fg.student.ImportStudentVo;
import com.zrqx.core.vo.schoolsysuser.fg.student.StudentVo;
import com.zrqx.school.sysuser.client.BgMemberClient;
import com.zrqx.school.sysuser.client.FgMemberClient;
import com.zrqx.school.sysuser.manage.basicteachingplan.FgBasicTeachingPlanManage;
import com.zrqx.school.sysuser.manage.department.FgDepartmentManage;
import com.zrqx.school.sysuser.manage.export.ExportManage;
import com.zrqx.school.sysuser.manage.major.FgMajorManage;
import com.zrqx.school.sysuser.mapper.basicteachingplan.FgBasicTeachingPlanMapper;
import com.zrqx.school.sysuser.mapper.classmanagement.FgClassManagementMapper;
import com.zrqx.school.sysuser.mapper.major.FgMajorMapper;
import com.zrqx.school.sysuser.mapper.student.FgStudentMapper;
......@@ -63,8 +53,6 @@ public class FgStudentServiceImpl extends BaseModelServiceImpl<Student,Integer>
@Autowired
private FgRedisManage redis;
@Autowired
private Redis fgRedis;
@Autowired
private FgClassManagementMapper fgClassManagementMapper;
@Autowired
private FgDepartmentManage fgDepartmentManage;
......@@ -78,8 +66,9 @@ public class FgStudentServiceImpl extends BaseModelServiceImpl<Student,Integer>
private ExportManage exportManage;
@Autowired
private BgMemberClient bgMemberClient;
@Autowired
private FgMemberClient fgMemeberClient;
private FgMajorMapper fgMajorMapper;
@Override
......@@ -334,6 +323,36 @@ public class FgStudentServiceImpl extends BaseModelServiceImpl<Student,Integer>
List<Integer> list = fgStudentMapper.listAcademicLevel(form);
return list;
}
@Override
public List<IdAndNameVo> listDpt(QueryAcademicLevelForm form) {
form.setRelationId(redis.getMember().getRelationId());
form.setType(redis.getMember().getType());
List<IdAndNameVo> list = fgStudentMapper.listDpt(form);
list.forEach(vo ->{
//远程调用会员服务查询部门 名称
CallBack<DepartmentMemberVo> callback = bgMemberClient.get(vo.getId());
if(callback.isStatus()){
vo.setName(callback.getData().getName());
}
});
return list;
}
@Override
public List<IdAndNameVo> listMajor(QueryAcademicLevelForm form) {
form.setRelationId(redis.getMember().getRelationId());
form.setType(redis.getMember().getType());
List<IdAndNameVo> list = fgStudentMapper.listMajor(form);
list.forEach(vo ->{
Major major = fgMajorMapper.selectByPrimaryKey(vo.getId());
vo.setName(major.getName());
});
return list;
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论