实体新增字段、构建待办实体代码调整。

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

@@ -221,6 +221,15 @@ public class JgChangeRegistrationReform extends BaseEntity {
      */
     @TableField(value = "next_task_id")
     private String nextTaskId;
-
+    /**
+     * 创建人
+     */
+    @TableField("create_user_name")
+    private String createUserName;
+    /**
+     *
+     */
+    @TableField(value = "create_user_company_name")
+    private String createUserCompanyName;
 
 }

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/JgChangeRegistrationReformServiceImpl.java

@@ -207,7 +207,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 //                updateExecuteIds(instanceId, jgChangeRegistrationReform.getSequenceNbr(), "0");
             } else {
                 // 如果是新启动的流程开启自动访问
-
+                jgChangeRegistrationReform.setCreateUserName(reginParams.getUserModel().getRealName());
+                jgChangeRegistrationReform.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
                 ProcessTaskDTO processTaskDTO = startByVariable();
                 updateExecuteIds(instanceId, jgChangeRegistrationReform, "startWorkfow", processTaskDTO);
                 List<TaskModelDto> taskModelDtoList = Arrays.asList(getTaskModelDtoList(jgChangeRegistrationReform, processTaskDTO));
@@ -605,7 +606,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         //工作流创建时间
         taskModelDto.setFlowCreateDate(jgChangeRegistrationReform.getCreateDate());
         //工作流返回节点名称
-        taskModelDto.setTaskName(processTaskDTO.getNextTask().get(0).getName());
+        taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
         //taskCode 使用申请单编号
         taskModelDto.setTaskCode(jgChangeRegistrationReform.getApplyNo());
         //摘要
@@ -619,17 +620,17 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         //工作流实例id
         taskModelDto.setRelationId(jgChangeRegistrationReform.getInstanceId());
         //执行人id
-        taskModelDto.setExecuteUserIds(workflowResultDto.getExecutorId());
+        taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
         //任务状态code
-//        taskModelDto.setTaskStatus();
+        taskModelDto.setTaskStatus(commonServiceImpl.getDictionaryCodeByName(jgChangeRegistrationReform.getStatus()));
         //任务状态名称
         taskModelDto.setTaskStatusLabel(jgChangeRegistrationReform.getStatus());
         //任务创建人id
         taskModelDto.setStartUserId(jgChangeRegistrationReform.getCreateUserId());
         //任务创建人名称
-        taskModelDto.setStartUser(workflowResultDto.getStartUserName());
+        taskModelDto.setStartUser(jgChangeRegistrationReform.getCreateUserName());
         //任务发起人所在单位
-//        taskModelDto.setStartUserCompanyName(startUser.getCompanys().get(0).getCompanyName());
+        taskModelDto.setStartUserCompanyName(jgChangeRegistrationReform.getCreateUserCompanyName());
         //任务发起人发起时间
         taskModelDto.setStartDate(new Date());
         //跳转路径