|
|
@@ -283,27 +283,27 @@ public class LabSubjectAccessRecordServiceImpl implements ILabSubjectAccessRecor
|
|
|
vo.setLaboratoryId(a.getSubjectId());
|
|
|
vo.setLaboratoryName(a.getSubjectName());
|
|
|
vo.setUserName(a.getNickName());
|
|
|
- vo.setWarningStatus(result.getWarningStatus());
|
|
|
- vo.setInterviewStatus(result.getInterviewStatus());
|
|
|
- vo.setTestStatus(result.getTestStatus());
|
|
|
- vo.setLearnStatus(result.getLearnStatus());
|
|
|
- vo.setPracticeStatus(result.getPracticeStatus());
|
|
|
- vo.setHandleDay(result.getHandleDay());
|
|
|
- vo.setTreatmentMessage(a.getViolationName());
|
|
|
- vo.setLearnHour(result.getLearnHour());
|
|
|
- vo.setLearnMinute(result.getLearnMinute());
|
|
|
- if(StringUtils.isNotNull(result.getNumberTopics())){
|
|
|
- vo.setNumberTopics(Integer.parseInt(result.getNumberTopics()+""));
|
|
|
- }else{
|
|
|
- vo.setNumberTopics(null);
|
|
|
+ if(StringUtils.isNotNull(result)){
|
|
|
+ vo.setWarningStatus(result.getWarningStatus());
|
|
|
+ vo.setInterviewStatus(result.getInterviewStatus());
|
|
|
+ vo.setTestStatus(result.getTestStatus());
|
|
|
+ vo.setLearnStatus(result.getLearnStatus());
|
|
|
+ vo.setPracticeStatus(result.getPracticeStatus());
|
|
|
+ vo.setHandleDay(result.getHandleDay());
|
|
|
+ vo.setTreatmentMessage(a.getViolationName());
|
|
|
+ vo.setLearnHour(result.getLearnHour());
|
|
|
+ vo.setLearnMinute(result.getLearnMinute());
|
|
|
+ if(StringUtils.isNotNull(result.getNumberTopics())){
|
|
|
+ vo.setNumberTopics(Integer.parseInt(result.getNumberTopics()+""));
|
|
|
+ }else{
|
|
|
+ vo.setNumberTopics(null);
|
|
|
+ }
|
|
|
+ if(StringUtils.isNotNull(result.getNumberAccuracy())){
|
|
|
+ vo.setNumberAccuracy(Integer.parseInt(result.getNumberAccuracy()+""));
|
|
|
+ }else{
|
|
|
+ vo.setNumberAccuracy(null);
|
|
|
+ }
|
|
|
}
|
|
|
- if(StringUtils.isNotNull(result.getNumberAccuracy())){
|
|
|
- vo.setNumberAccuracy(Integer.parseInt(result.getNumberAccuracy()+""));
|
|
|
- }else{
|
|
|
- vo.setNumberAccuracy(null);
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
labViolationServiceImpl.addViolationHistory(vo);
|
|
|
}
|
|
|
}
|