电签管理员重签相关

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -1583,15 +1583,15 @@ public class TaskController extends BladeController {
                                 String resultIds = processInstanceIds.stream()
                                         .map(id -> "'" + id + "'")
                                         .collect(Collectors.joining(","));
-                                taskParallelGroupMap = jdbcTemplate.query("select parallel_process_instance_id,process_instance_id,task_user_name,status from u_task_parallel where process_instance_id in(" + resultIds + ") order by id", new BeanPropertyRowMapper<>(TaskParallel.class)).stream().collect(Collectors.groupingBy(TaskParallel::getProcessInstanceId));
+                                taskParallelGroupMap = jdbcTemplate.query("select parallel_process_instance_id,process_instance_id,e_visa_status,task_user,task_user_name,status from u_task_parallel where process_instance_id in(" + resultIds + ") order by id", new BeanPropertyRowMapper<>(TaskParallel.class)).stream().collect(Collectors.groupingBy(TaskParallel::getProcessInstanceId));
                             }
                             Map<String, List<TaskParallel>> finalTaskParallelGroupMap = taskParallelGroupMap;
 
                             for (Task task : taskList) {
                                 List<TaskParallel> taskParallelList = finalTaskParallelGroupMap.get(task.getProcessInstanceId());
                                 for (TaskParallel taskParallel : taskParallelList) {
-                                    //待审批的不进行重签
-                                    if (!(new Integer(1)).equals(taskParallel.getStatus())) {
+                                    //待审批的不进行重签, 存在待审批，但是电签状态是失败的
+                                    if (!(new Integer(1)).equals(taskParallel.getStatus()) || (taskParallel.getEVisaStatus() != null && taskParallel.getEVisaStatus() == 99)) {
                                         TaskApprovalVO approvalVO = new TaskApprovalVO();
                                         approvalVO.setTaskId(task.getId().toString());
                                         approvalVO.setFlag("OK");
@@ -1600,6 +1600,7 @@ public class TaskController extends BladeController {
                                         approvalVO.setFormDataId(task.getFormDataId());
                                         approvalVO.setParallelProcessInstanceId(taskParallel.getParallelProcessInstanceId());
                                         approvalVO.setYsNickName(taskParallel.getTaskUserName());
+                                        approvalVO.setUserId(Long.parseLong(taskParallel.getTaskUser()));
                                         taskApprovalVOS.add(approvalVO);
                                     }
                                 }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -562,7 +562,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
 
             //保存批次
             TaskBatch taskBatch = new TaskBatch(null, JSONObject.toJSONString(taskApprovalVO));
-            taskBatch.setCreateUser(userId);
+            taskBatch.setCreateUser(taskApprovalVO.getUserId());
             taskBatch.setNickName(nickName);
             taskBatch.setCreateTime(new Date());
             taskList.add(taskBatch);