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

@@ -368,7 +368,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 createTaskModel(bean, taskName, "1", nextUserIds);
             } else {
                 // 已经在流程中，执行一步
-                ProcessTaskDTO processTaskDTO = submit(op, jgScrapCancelDto.getNextTaskId());
+                ProcessTaskDTO processTaskDTO = submit(jgScrapCancelDto.getNextTaskId());
                 String nextTaskId = processTaskDTO.getNextTask().get(0).getId();
                 String taskName = processTaskDTO.getNextTask().get(0).getName();
                 this.buildRoleList(Collections.singletonList(processTaskDTO), roleListNext, roleListAll);
@@ -494,13 +494,13 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         }
     }
 
-    public ProcessTaskDTO submit(String op, String taskId) {
+    public ProcessTaskDTO submit(String taskId) {
         //组装信息
         TaskResultDTO dto = new TaskResultDTO();
         dto.setResultCode("approvalStatus");
         dto.setTaskId(taskId);
         HashMap<String, Object> map = new HashMap<>();
-        map.put("approvalStatus", op);
+        map.put("approvalStatus", "提交");
         dto.setVariable(map);
         return cmWorkflowService.complete(taskId, dto);
     }