更新

src/main/java/com/keymobile/rest/ctrl/IndexCtrl.java

@@ -122,11 +122,13 @@ public class IndexCtrl {
         // 新建excel实例
         List<ExcelForm> excelFormList = form.getExcels();
         excelFormList.forEach(excelForm -> {
-            TwinkleValidator.notLessThan(excelForm.getUserIdList().size(), 1, "补录人不能为空");
+            TwinkleValidator.notEmpty(excelForm.getUserIds(), "补录人不能为空");
             excelForm.setJob(job);
             Excel excel = excelService.save(excelForm);
             // 新建补录人员任务关联
-            List<User> userList = userService.findAllByIdIn(excelForm.getUserIdList());
+            String[] userIds = excelForm.getUserIds().split(",");
+            List<Long> userIdList = Arrays.asList(userIds).stream().map(Long::parseLong).collect(Collectors.toList());
+            List<User> userList = userService.findAllByIdIn(userIdList);
             TwinkleValidator.notLessThan(userList.size(), 1, "补录人员不存在");
             userList.forEach(user -> {
                 jobInfoService.save(user, excel);
@@ -210,6 +212,7 @@ public class IndexCtrl {
         User judge = userService.getAudit();
         List<Task> taskList = taskService.createTaskQuery().processInstanceId(job.getProcessId())
                 .taskAssignee(judge.getUsername()).list();
+        TwinkleValidator.notLessThan(taskList.size(), 1, "启动失败");
         Task task = taskList.get(0);
         taskService.complete(task.getId(), ImmutableMap.of("pass", "true"));
         job.setStatus(Job.STATUS_COMPLETED);
@@ -226,6 +229,7 @@ public class IndexCtrl {
         User judge = userService.getAudit();
         List<Task> taskList = taskService.createTaskQuery().processInstanceId(job.getProcessId())
                 .taskAssignee(judge.getUsername()).list();
+        TwinkleValidator.notLessThan(taskList.size(), 1, "启动失败");
         Task task = taskList.get(0);
         taskService.complete(task.getId(), ImmutableMap.of("pass", "false"));
         return ApiResponse.ok();

src/main/java/com/keymobile/rest/vo/ExcelForm.java

@@ -20,10 +20,10 @@ public class ExcelForm {
     @ApiModelProperty(name = "id", value = "表格id,修改的时候需要用到")
     private Long id;
 
-    @ApiModelProperty(required = true, name = "userIds", value = "补录人员ids, 用逗号隔开", hidden = true)
+    @ApiModelProperty(required = true, name = "userIds", value = "补录人员ids, 用逗号隔开")
     private String userIds;
 
-    @ApiModelProperty(required = true, name = "userIdList", value = "补录人员id集合")
+    @ApiModelProperty(required = true, name = "userIdList", value = "补录人员id集合", hidden = true)
     private List<Long> userIdList;
 
     @ApiModelProperty(name = "remark", value = "表格名称", required = true)