|
|
@@ -3,7 +3,6 @@ package com.template.controller;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
@@ -1013,6 +1012,50 @@ public class SmartUserController implements SmartUserControllerAPI {
|
|
|
}
|
|
|
smartOperationUserService.saveBatch(operationUsers);
|
|
|
}
|
|
|
+
|
|
|
+ //region 批量存储综合评价
|
|
|
+ List<SmartEvaluateTeacher> insertETeachers = new ArrayList<>();
|
|
|
+ List<SmartSemester> semesters = smartSemesterService.list(null);
|
|
|
+ List<SmartClass> classes = smartClassService.list(null);
|
|
|
+ List<SmartGrade> grades = smartGradeService.list(null);
|
|
|
+ for (SmartUser teacher : teacherDatas) {
|
|
|
+ for (SmartSemester semester : semesters) {
|
|
|
+ //<0 : A < B
|
|
|
+ //=0 : A = B
|
|
|
+ //>0 : A > B
|
|
|
+ if (semester.getEndTime().compareTo(teacher.getCreateTime()) >= 0) {//说明在半学期创建的老师
|
|
|
+ SmartEvaluateTeacher set = new SmartEvaluateTeacher();
|
|
|
+ set.setCardNo(teacher.getCardNo());
|
|
|
+ set.setName(teacher.getName());
|
|
|
+ set.setUserId(teacher.getId());
|
|
|
+ set.setTermId(semester.getId());
|
|
|
+ set.setTerm(semester.getName());
|
|
|
+ if (teacher.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {//班主任才有年级和班级
|
|
|
+ set.setGradeId(Integer.valueOf(teacher.getGrade()));
|
|
|
+ Optional<SmartGrade> oGrade = grades.stream().filter(e -> e.getId().equals(set.getGradeId())).findFirst();
|
|
|
+ if (oGrade != null && oGrade.isPresent()) {
|
|
|
+ set.setGradeName(oGrade.get().getName());
|
|
|
+ }
|
|
|
+ set.setClassId(teacher.getSchoolClass());
|
|
|
+ Optional<SmartClass> oClass = classes.stream().filter(e -> e.getId().equals(set.getClassId())).findFirst();
|
|
|
+ if (oClass != null && oClass.isPresent()) {
|
|
|
+ set.setClassName(oClass.get().getName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ set.setTotalScore(0.0);
|
|
|
+ set.setLowingScore(0.0);
|
|
|
+ insertETeachers.add(set);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (insertETeachers != null && insertETeachers.size() > 0) {
|
|
|
+ boolean insertEteacher = smartEvaluateTeacherService.saveBatch(insertETeachers);
|
|
|
+ if (!insertEteacher) {
|
|
|
+ return CommonResult.fail("导入失败");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //endregion
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -2616,7 +2659,6 @@ public class SmartUserController implements SmartUserControllerAPI {
|
|
|
}
|
|
|
//endregion
|
|
|
|
|
|
-
|
|
|
//最后都要把数据加入到数据库中
|
|
|
if (org.springframework.util.StringUtils.hasText(isur.getPhone())) {
|
|
|
//多身份
|
|
|
@@ -2644,73 +2686,61 @@ public class SmartUserController implements SmartUserControllerAPI {
|
|
|
smartOperationUserService.save(smartOperationUser);
|
|
|
}
|
|
|
|
|
|
- if (isur.getIdentityId().intValue() == eIdentityStatu.Teacher.getValue() && isur.getIsr() != null && isur.getIsr().size() > 0) {
|
|
|
- List<SmartTeaching> teachings = new ArrayList<>();
|
|
|
- for (isrRequest sv : isur.getIsr()) {
|
|
|
- if (sv.getIds() != null && sv.getIds().size() > 0) {
|
|
|
- SmartTeaching st = new SmartTeaching();
|
|
|
- st.setUserId(result);
|
|
|
- st.setSubjectId(sv.getIds().size() > 0 ? sv.getIds().get(0) : 0);
|
|
|
- st.setGradeId(sv.getIds().size() > 1 ? sv.getIds().get(1) : 0);
|
|
|
- st.setClassId(sv.getIds().size() > 2 ? sv.getIds().get(2) : 0);
|
|
|
- teachings.add(st);
|
|
|
+ if (isur.getIdentityId().intValue() == eIdentityStatu.Teacher.getValue()) {
|
|
|
+ if (isur.getIsr() != null && isur.getIsr().size() > 0) {
|
|
|
+ List<SmartTeaching> teachings = new ArrayList<>();
|
|
|
+ for (isrRequest sv : isur.getIsr()) {
|
|
|
+ if (sv.getIds() != null && sv.getIds().size() > 0) {
|
|
|
+ SmartTeaching st = new SmartTeaching();
|
|
|
+ st.setUserId(result);
|
|
|
+ st.setSubjectId(sv.getIds().size() > 0 ? sv.getIds().get(0) : 0);
|
|
|
+ st.setGradeId(sv.getIds().size() > 1 ? sv.getIds().get(1) : 0);
|
|
|
+ st.setClassId(sv.getIds().size() > 2 ? sv.getIds().get(2) : 0);
|
|
|
+ teachings.add(st);
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- if (teachings != null && teachings.size() > 0) {
|
|
|
- boolean insertBatch = smartTeachingService.saveBatch(teachings);
|
|
|
- if (!insertBatch) {
|
|
|
- return CommonResult.fail("任课数据添加失败");
|
|
|
+ if (teachings != null && teachings.size() > 0) {
|
|
|
+ boolean insertBatch = smartTeachingService.saveBatch(teachings);
|
|
|
+ if (!insertBatch) {
|
|
|
+ return CommonResult.fail("任课数据添加失败");
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
- //region 添加教师综合素质评价
|
|
|
- List<Integer> ids = teachings.stream().map(SmartTeaching::getClassId).collect(Collectors.toList());
|
|
|
- List<SmartClass> classes = smartClassService.getSmartClasss(ids);
|
|
|
-
|
|
|
- List<Integer> subjectIds = teachings.stream().map(SmartTeaching::getSubjectId).collect(Collectors.toList());
|
|
|
- List<SmartSubject> subjects = smartSubjectService.getSmartSubjectId(subjectIds);
|
|
|
-
|
|
|
- List<Integer> gradeIds = teachings.stream().map(SmartTeaching::getGradeId).collect(Collectors.toList());
|
|
|
- List<SmartGrade> grades = smartGradeService.queryGradeByIds(gradeIds);
|
|
|
-
|
|
|
+ }
|
|
|
+ //region 新增用户的时候同步新增教师综合评价数据
|
|
|
+ List<SmartSemester> semesters = smartSemesterService.querySemesterByTime(new Date());
|
|
|
+ gradeData = smartGradeService.querySmartGradeById(Integer.valueOf(isur.getGrade()));
|
|
|
+ if (semesters != null && semesters.size() > 0) {
|
|
|
List<SmartEvaluateTeacher> eTeachers = new ArrayList<>();
|
|
|
- LocalDateTime now = LocalDateTime.now();
|
|
|
- List<SmartSemester> semesters = smartSemesterService.getSemestersByTime(now);
|
|
|
for (SmartSemester semester : semesters) {
|
|
|
- for (SmartTeaching teacher : teachings) {
|
|
|
- Optional<SmartClass> classTeacherData = classes != null && classes.size() > 0 ?
|
|
|
- classes.stream().filter(e -> e.getId().equals(teacher.getClassId())).findFirst() : null;
|
|
|
- Optional<SmartSubject> subjectData = subjects != null && subjects.size() > 0 ?
|
|
|
- subjects.stream().filter(e -> e.getId().equals(teacher.getSubjectId())).findFirst() : null;
|
|
|
- Optional<SmartGrade> ogradeData = grades != null && grades.size() > 0 ?
|
|
|
- grades.stream().filter(e -> e.getId().equals(teacher.getGradeId())).findFirst() : null;
|
|
|
-
|
|
|
- SmartEvaluateTeacher set = new SmartEvaluateTeacher();
|
|
|
- set.setCardNo(su.getCardNo());
|
|
|
- set.setName(su.getName());
|
|
|
- set.setUserId(su.getId());
|
|
|
- set.setGradeId(teacher.getGradeId());
|
|
|
- set.setGradeName(ogradeData != null && ogradeData.isPresent() ? ogradeData.get().getName() : "");
|
|
|
- set.setTermId(semester.getId());
|
|
|
- set.setTerm(semester.getName());
|
|
|
- set.setSubjectId(teacher.getSubjectId());
|
|
|
- set.setSubject(subjectData != null && subjectData.isPresent() ? subjectData.get().getName() : "");
|
|
|
+ SmartEvaluateTeacher set = new SmartEvaluateTeacher();
|
|
|
+ set.setCardNo(su.getCardNo());
|
|
|
+ set.setName(su.getName());
|
|
|
+ set.setUserId(su.getId());
|
|
|
+ set.setTermId(semester.getId());
|
|
|
+ set.setTerm(semester.getName());
|
|
|
+ if (su.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {//班主任才有年级和班级
|
|
|
+ set.setGradeId(Integer.valueOf(su.getGrade()));
|
|
|
+ if (gradeData != null) {
|
|
|
+ set.setGradeName(gradeData.getName());
|
|
|
+ }
|
|
|
set.setClassId(su.getSchoolClass());
|
|
|
- set.setClassName(classTeacherData != null && classTeacherData.isPresent() ? classTeacherData.get().getName() : "");
|
|
|
- set.setTotalScore(0.0);
|
|
|
- set.setLowingScore(0.0);
|
|
|
- eTeachers.add(set);
|
|
|
+ if (classData != null) {
|
|
|
+ set.setClassName(classData.getName());
|
|
|
+ }
|
|
|
}
|
|
|
+ set.setTotalScore(0.0);
|
|
|
+ set.setLowingScore(0.0);
|
|
|
+ eTeachers.add(set);
|
|
|
}
|
|
|
if (eTeachers != null && eTeachers.size() > 0) {
|
|
|
- boolean teacherBatch = smartEvaluateTeacherService.saveBatch(eTeachers);
|
|
|
- if (!teacherBatch) {
|
|
|
- throw new Exception("教师综合评价添加失败！");
|
|
|
+ boolean insertEteacher = smartEvaluateTeacherService.saveBatch(eTeachers);
|
|
|
+ if (!insertEteacher) {
|
|
|
+ return CommonResult.fail("添加失败");
|
|
|
}
|
|
|
}
|
|
|
- //endregion
|
|
|
}
|
|
|
+ //endregion
|
|
|
}
|
|
|
- //新增用户得将用户信息通过接口推送到希沃、百胜
|
|
|
}
|
|
|
return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
|
|
|
}
|
|
|
@@ -3246,12 +3276,9 @@ public class SmartUserController implements SmartUserControllerAPI {
|
|
|
}
|
|
|
//region 任课数据
|
|
|
if (result > 0 && usur.getIdentityId().intValue() == eIdentityStatu.Teacher.getValue()) {
|
|
|
- //查找原有的任课数据
|
|
|
- List<SmartTeaching> oldTeachings = smartTeachingService.queryTeachingByUserId(su.getId());
|
|
|
- smartTeachingService.deleteByUserId(su.getId());//删除任课
|
|
|
- List<SmartTeaching> newTeachings = new ArrayList<>();
|
|
|
- List<SmartTeaching> newEteachings = new ArrayList<>();
|
|
|
+ smartTeachingService.deleteByUserId(su.getId());
|
|
|
if (usur.getUsr() != null && usur.getUsr().size() > 0) {
|
|
|
+ List<SmartTeaching> teachings = new ArrayList<>();
|
|
|
for (isrRequest sv : usur.getUsr()) {
|
|
|
if (sv.getIds() != null && sv.getIds().size() > 0) {
|
|
|
SmartTeaching st = new SmartTeaching();
|
|
|
@@ -3259,82 +3286,79 @@ public class SmartUserController implements SmartUserControllerAPI {
|
|
|
st.setSubjectId(sv.getIds().size() > 0 ? sv.getIds().get(0) : 0);
|
|
|
st.setGradeId(sv.getIds().size() > 1 ? sv.getIds().get(1) : 0);
|
|
|
st.setClassId(sv.getIds().size() > 2 ? sv.getIds().get(2) : 0);
|
|
|
- long existCount = oldTeachings.stream().filter(e -> e.getUserId().equals(st.getUserId()) && e.getSubjectId().equals(st.getSubjectId())
|
|
|
- && e.getGradeId().equals(st.getGradeId()) && e.getClassId().equals(st.getClassId())).count();
|
|
|
- if (existCount <= 0) {
|
|
|
- newEteachings.add(st);
|
|
|
- }
|
|
|
- newTeachings.add(st);
|
|
|
+ teachings.add(st);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- if (newEteachings != null && newEteachings.size() > 0) {
|
|
|
- //region 添加教师综合素质评价
|
|
|
- List<Integer> ids = newEteachings.stream().map(SmartTeaching::getClassId).collect(Collectors.toList());
|
|
|
- List<SmartClass> classes = smartClassService.getSmartClasss(ids);
|
|
|
-
|
|
|
- List<Integer> subjectIds = newEteachings.stream().map(SmartTeaching::getSubjectId).collect(Collectors.toList());
|
|
|
- List<SmartSubject> subjects = smartSubjectService.getSmartSubjectId(subjectIds);
|
|
|
-
|
|
|
- List<Integer> gradeIds = newEteachings.stream().map(SmartTeaching::getGradeId).collect(Collectors.toList());
|
|
|
- List<SmartGrade> grades = smartGradeService.queryGradeByIds(gradeIds);
|
|
|
-
|
|
|
- List<SmartEvaluateTeacher> eTeachers = new ArrayList<>();
|
|
|
- LocalDateTime now = LocalDateTime.now();
|
|
|
- List<SmartSemester> semesters = smartSemesterService.getSemestersByTime(now);
|
|
|
- for (SmartSemester semester : semesters) {
|
|
|
- for (SmartTeaching teacher : newEteachings) {
|
|
|
- Optional<SmartClass> classTeacherData = classes != null && classes.size() > 0 ?
|
|
|
- classes.stream().filter(e -> e.getId().equals(teacher.getClassId())).findFirst() : null;
|
|
|
- Optional<SmartSubject> subjectData = subjects != null && subjects.size() > 0 ?
|
|
|
- subjects.stream().filter(e -> e.getId().equals(teacher.getSubjectId())).findFirst() : null;
|
|
|
- Optional<SmartGrade> gradeData = grades != null && grades.size() > 0 ?
|
|
|
- grades.stream().filter(e -> e.getId().equals(teacher.getGradeId())).findFirst() : null;
|
|
|
-
|
|
|
- SmartEvaluateTeacher set = new SmartEvaluateTeacher();
|
|
|
- set.setCardNo(su.getCardNo());
|
|
|
- set.setName(su.getName());
|
|
|
- set.setUserId(su.getId());
|
|
|
- set.setGradeId(teacher.getGradeId());
|
|
|
- set.setGradeName(gradeData != null && gradeData.isPresent() ? gradeData.get().getName() : "");
|
|
|
- set.setTermId(semester.getId());
|
|
|
- set.setTerm(semester.getName());
|
|
|
- set.setSubjectId(teacher.getSubjectId());
|
|
|
- set.setSubject(subjectData != null && subjectData.isPresent() ? subjectData.get().getName() : "");
|
|
|
- set.setClassId(teacher.getClassId());
|
|
|
- set.setClassName(classTeacherData != null && classTeacherData.isPresent() ? classTeacherData.get().getName() : "");
|
|
|
- set.setTotalScore(0.0);
|
|
|
- set.setLowingScore(0.0);
|
|
|
- eTeachers.add(set);
|
|
|
- }
|
|
|
+ if (teachings != null && teachings.size() > 0) {
|
|
|
+ boolean insertBatch = smartTeachingService.saveBatch(teachings);
|
|
|
+ if (!insertBatch) {
|
|
|
+ return CommonResult.fail("任课数据添加失败");
|
|
|
}
|
|
|
- if (eTeachers != null && eTeachers.size() > 0) {
|
|
|
- List<SmartEvaluateTeacher> insertEts = new ArrayList<>();
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- //已存在在老师综合评价里的就不再加进去了
|
|
|
- List<SmartEvaluateTeacher> teachers = smartEvaluateTeacherService.queryEvaluateTeachersByUserId(su.getId());
|
|
|
- for (SmartEvaluateTeacher et:eTeachers) {
|
|
|
- long existCount = teachers.stream().filter(e -> e.getUserId().equals(et.getUserId()) && e.getTermId().equals(et.getTermId())
|
|
|
- && e.getGradeId().equals(et.getGradeId()) && e.getSubjectId().equals(et.getSubjectId()) && e.getClassId().equals(et.getClassId())).count();
|
|
|
- if(existCount <= 0){
|
|
|
- insertEts.add(et);
|
|
|
- }
|
|
|
+ List<SmartEvaluateTeacher> eTeachers = smartEvaluateTeacherService.queryEvaluateTeachersByUserId(usur.getId());
|
|
|
+ List<SmartSemester> semesters = smartSemesterService.querySemesterByTime(su.getCreateTime());
|
|
|
+ List<SmartEvaluateTeacher> newTeachers = new ArrayList<>();
|
|
|
+ SmartClass classData = null;
|
|
|
+ SmartGrade gradeData = null;
|
|
|
+ if (su.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {
|
|
|
+ classData = smartClassService.getSmartClassById(su.getSchoolClass());
|
|
|
+ gradeData = smartGradeService.querySmartGradeById(Integer.valueOf(su.getGrade()));
|
|
|
+ }
|
|
|
+ if (eTeachers != null && eTeachers.size() > 0) {
|
|
|
+ for (SmartSemester semester : semesters) {
|
|
|
+ Optional<SmartEvaluateTeacher> oTeacher = eTeachers.stream().filter(e -> e.getTermId().equals(semester.getId())).findFirst();
|
|
|
+ if (oTeacher != null && oTeacher.isPresent()) {
|
|
|
+ if (su.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {
|
|
|
+ oTeacher.get().setGradeId(gradeData.getId());
|
|
|
+ oTeacher.get().setGradeName(gradeData.getName());
|
|
|
+ oTeacher.get().setClassId(classData.getId());
|
|
|
+ oTeacher.get().setClassName(classData.getName());
|
|
|
+ newTeachers.add(oTeacher.get());
|
|
|
}
|
|
|
- if(insertEts != null && insertEts.size() > 0){
|
|
|
- boolean teacherBatch = smartEvaluateTeacherService.saveBatch(insertEts);
|
|
|
- if (!teacherBatch) {
|
|
|
- throw new Exception("教师综合评价添加失败！");
|
|
|
- }
|
|
|
+ } else {
|
|
|
+ SmartEvaluateTeacher set = new SmartEvaluateTeacher();
|
|
|
+ set.setCardNo(su.getCardNo());
|
|
|
+ set.setName(su.getName());
|
|
|
+ set.setUserId(su.getId());
|
|
|
+ set.setTermId(semester.getId());
|
|
|
+ set.setTerm(semester.getName());
|
|
|
+ if (su.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {//班主任才有年级和班级
|
|
|
+ set.setGradeId(gradeData.getId());
|
|
|
+ set.setGradeName(gradeData.getName());
|
|
|
+ set.setClassId(classData.getId());
|
|
|
+ set.setClassName(classData.getName());
|
|
|
}
|
|
|
+ set.setTotalScore(0.0);
|
|
|
+ set.setLowingScore(0.0);
|
|
|
+ newTeachers.add(set);
|
|
|
}
|
|
|
- //endregion
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ for (SmartSemester semester : semesters) {
|
|
|
+ SmartEvaluateTeacher set = new SmartEvaluateTeacher();
|
|
|
+ set.setCardNo(su.getCardNo());
|
|
|
+ set.setName(su.getName());
|
|
|
+ set.setUserId(su.getId());
|
|
|
+ set.setTermId(semester.getId());
|
|
|
+ set.setTerm(semester.getName());
|
|
|
+ if (su.getDuties().intValue() == eDuties.ClassTeacher.getValue()) {//班主任才有年级和班级
|
|
|
+ set.setGradeId(gradeData.getId());
|
|
|
+ set.setGradeName(gradeData.getName());
|
|
|
+ set.setClassId(classData.getId());
|
|
|
+ set.setClassName(classData.getName());
|
|
|
+ }
|
|
|
+ set.setTotalScore(0.0);
|
|
|
+ set.setLowingScore(0.0);
|
|
|
+ newTeachers.add(set);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (newTeachings != null && newTeachings.size() > 0) {
|
|
|
- boolean insertBatch = smartTeachingService.saveBatch(newTeachings);
|
|
|
- if (!insertBatch) {
|
|
|
- return CommonResult.fail("任课数据添加失败");
|
|
|
+ if(newTeachers != null && newTeachers.size() > 0){
|
|
|
+ boolean insertEteacher = smartEvaluateTeacherService.saveBatch(newTeachers);
|
|
|
+ if(!insertEteacher){
|
|
|
+ return CommonResult.fail("修改失败");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -3356,8 +3380,7 @@ public class SmartUserController implements SmartUserControllerAPI {
|
|
|
* @return
|
|
|
* @throws JsonProcessingException
|
|
|
*/
|
|
|
- public CommonResult SeewoInsertBatchPhoto(SeewoClient
|
|
|
- seewoClient, List<PhotoServiceSavePhotosParam.ThirdSavePhotoQuery> photoList, Integer userType) throws
|
|
|
+ public CommonResult SeewoInsertBatchPhoto(SeewoClient seewoClient, List<PhotoServiceSavePhotosParam.ThirdSavePhotoQuery> photoList, Integer userType) throws
|
|
|
JsonProcessingException {
|
|
|
//region 希沃上传第三方图片信息
|
|
|
//初始化客户端
|
夏文涛