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

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

@@ -318,6 +318,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                     taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
                     taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+                    if (WorkFlowStatusEnum.USE_SUBMIT.getCode().equals(taskCode) && "1".equals(operate)) {
+                        taskModelDto.setPageType("edit");
+                    }
                     commonServiceImpl.buildTaskModel(Collections.singletonList(taskModelDto));
                 } else {
                     workflowResultDto.setInstanceId(jgUseRegistration.getInstanceId());
@@ -459,6 +462,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jsonObject.put("nextExecuteUser", data.getNextExecuteIds());
         jsonObject.put("taskType", BusinessTypeEnum.JG_USAGE_REGISTRATION.getCode());
         jsonObject.put("equipId", jgUseRegistrationEq.getEquId());
+        if (!WorkFlowStatusEnum.USE_SUBMIT.getCode().equals(taskCode)) {
+            jsonObject.put("pageType", "look");
+        }
         // 撤回删除代办
         commonServiceImpl.rollbackTask(instanceId, jsonObject);
     }