From 94aea144ed62887f8f8af8a407107b8243c2caca Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Wed, 5 May 2021 15:12:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenlion/service/apply/impl/ApplyServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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..dd13878 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("未查询到计划信息"); } @@ -120,6 +120,7 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic String applyCardNumber = page.getParams().get("applyCardNumber").toString(); String projectCatalogId = page.getParams().get("projectCatalogId").toString(); page.getParams().put("repotType",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("未在该计划的报名时间段"); } From c24b6f0539df264fd877fb2be509f1c7b0c83df3 Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Wed, 5 May 2021 15:13:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E8=AF=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 dd13878..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 @@ -119,7 +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(); - page.getParams().put("repotType",2); + page.getParams().put("reportType",2); page.getParams().put("signNowDate",DateUtil.getTime()); if(StringUtils.isBlank(applyCardNumber)){ throw new ParamsException("请填写证件号");