|
@@ -16,9 +16,13 @@ import com.zhongzheng.modules.grade.service.IClassGradeGoodsService;
|
|
import com.zhongzheng.modules.grade.service.IClassGradeSysService;
|
|
import com.zhongzheng.modules.grade.service.IClassGradeSysService;
|
|
import com.zhongzheng.modules.grade.service.IClassGradeUserService;
|
|
import com.zhongzheng.modules.grade.service.IClassGradeUserService;
|
|
import com.zhongzheng.modules.grade.vo.ClassGradeStudentVo;
|
|
import com.zhongzheng.modules.grade.vo.ClassGradeStudentVo;
|
|
|
|
+import com.zhongzheng.modules.grade.vo.ClassGradeUserVo;
|
|
import com.zhongzheng.modules.system.domain.SysConfig;
|
|
import com.zhongzheng.modules.system.domain.SysConfig;
|
|
import com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo;
|
|
import com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo;
|
|
|
|
+import com.zhongzheng.modules.user.bo.UserUpdateQueryBo;
|
|
|
|
+import com.zhongzheng.modules.user.domain.UserUpdate;
|
|
import com.zhongzheng.modules.user.service.IUserStudyRecordService;
|
|
import com.zhongzheng.modules.user.service.IUserStudyRecordService;
|
|
|
|
+import com.zhongzheng.modules.user.service.IUserUpdateService;
|
|
import com.zhongzheng.modules.user.vo.SubjectStudyRecordVo;
|
|
import com.zhongzheng.modules.user.vo.SubjectStudyRecordVo;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -32,6 +36,7 @@ import com.zhongzheng.modules.grade.vo.ClassGradeVo;
|
|
import com.zhongzheng.modules.grade.service.IClassGradeService;
|
|
import com.zhongzheng.modules.grade.service.IClassGradeService;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
|
|
+import java.util.ArrayList;
|
|
import java.util.Collection;
|
|
import java.util.Collection;
|
|
import java.util.Collections;
|
|
import java.util.Collections;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -61,6 +66,9 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
|
|
@Autowired
|
|
@Autowired
|
|
private IClassGradeUserService iClassGradeUserService;
|
|
private IClassGradeUserService iClassGradeUserService;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private IUserUpdateService iUserUpdateService;
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public ClassGradeVo queryById(Long gradeId){
|
|
public ClassGradeVo queryById(Long gradeId){
|
|
ClassGradeQueryBo classGradeQueryBo = new ClassGradeQueryBo();
|
|
ClassGradeQueryBo classGradeQueryBo = new ClassGradeQueryBo();
|
|
@@ -190,7 +198,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
|
|
|
|
|
|
SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();
|
|
SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();
|
|
subjectStudyRecordQueryBo.setGoodsId(classGradeStudentVo.getGoodsId());
|
|
subjectStudyRecordQueryBo.setGoodsId(classGradeStudentVo.getGoodsId());
|
|
- subjectStudyRecordQueryBo.setUserId(bo.getUserId());
|
|
|
|
|
|
+ subjectStudyRecordQueryBo.setUserId(classGradeStudentVo.getUserId());
|
|
List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
|
|
List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
|
|
for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
|
|
for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
|
|
secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();
|
|
secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();
|
|
@@ -201,6 +209,9 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
|
|
//classGradeStudentVo.setStudyNum(divide.multiply(new BigDecimal("100")).longValue());
|
|
//classGradeStudentVo.setStudyNum(divide.multiply(new BigDecimal("100")).longValue());
|
|
classGradeStudentVo.setSecAllNum(secLong);
|
|
classGradeStudentVo.setSecAllNum(secLong);
|
|
classGradeStudentVo.setStuAllNum(studyLong);
|
|
classGradeStudentVo.setStuAllNum(studyLong);
|
|
|
|
+ UserUpdateQueryBo userUpdateQueryBo = new UserUpdateQueryBo();
|
|
|
|
+ userUpdateQueryBo.setUserId(classGradeStudentVo.getUserId());
|
|
|
|
+ classGradeStudentVo.setUserUpdates(iUserUpdateService.queryList(userUpdateQueryBo));
|
|
}
|
|
}
|
|
return classGradeStudentVos;
|
|
return classGradeStudentVos;
|
|
}
|
|
}
|
|
@@ -208,6 +219,16 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
|
|
@Override
|
|
@Override
|
|
public boolean editUserGrade(ClassGradeUserAddQueryBo bo) {
|
|
public boolean editUserGrade(ClassGradeUserAddQueryBo bo) {
|
|
for (Long aLong : bo.getUserId()) {
|
|
for (Long aLong : bo.getUserId()) {
|
|
|
|
+ ClassGradeUserQueryBo classGradeUserQueryBo = new ClassGradeUserQueryBo();
|
|
|
|
+ classGradeUserQueryBo.setUserId(aLong);
|
|
|
|
+ classGradeUserQueryBo.setGradeId(bo.getGradeId());
|
|
|
|
+ List<Integer> status = new ArrayList<>();
|
|
|
|
+ status.add(1);
|
|
|
|
+ classGradeUserQueryBo.setStatus(status);
|
|
|
|
+ List<ClassGradeUserVo> classGradeUserVos = iClassGradeUserService.queryList(classGradeUserQueryBo);
|
|
|
|
+ if (CollectionUtils.isNotEmpty(classGradeUserVos)){
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
ClassGradeUserAddBo classGradeUserAddBo = new ClassGradeUserAddBo();
|
|
ClassGradeUserAddBo classGradeUserAddBo = new ClassGradeUserAddBo();
|
|
classGradeUserAddBo.setUserId(aLong);
|
|
classGradeUserAddBo.setUserId(aLong);
|
|
classGradeUserAddBo.setGradeId(bo.getGradeId());
|
|
classGradeUserAddBo.setGradeId(bo.getGradeId());
|