From 542c94f3a8024df37e474901451ee11a4819acbd Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Sat, 15 May 2021 17:56:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenlion/service/apply/impl/ApplyServiceImpl.java | 10 ---------- src/main/resources/static/route/apply/audit.html | 6 +++--- src/main/resources/static/route/apply/show.html | 6 +++--- 3 files changed, 6 insertions(+), 16 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 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/resources/static/route/apply/audit.html b/src/main/resources/static/route/apply/audit.html index e2851fa..61e1773 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 0cfa160..7d603a4 100644 --- a/src/main/resources/static/route/apply/show.html +++ b/src/main/resources/static/route/apply/show.html @@ -43,10 +43,10 @@
- +
- - + +
From 3896b2b5abf47e9b20a67c2ffa00eef1a78877b2 Mon Sep 17 00:00:00 2001 From: Renpc-kilig <308442850@qq.com> Date: Sat, 15 May 2021 17:56:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/applystudents/impl/ApplyStudentsServiceImpl.java | 2 +- .../resources/mybatis/mapper/examapply/exam-apply-mapper.xml | 4 ++-- src/main/resources/static/route/examcheck/list.html | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) 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/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 += '_'; }