diff --git a/src/main/java/cn/com/tenlion/service/applystudents/impl/ApplyStudentsServiceImpl.java b/src/main/java/cn/com/tenlion/service/applystudents/impl/ApplyStudentsServiceImpl.java index a7869f7..b2a2d33 100644 --- a/src/main/java/cn/com/tenlion/service/applystudents/impl/ApplyStudentsServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/applystudents/impl/ApplyStudentsServiceImpl.java @@ -20,6 +20,8 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; 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.result.SuccessResultList; import ink.wgink.util.UUIDUtil; @@ -53,6 +55,8 @@ public class ApplyStudentsServiceImpl extends DefaultBaseService implements IApp private IExamApplyService examApplyService; @Autowired private IWorkTypeService workTypeService; + @Autowired + private IDataService dataService; public String saveRelationReturnId(ApplyStudentsVO applyStudentsVO){ @@ -222,6 +226,18 @@ public class ApplyStudentsServiceImpl extends DefaultBaseService implements IApp 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()); applyStudentsDTO.setClassPlanDTO(classPlanDTO); /*if(null != classPlanDTO) { diff --git a/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java b/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java index 0b54ef3..f7b5ca3 100644 --- a/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java @@ -76,6 +76,8 @@ public class ExamCheckServiceImpl extends DefaultBaseService implements IExamChe return examCheckId; } + + @Override public void remove(List ids) { remove(null, ids); diff --git a/src/main/resources/static/route/applyauditlog/show.html b/src/main/resources/static/route/applyauditlog/show.html index 02f3a5e..00e97d2 100644 --- a/src/main/resources/static/route/applyauditlog/show.html +++ b/src/main/resources/static/route/applyauditlog/show.html @@ -107,7 +107,7 @@ data +='操作人' data +='操作结果' data +='操作说明' - if(status == 2){ + if((status == 2 && fileId.length > 0)){ data += '交费凭证' } @@ -118,7 +118,7 @@ data +=''+user+'' data +=''+sName+'' data +=''+result+'' - if(status == 2){ + if((status == 2 && fileId.length > 0)){ fileIdViewer = fileId; var image = '