diff --git a/src/main/java/cn/com/tenlion/controller/api/examapply/ExamApplyController.java b/src/main/java/cn/com/tenlion/controller/api/examapply/ExamApplyController.java index 01408f0..8e51411 100644 --- a/src/main/java/cn/com/tenlion/controller/api/examapply/ExamApplyController.java +++ b/src/main/java/cn/com/tenlion/controller/api/examapply/ExamApplyController.java @@ -136,8 +136,21 @@ public class ExamApplyController extends DefaultBaseController { @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @PutMapping("update-more/{ids}") @CheckRequestBodyAnnotation - public SuccessResult updateMore(@PathVariable("ids") String ids, @RequestBody ExamApplyVO examApplyVO) { - examApplyService.updateMore(Arrays.asList(ids.split("\\_")), examApplyVO); + public SuccessResult updateMore(@PathVariable("ids") String ids) { + Map params = requestParams(); + List examId = Arrays.asList(params.get("examId").toString().split(",")); + List point = Arrays.asList(params.get("point").toString().split(",")); + Integer checkStatus = Integer.parseInt(params.get("checkStatus").toString()); + List examApplyIds = Arrays.asList(ids.split("\\_")); + if(null != examApplyIds && examApplyIds.size() > 0) { + for(int i=0;i 0) { + if('分管领导' == pointIdArray[0]) { + sentExamMsg(planIds); + } + } + reloadTable(); + }, function (code, data) { + top.dialog.msg(data.msg); + }, function () { + layIndex = top.dialog.msg(top.dataMessage.updating, {icon: 16, time: 0, shade: 0.3}); + }, function () { + top.dialog.close(layIndex); + }); }, btn2: function(index) { top.dialog.close(index); @@ -504,8 +518,9 @@ } else { var ids = ''; var planIds = ''; + var points = ''; for(var i = 0, item; item = checkDatas[i++];) { - if(item.checkStatus === 1 || item.checkStatus === 2) { + if(item.checkStatus === 1 || item.checkStatus === -1) { top.dialog.msg('当前选择存在已经审核完成数据,请重新选择'); reloadTable(); return false; @@ -513,16 +528,18 @@ if (i > 1) { ids += '_'; planIds += ','; + points += ','; } ids += item['examApplyId']; planIds += item['examId']; + points += item['point']; } if(ids.length <= 0) { top.dialog.msg('当前选择数据已经审核完成,请重新选择'); reloadTable(); return false; } - checkMore(ids, planIds); + checkMore(ids, planIds, points); } } }); @@ -613,6 +630,8 @@ teacher(data) }else if('examMsg' == obj.event) { examMsg(data) + }else if('sentExamMsg' == obj.event) { + sentExamMsg(data.examId) } }); });