Tenlion/bt-yjj-system-examination-signup
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'baotou-signup' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup into baotou-signup

Browse Source
This commit is contained in:
wans 2021-05-15 17:57:47 +08:00
commit 706c4fa470
6 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java
View File

@ -143,16 +143,6 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic
} }
PageHelper.startPage(page.getPage(), page.getRows()); PageHelper.startPage(page.getPage(), page.getRows());
List<ApplyDTO> applyDTOs = list(page.getParams()); List<ApplyDTO> 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<ApplyDTO> pageInfo = new PageInfo<>(applyDTOs); PageInfo<ApplyDTO> pageInfo = new PageInfo<>(applyDTOs);
return new SuccessResultList<>(applyDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); return new SuccessResultList<>(applyDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
} }

2
src/main/java/cn/com/tenlion/service/applystudents/impl/ApplyStudentsServiceImpl.java
View File

@ -61,8 +61,8 @@ public class ApplyStudentsServiceImpl extends DefaultBaseService implements IApp
List<ApplyDTO> applyDTOList = applyService.listByInstitutionIdAndWorkTypeId(institutionId,workTypeId); List<ApplyDTO> applyDTOList = applyService.listByInstitutionIdAndWorkTypeId(institutionId,workTypeId);
for (ApplyDTO applyDTO : applyDTOList) { for (ApplyDTO applyDTO : applyDTOList) {
ApplyStudentsVO vo = new ApplyStudentsVO(); ApplyStudentsVO vo = new ApplyStudentsVO();
vo.setApplyClassId(classId);
BeanUtils.copyProperties(vo,applyDTO); BeanUtils.copyProperties(vo,applyDTO);
vo.setApplyClassId(classId);
this.save(vo); this.save(vo);
deleteIdList.add(applyDTO.getApplyId()); deleteIdList.add(applyDTO.getApplyId());
} }

4
src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml
View File

@ -112,8 +112,8 @@
#{examType}, #{examType},
#{reason}, #{reason},
#{nextCommitTime}, #{nextCommitTime},
#{workTypeID}, #{workTypeId},
#{orgID}, #{orgId},
#{gmtCreate}, #{gmtCreate},
#{creator}, #{creator},
#{gmtModified}, #{gmtModified},

6
src/main/resources/static/route/apply/audit.html
View File

@ -43,10 +43,10 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">报名计划</label> <label class="layui-form-label">报名工种</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="hidden" id="applyClassId" name="applyClassId" class="layui-input" value="" maxlength="36"> <input type="hidden" id="applyWorkTypeId" name="applyWorkTypeId" class="layui-input" value="" maxlength="36">
<input type="text" id="applyClassName" name="applyClassName" class="layui-input" value="" maxlength="36" placeholder="无" readonly="readonly"> <input type="text" id="applyWorkTypeName" name="applyWorkTypeName" class="layui-input" value="" maxlength="36" placeholder="无" readonly="readonly">
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-space10"> <div class="layui-form-item layui-col-space10">

6
src/main/resources/static/route/apply/show.html
View File

@ -37,10 +37,10 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">报名计划</label> <label class="layui-form-label">报名工种</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="hidden" id="applyClassId" name="applyClassId" class="layui-input" value="" maxlength="36"> <input type="hidden" id="applyWorkTypeId" name="applyWorkTypeId" class="layui-input" value="" maxlength="36">
<input type="text" id="applyClassName" name="applyClassName" class="layui-input" value="" maxlength="36" placeholder="无" readonly="readonly"> <input type="text" id="applyWorkTypeName" name="applyWorkTypeName" class="layui-input" value="" maxlength="36" placeholder="无" readonly="readonly">
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-space10"> <div class="layui-form-item layui-col-space10">

3
src/main/resources/static/route/examcheck/list.html
View File

@ -426,7 +426,8 @@
} else { } else {
var ids = ''; var ids = '';
for(var i = 0, item; item = checkDatas[i++];) { for(var i = 0, item; item = checkDatas[i++];) {
if(item.checkStatus === 0) { debugger
if(item.checkStatus == 0) {
if(i > 1) { if(i > 1) {
ids += '_'; ids += '_';
} }