重签签字人bug

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/TaskApprovalVO.java

@@ -42,6 +42,9 @@ public class TaskApprovalVO {
     @ApiModelProperty("签字人名")
     private String nickName;
 
+    @ApiModelProperty("重签对应的原始签字人名")
+    private String ysNickName;
+
     @ApiModelProperty("附件信息")
     private List<ApprovalFile> approvalFileList = new ArrayList<>();
 

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

@@ -1500,7 +1500,7 @@ 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 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,task_user_name 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;
 
@@ -1514,6 +1514,7 @@ public class TaskController extends BladeController {
                                     approvalVO.setApprovalType(1);
                                     approvalVO.setFormDataId(task.getFormDataId());
                                     approvalVO.setParallelProcessInstanceId(taskParallel.getParallelProcessInstanceId());
+                                    approvalVO.setYsNickName(taskParallel.getTaskUserName());
                                     taskApprovalVOS.add(approvalVO);
                                 }
                             }

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

@@ -29,6 +29,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.evisa.feign.EVisaClient;
 import org.springblade.evisa.redissionUtil.DistributedRedisLock;
 import org.springblade.evisa.vo.EVisaTaskApprovalVO;
@@ -550,6 +551,11 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
 
         List<TaskBatch> taskList = new ArrayList<>();
         for (TaskApprovalVO taskApprovalVO : taskApprovalVOS) {
+            //重签时，需要对应任务的签字人
+            if (ObjectUtil.isNotEmpty(taskApprovalVO.getYsNickName())){
+                nickName = taskApprovalVO.getYsNickName();
+            }
+
             //保存批次
             TaskBatch taskBatch = new TaskBatch(null, JSONObject.toJSONString(taskApprovalVO));
             taskBatch.setCreateUser(userId);