Merge branch 'master' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup
This commit is contained in:
commit
7ad9952e16
@ -67,6 +67,7 @@ public class ApplyAppController extends DefaultBaseController {
|
||||
@ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String"),
|
||||
@ApiImplicitParam(name = "applyCardNumber", value = "报名证件号", paramType = "query", dataType = "String"),
|
||||
@ApiImplicitParam(name = "projectCatalogId", value = "报名工种", paramType = "query", dataType = "String"),
|
||||
@ApiImplicitParam(name = "planType", value = "报名类型", paramType = "query", dataType = "String"),
|
||||
})
|
||||
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
|
||||
@GetMapping("listPageApplyClassPlan")
|
||||
|
@ -119,6 +119,7 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic
|
||||
List<ApplyClassPlanDTO> list= new ArrayList<>();
|
||||
String applyCardNumber = page.getParams().get("applyCardNumber").toString();
|
||||
String projectCatalogId = page.getParams().get("projectCatalogId").toString();
|
||||
String planType = page.getParams().get("planType").toString();
|
||||
page.getParams().put("reportType",2);
|
||||
page.getParams().put("signNowDate",DateUtil.getTime());
|
||||
if(StringUtils.isBlank(applyCardNumber)){
|
||||
@ -127,6 +128,9 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic
|
||||
if(StringUtils.isBlank(projectCatalogId)){
|
||||
throw new ParamsException("请选择报考工种");
|
||||
}
|
||||
if(StringUtils.isBlank(planType)){
|
||||
throw new ParamsException("请选择报考类型");
|
||||
}
|
||||
PageHelper.startPage(page.getPage(), page.getRows());
|
||||
List<ClassPlanDTO> classPlanDTOList = classPlanService.list(page.getParams());
|
||||
for (ClassPlanDTO classPlanDTO : classPlanDTOList) {
|
||||
@ -394,6 +398,13 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic
|
||||
auditLogVO.setApplyAuditState(applyAuditVO.getApplyAuditState());
|
||||
auditLogVO.setApplyAuditExplain(applyAuditVO.getApplyAuditExplain());
|
||||
applyAuditLogService.save(token,auditLogVO);
|
||||
if(applyAuditVO.getApplyAuditState() == 3){
|
||||
auditLogVO.setApplyAuditState(4);
|
||||
auditLogVO.setApplyAuditExplain("报名已完成");
|
||||
applyAuditLogService.save(token,auditLogVO);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue
Block a user