diff --git a/src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java b/src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java index 1cb17a4..1f64619 100644 --- a/src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java @@ -10,6 +10,8 @@ import cn.com.tenlion.pojo.pos.distribution.DistributionPO; import cn.com.tenlion.pojo.vos.distribution.DistributionSaveVO; import cn.com.tenlion.pojo.vos.distribution.DistributionVO; import cn.com.tenlion.pojo.vos.distributionfield.DistributionFieldVO; +import cn.com.tenlion.pojo.vos.examapply.ExamApplyVO; +import cn.com.tenlion.service.examapply.IExamApplyService; import cn.com.tenlion.service.examination.distribution.IDistributionService; import cn.com.tenlion.service.examination.distributionfield.IDistributionFieldService; import cn.com.tenlion.service.examination.stationuser.IStationUserService; @@ -50,6 +52,8 @@ public class DistributionServiceImpl extends DefaultBaseService implements IDist private IOrganizationService iOrganizationService; @Autowired private IDistributionFieldService iDistributionFieldService; + @Autowired + private IExamApplyService iExamApplyService; @Override public void save(DistributionSaveVO dstributionSaveVO) { @@ -232,6 +236,10 @@ public class DistributionServiceImpl extends DefaultBaseService implements IDist if(fieldNumber < number) { throw new UpdateException("选择的考场无法容纳本次的考试人数"); } + ExamApplyVO vo = new ExamApplyVO(); + vo.setExamId(distributionId); + vo.setStatus(1); + iExamApplyService.update(null, vo); distributionDao.update(params); } diff --git a/src/main/resources/static/route/examination/distribution/list.html b/src/main/resources/static/route/examination/distribution/list.html index 3d75c6d..079222f 100644 --- a/src/main/resources/static/route/examination/distribution/list.html +++ b/src/main/resources/static/route/examination/distribution/list.html @@ -93,7 +93,7 @@ [ {type:'checkbox', fixed: 'left'}, {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '{{d.LAY_INDEX}}'}, - {field: 'planId', width: 180, title: '计划名称', align:'center', + {field: 'planName', width: 180, title: '计划名称', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { diff --git a/src/main/resources/static/route/examination/distribution/update.html b/src/main/resources/static/route/examination/distribution/update.html index 0d951a3..a5e40fd 100644 --- a/src/main/resources/static/route/examination/distribution/update.html +++ b/src/main/resources/static/route/examination/distribution/update.html @@ -130,7 +130,7 @@ }); } // 初始化成立日期时间戳 - function initDistributionAllotTime() { + function initDistributionAllotEndTime() { laydate.render({ elem: '#distributionAllotEndTime', type: 'datetime', @@ -201,6 +201,7 @@ form.render(null, 'dataForm'); initDistributionAllotTime(); initDistributionFields(dataFormData.stationId); + initDistributionAllotEndTime(); }, function(code, data) { top.dialog.msg(data.msg); }, function() {