Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -117,4 +117,14 @@ public class JgChangeRegistrationReformDto extends BaseDto {
 
     private String unitCode;
 
+    private String nextTaskId;
+
+    private String createUserName;
+
+    private String createUserCompanyName;
+
+    private String equipListName;
+
+    private String nextExecuteUserIds;
+
 }

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

@@ -236,5 +236,10 @@ public class JgChangeRegistrationReform extends BaseEntity {
      */
     @TableField(value = "equip_list_name")
     private String equipListName;
+    /*
+     * 下一节点可执行人
+     */
+    @TableField("next_execute_user_ids")
+    private String nextExecuteUserIds;
 
 }

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

@@ -316,6 +316,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             map.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
             map.put("relationId", jgChangeRegistrationReform.getInstanceId());
             TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(map);
+            jgChangeRegistrationReform.setNextTaskId(null);
+            jgChangeRegistrationReform.setNextExecuteUserIds(null);
+            jgChangeRegistrationReform.setNextExecutorIds(null);
         }
         this.getBaseMapper().updateById(jgChangeRegistrationReform);
     }