|
@@ -3219,7 +3219,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
classPeriodSectionVo.setStudyEndTime(userPeriodStatusVo.getRecordEndTime());
|
|
classPeriodSectionVo.setStudyEndTime(userPeriodStatusVo.getRecordEndTime());
|
|
|
classPeriodSectionVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
|
|
classPeriodSectionVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
|
|
|
if (Validator.isNotEmpty(photoList) && photoList.size() > 0) {
|
|
if (Validator.isNotEmpty(photoList) && photoList.size() > 0) {
|
|
|
- if(fullName.contains("继续教育")&&fullName.contains("施工现场专业人员")){
|
|
|
|
|
|
|
+ if((fullName.contains("继续教育")&&fullName.contains("施工现场专业人员"))||fullName.equals("继续教育一级建造师")){
|
|
|
classPeriodSectionVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
|
|
classPeriodSectionVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
|
|
|
}else{
|
|
}else{
|
|
|
classPeriodSectionVo.setStudyStartTime(photoList.get(0).getCreateTime());
|
|
classPeriodSectionVo.setStudyStartTime(photoList.get(0).getCreateTime());
|
|
@@ -3382,7 +3382,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
classPeriodSectionVo.setStudyEndTime(userPeriodStatusVo.getRecordEndTime());
|
|
classPeriodSectionVo.setStudyEndTime(userPeriodStatusVo.getRecordEndTime());
|
|
|
classPeriodSectionVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
|
|
classPeriodSectionVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
|
|
|
if (Validator.isNotEmpty(photoList) && photoList.size() > 0) {
|
|
if (Validator.isNotEmpty(photoList) && photoList.size() > 0) {
|
|
|
- if(fullName.contains("继续教育")&&fullName.contains("施工现场专业人员")){
|
|
|
|
|
|
|
+ if((fullName.contains("继续教育")&&fullName.contains("施工现场专业人员"))||fullName.equals("继续教育一级建造师")){
|
|
|
classPeriodSectionVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
|
|
classPeriodSectionVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
|
|
|
}else{
|
|
}else{
|
|
|
classPeriodSectionVo.setStudyStartTime(photoList.get(0).getCreateTime());
|
|
classPeriodSectionVo.setStudyStartTime(photoList.get(0).getCreateTime());
|
|
@@ -3504,7 +3504,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
classPeriodVo.setStudyEndTime(userPeriodStatusVo.getRecordEndTime());
|
|
classPeriodVo.setStudyEndTime(userPeriodStatusVo.getRecordEndTime());
|
|
|
classPeriodVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
|
|
classPeriodVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
|
|
|
if (photoList.size() > 0) {
|
|
if (photoList.size() > 0) {
|
|
|
- if(fullName.contains("继续教育")&&fullName.contains("施工现场专业人员")){
|
|
|
|
|
|
|
+ if((fullName.contains("继续教育")&&fullName.contains("施工现场专业人员"))||fullName.equals("继续教育一级建造师")){
|
|
|
classPeriodVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
|
|
classPeriodVo.setStudyStartTime(userPeriodStatusVo.getRecordStartTime());
|
|
|
}else{
|
|
}else{
|
|
|
classPeriodVo.setStudyStartTime(photoList.get(0).getCreateTime());
|
|
classPeriodVo.setStudyStartTime(photoList.get(0).getCreateTime());
|