diff --git a/src/main/java/cn/com/tenlion/controller/app/api/apply/ApplyAppController.java b/src/main/java/cn/com/tenlion/controller/app/api/apply/ApplyAppController.java index 4535799..e897b6d 100644 --- a/src/main/java/cn/com/tenlion/controller/app/api/apply/ApplyAppController.java +++ b/src/main/java/cn/com/tenlion/controller/app/api/apply/ApplyAppController.java @@ -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") diff --git a/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java b/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java index 5c782a0..e51412b 100644 --- a/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java @@ -119,6 +119,7 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic List 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 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); + } + + } } \ No newline at end of file