Merge remote-tracking branch 'origin/baotou-signup' into baotou-signup

This commit is contained in:
ly19960718 2021-05-25 11:50:22 +08:00
commit fbb7a9ca78

View File

@ -20,6 +20,8 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import ink.wgink.common.base.DefaultBaseService; import ink.wgink.common.base.DefaultBaseService;
import ink.wgink.exceptions.ParamsException; import ink.wgink.exceptions.ParamsException;
import ink.wgink.module.dictionary.pojo.dtos.DataDTO;
import ink.wgink.module.dictionary.service.IDataService;
import ink.wgink.pojo.ListPage; import ink.wgink.pojo.ListPage;
import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.pojo.result.SuccessResultList;
import ink.wgink.util.UUIDUtil; import ink.wgink.util.UUIDUtil;
@ -53,6 +55,8 @@ public class ApplyStudentsServiceImpl extends DefaultBaseService implements IApp
private IExamApplyService examApplyService; private IExamApplyService examApplyService;
@Autowired @Autowired
private IWorkTypeService workTypeService; private IWorkTypeService workTypeService;
@Autowired
private IDataService dataService;
public String saveRelationReturnId(ApplyStudentsVO applyStudentsVO){ public String saveRelationReturnId(ApplyStudentsVO applyStudentsVO){
@ -222,6 +226,18 @@ public class ApplyStudentsServiceImpl extends DefaultBaseService implements IApp
continue; continue;
} }
} }
DataDTO dataDTO = dataService.get(applyStudentsDTO.getApplySex());
if(null != dataDTO) {
applyStudentsDTO.setApplySex(dataDTO.getDataName());
}
dataDTO = dataService.get(applyStudentsDTO.getApplyCultureLevel());
if(null != dataDTO) {
applyStudentsDTO.setApplyCultureLevel(dataDTO.getDataName());
}
dataDTO = dataService.get(applyStudentsDTO.getApplyPhysicalState());
if(null != dataDTO) {
applyStudentsDTO.setApplyPhysicalState(dataDTO.getDataName());
}
ClassPlanDTO classPlanDTO = classPlanService.get(applyStudentsDTO.getApplyClassId()); ClassPlanDTO classPlanDTO = classPlanService.get(applyStudentsDTO.getApplyClassId());
applyStudentsDTO.setClassPlanDTO(classPlanDTO); applyStudentsDTO.setClassPlanDTO(classPlanDTO);
/*if(null != classPlanDTO) { /*if(null != classPlanDTO) {