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 cc25945..08fa4cd 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 @@ -143,16 +143,6 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic } PageHelper.startPage(page.getPage(), page.getRows()); List applyDTOs = list(page.getParams()); - //查询准考证生成信息 -// for (ApplyDTO applyDTO : applyDTOs) { -// DistributionCardDTO distributionCardDTO = distributionCardService.get(applyDTO.getApplyId()); -// if(distributionCardDTO == null){ -// applyDTO.setDistributionCardState(0); -// }else{ -// applyDTO.setDistributionCardState(1); -// applyDTO.setDistributionCardCode(distributionCardDTO.getDistributionCardPictures()); -// } -// } PageInfo pageInfo = new PageInfo<>(applyDTOs); return new SuccessResultList<>(applyDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); } 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 638f8bc..869273f 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 @@ -61,8 +61,8 @@ public class ApplyStudentsServiceImpl extends DefaultBaseService implements IApp List applyDTOList = applyService.listByInstitutionIdAndWorkTypeId(institutionId,workTypeId); for (ApplyDTO applyDTO : applyDTOList) { ApplyStudentsVO vo = new ApplyStudentsVO(); - vo.setApplyClassId(classId); BeanUtils.copyProperties(vo,applyDTO); + vo.setApplyClassId(classId); this.save(vo); deleteIdList.add(applyDTO.getApplyId()); } diff --git a/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml b/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml index ff49f6f..636ee74 100644 --- a/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml +++ b/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml @@ -112,8 +112,8 @@ #{examType}, #{reason}, #{nextCommitTime}, - #{workTypeID}, - #{orgID}, + #{workTypeId}, + #{orgId}, #{gmtCreate}, #{creator}, #{gmtModified}, diff --git a/src/main/resources/static/route/apply/audit.html b/src/main/resources/static/route/apply/audit.html index 1ea5f11..c75e7c5 100644 --- a/src/main/resources/static/route/apply/audit.html +++ b/src/main/resources/static/route/apply/audit.html @@ -43,10 +43,10 @@
- +
- - + +
diff --git a/src/main/resources/static/route/apply/show.html b/src/main/resources/static/route/apply/show.html index 087048f..a3181e7 100644 --- a/src/main/resources/static/route/apply/show.html +++ b/src/main/resources/static/route/apply/show.html @@ -37,10 +37,10 @@
- +
- - + +
diff --git a/src/main/resources/static/route/examcheck/list.html b/src/main/resources/static/route/examcheck/list.html index 7a79101..104483d 100644 --- a/src/main/resources/static/route/examcheck/list.html +++ b/src/main/resources/static/route/examcheck/list.html @@ -426,7 +426,8 @@ } else { var ids = ''; for(var i = 0, item; item = checkDatas[i++];) { - if(item.checkStatus === 0) { + debugger + if(item.checkStatus == 0) { if(i > 1) { ids += '_'; }