Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
10cd9b6ec2
@ -132,7 +132,8 @@ public class DistributionServiceImpl extends DefaultBaseService implements IDist
|
|||||||
Map<String, Object> save = HashMapUtil.beanToMap(dDistributionSaveVO);
|
Map<String, Object> save = HashMapUtil.beanToMap(dDistributionSaveVO);
|
||||||
save.put("distributionAllotTime", "");
|
save.put("distributionAllotTime", "");
|
||||||
save.put("distributionFields", "");
|
save.put("distributionFields", "");
|
||||||
save.put("distributionStatus", "");
|
save.put("distributionStatus", "0");
|
||||||
|
save.put("distributionAllotEndTime", "");
|
||||||
save.put("distributionId", distributionId);
|
save.put("distributionId", distributionId);
|
||||||
if (StringUtils.isBlank(token)) {
|
if (StringUtils.isBlank(token)) {
|
||||||
setSaveInfo(save);
|
setSaveInfo(save);
|
||||||
@ -239,7 +240,7 @@ public class DistributionServiceImpl extends DefaultBaseService implements IDist
|
|||||||
ExamApplyVO vo = new ExamApplyVO();
|
ExamApplyVO vo = new ExamApplyVO();
|
||||||
vo.setExamId(distributionId);
|
vo.setExamId(distributionId);
|
||||||
vo.setStatus(1);
|
vo.setStatus(1);
|
||||||
iExamApplyService.update(null, vo);
|
iExamApplyService.updateStatus(distributionId, vo);
|
||||||
distributionDao.update(params);
|
distributionDao.update(params);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -125,7 +125,6 @@
|
|||||||
laydate.render({
|
laydate.render({
|
||||||
elem: '#distributionAllotTime',
|
elem: '#distributionAllotTime',
|
||||||
type: 'datetime',
|
type: 'datetime',
|
||||||
min:3,
|
|
||||||
trigger: 'click'
|
trigger: 'click'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -134,7 +133,6 @@
|
|||||||
laydate.render({
|
laydate.render({
|
||||||
elem: '#distributionAllotEndTime',
|
elem: '#distributionAllotEndTime',
|
||||||
type: 'datetime',
|
type: 'datetime',
|
||||||
min:3,
|
|
||||||
trigger: 'click'
|
trigger: 'click'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user