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 fe8e844..5c782a0 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 @@ -103,7 +103,7 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic if(applyDTO.getApplyAuditState() != 0){ throw new SearchException("报名信息已审核"); } - ClassPlanDTO classPlanDTO = classPlanService.get(applyAuditVO.getApplyId()); + ClassPlanDTO classPlanDTO = classPlanService.get(applyDTO.getApplyClassId()); if(classPlanDTO == null){ throw new ParamsException("未查询到计划信息"); } @@ -119,7 +119,8 @@ 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(); - page.getParams().put("repotType",2); + page.getParams().put("reportType",2); + page.getParams().put("signNowDate",DateUtil.getTime()); if(StringUtils.isBlank(applyCardNumber)){ throw new ParamsException("请填写证件号"); } @@ -201,8 +202,8 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic throw new ParamsException("未查询到计划信息"); } int planPersonNum = classPlanDTO.getPlanPersonNum();//计划人数 - String planStartTime = classPlanDTO.getPlanStartTime();//计划开始时间 - String planEndTime = classPlanDTO.getPlanEndTime();//计划结束时间 + String signUpStartTime = classPlanDTO.getSignUpStartTime();//报名开始时间 + String signUpEndTime = classPlanDTO.getSignUpEndTime();//报名结束时间 int applyClassNumber = countApplyClassNumber(ApplyClassId);//以报名人数 if(applyClassNumber+1 > planPersonNum ){ @@ -214,8 +215,8 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic Calendar end = Calendar.getInstance(); try { date.setTime(df.parse(DateUtil.getTime())); - begin.setTime(df.parse(planStartTime)); - end.setTime(df.parse(planEndTime)); + begin.setTime(df.parse(signUpStartTime)); + end.setTime(df.parse(signUpEndTime)); if (!(date.after(begin) && date.before(end))) { throw new ParamsException("未在该计划的报名时间段"); }