|
@@ -117,15 +117,25 @@ public class ExamServiceImpl implements ExamService {
|
|
|
}
|
|
|
} else {
|
|
|
exam = new ExamEntity();
|
|
|
+ exam.setEnable(true);
|
|
|
}
|
|
|
|
|
|
- exam.setBeginTime(examInfo.getBeginTime());
|
|
|
- exam.setDuration(examInfo.getDuration());
|
|
|
- exam.setEnable(examInfo.getEnable());
|
|
|
- exam.setEndTime(examInfo.getEndTime());
|
|
|
- exam.setExamTimes(examInfo.getExamTimes());
|
|
|
exam.setExamType(examInfo.getExamType());
|
|
|
- exam.setId(examInfo.getId());
|
|
|
+ if (null != examInfo.getBeginTime()) {
|
|
|
+ exam.setBeginTime(examInfo.getBeginTime());
|
|
|
+ }
|
|
|
+ if (null != examInfo.getEndTime()) {
|
|
|
+ exam.setEndTime(examInfo.getEndTime());
|
|
|
+ }
|
|
|
+ if (null != examInfo.getDuration()) {
|
|
|
+ exam.setDuration(examInfo.getDuration());
|
|
|
+ }
|
|
|
+ if (null != examInfo.getEnable()) {
|
|
|
+ exam.setEnable(examInfo.getEnable());
|
|
|
+ }
|
|
|
+ if (null != examInfo.getExamTimes()) {
|
|
|
+ exam.setExamTimes(examInfo.getExamTimes());
|
|
|
+ }
|
|
|
exam.setName(examInfo.getName());
|
|
|
exam.setRemark(examInfo.getRemark());
|
|
|
exam.setRootOrgId(examInfo.getRootOrgId());
|
|
@@ -148,15 +158,15 @@ public class ExamServiceImpl implements ExamService {
|
|
|
}
|
|
|
|
|
|
SyncExamReq req = new SyncExamReq();
|
|
|
- req.setBeginTime(exam.getBeginTime());
|
|
|
- req.setDuration(exam.getDuration());
|
|
|
- req.setEnable(exam.getEnable());
|
|
|
- req.setEndTime(exam.getEndTime());
|
|
|
- req.setExamTimes(exam.getExamTimes());
|
|
|
- req.setExamType(exam.getExamType().name());
|
|
|
- req.setName(exam.getName());
|
|
|
- req.setRemark(exam.getRemark());
|
|
|
- req.setRootOrgId(exam.getRootOrgId());
|
|
|
+ req.setBeginTime(saved.getBeginTime());
|
|
|
+ req.setDuration(saved.getDuration());
|
|
|
+ req.setEnable(saved.getEnable());
|
|
|
+ req.setEndTime(saved.getEndTime());
|
|
|
+ req.setExamTimes(saved.getExamTimes());
|
|
|
+ req.setExamType(saved.getExamType().name());
|
|
|
+ req.setName(saved.getName());
|
|
|
+ req.setRemark(saved.getRemark());
|
|
|
+ req.setRootOrgId(saved.getRootOrgId());
|
|
|
req.setRootOrgName(rootOrg.getName());
|
|
|
req.setSyncType("update");
|
|
|
dataSyncCloudService.syncExam(req);
|