|
@@ -18,7 +18,6 @@ import com.xjrsoft.module.banding.mapper.BandingTaskClassMapper;
|
|
import com.xjrsoft.module.banding.mapper.BandingTaskClassStudentMapper;
|
|
import com.xjrsoft.module.banding.mapper.BandingTaskClassStudentMapper;
|
|
import com.xjrsoft.module.banding.mapper.BandingTaskMapper;
|
|
import com.xjrsoft.module.banding.mapper.BandingTaskMapper;
|
|
import com.xjrsoft.module.banding.service.IBandingTaskClassStudentService;
|
|
import com.xjrsoft.module.banding.service.IBandingTaskClassStudentService;
|
|
-import com.xjrsoft.module.banding.service.IBandingTaskService;
|
|
|
|
import com.xjrsoft.module.banding.vo.BandingTaskClassSureListVo;
|
|
import com.xjrsoft.module.banding.vo.BandingTaskClassSureListVo;
|
|
import com.xjrsoft.module.base.entity.BaseClass;
|
|
import com.xjrsoft.module.base.entity.BaseClass;
|
|
import com.xjrsoft.module.base.entity.BaseMajorSet;
|
|
import com.xjrsoft.module.base.entity.BaseMajorSet;
|
|
@@ -226,14 +225,21 @@ public class BandingTaskClassStudentServiceImpl extends MPJBaseServiceImpl<Bandi
|
|
setUserId(xjrUser.getId());
|
|
setUserId(xjrUser.getId());
|
|
setCreateDate(now);
|
|
setCreateDate(now);
|
|
setStudentId(student.getCredentialNumber());
|
|
setStudentId(student.getCredentialNumber());
|
|
- setHeight(student.getHeight().doubleValue());
|
|
|
|
- setWeight(student.getWeight().doubleValue());
|
|
|
|
|
|
+ if(student.getHeight() != null){
|
|
|
|
+ setHeight(student.getHeight().doubleValue());
|
|
|
|
+ }
|
|
|
|
+ if(student.getWeight() != null){
|
|
|
|
+ setWeight(student.getWeight().doubleValue());
|
|
|
|
+ }
|
|
}};
|
|
}};
|
|
studentService.save(baseStudent);
|
|
studentService.save(baseStudent);
|
|
|
|
|
|
BaseStudentSchoolRoll schoolRoll = new BaseStudentSchoolRoll() {{
|
|
BaseStudentSchoolRoll schoolRoll = new BaseStudentSchoolRoll() {{
|
|
setUserId(xjrUser.getId());
|
|
setUserId(xjrUser.getId());
|
|
- setGraduatedScore(student.getScore().doubleValue());
|
|
|
|
|
|
+ if(student.getScore() != null){
|
|
|
|
+ setGraduatedScore(student.getScore().doubleValue());
|
|
|
|
+ }
|
|
|
|
+
|
|
setGraduatedUniversity(student.getGraduateSchool());
|
|
setGraduatedUniversity(student.getGraduateSchool());
|
|
setClassId(classMap.get(studentClassRelation.get(student.getId())));
|
|
setClassId(classMap.get(studentClassRelation.get(student.getId())));
|
|
setMajorSetId(taskClassMajorMap.get(studentClassRelation.get(student.getId())));
|
|
setMajorSetId(taskClassMajorMap.get(studentClassRelation.get(student.getId())));
|