单位变更增加参数 列表合并

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationUnitDto.java

@@ -136,4 +136,7 @@ public class JgChangeRegistrationUnitDto  extends BaseDto {
   @ApiModelProperty(value = "下一步任务id")
   private String nextTaskId;
 
+  @ApiModelProperty(value = "下一步执行人userids")
+  private String nextExecuteUseIds;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationUnit.java

@@ -222,4 +222,9 @@ public class JgChangeRegistrationUnit extends BaseEntity {
      */
     @TableField(value = "next_task_id")
     private String nextTaskId;
+    /**
+     *工作流下一节点执行人UseridS
+     */
+    @TableField(value = "next_execute_user_ids")
+    private String nextExecuteUseIds;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationUnitController.java

@@ -145,6 +145,12 @@ public class JgChangeRegistrationUnitController extends BaseController {
 	) {
 		Page<JgChangeRegistrationUnit> page = new Page<>(current, size);
 		ReginParams reginParams = getSelectedOrgInfo();
+		 ReginParams info = getSelectedOrgInfo();
+		if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)){
+			type = "enterprise";
+		}else {
+			type = "supervision";
+		}
 		return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryForJgChangeRegistrationUnitPage(page, model, type, reginParams));
 	}
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationUnitServiceImpl.java

@@ -392,6 +392,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
         // 判断当前是否为提交
         List<String> instanceIdList = new ArrayList<>();
+        List<String> nextExecutorUserIds = new ArrayList<>();
         List<String> taskIds = new ArrayList<>();
         List<WorkflowResultDto> workflowResultDtos = new ArrayList<>();
         String nextExecutorRoleIds = "";
@@ -412,6 +413,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             List<ProcessTaskDTO> processTaskDTOS = cmWorkflowService.startBatch(actWorkflowBatchDTO);
             workflowResultDtos = commonServiceImpl.buildWorkFlowInfo(processTaskDTOS);
             nextExecutorRoleIds = workflowResultDtos.get(0).getNextExecutorRoleIds();
+            nextExecutorUserIds.add(workflowResultDtos.get(0).getNextExecutorUserIds());
             for (WorkflowResultDto processTaskDTO : workflowResultDtos) {
                 instanceIdList.add(processTaskDTO.getInstanceId());
                 taskIds.add(processTaskDTO.getNextTaskId());
@@ -496,8 +498,12 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             dto.setUseInnerCode(ValidationUtil.isEmpty(obj.get("USE_INNER_CODE")) ? "" : String.valueOf(obj.get("USE_INNER_CODE")));
             dto.setEquAddress((String.valueOf(obj.get("ADDRESS"))));
             dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
+
             jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
             jgRelationEquip.setUnitChangeRegistrationId(applyNo);
+            if (!CollectionUtils.isEmpty(nextExecutorUserIds)) {
+                dto.setNextExecuteUseIds(nextExecutorUserIds.get(0));
+            }
             if (!CollectionUtils.isEmpty(instanceIdList)) {
                 dto.setInstanceId(instanceIdList.get(i));
                 dto.setStatus(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());