Merge remote-tracking branch 'origin/baotou-signup' into baotou-signup

This commit is contained in:
Renpc-kilig 2021-05-15 17:57:06 +08:00
commit c6fbc4e8e0
3 changed files with 6 additions and 16 deletions

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());
} }

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">

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">