Explorar el Código

对接任务流程修改

chenr hace 6 meses
padre
commit
252306eab0

+ 4 - 4
blade-service/blade-meter/src/main/java/org/springblade/meter/controller/APIController.java

@@ -204,7 +204,7 @@ public class APIController {
     @GetMapping("/task/getTaskProcessInfo")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "获取任务流程状态", notes = "taskId")
-    public List<Map<String, Object>> getTaskProcessInfo(Long taskId){
+    public R<List<Map<String, Object>>> getTaskProcessInfo(Long taskId){
         Task task = jdbcTemplate.query("SELECT * FROM u_task WHERE id = ?", new Object[]{taskId}, new BeanPropertyRowMapper<>(Task.class)).stream().findAny().orElse(null);
         if(task!=null){
             List<Map<String, Object>> taskProcessInfo = new LinkedList<>();
@@ -291,7 +291,7 @@ public class APIController {
 
                     taskProcessInfo.add(m);
                 }
-                    return  taskProcessInfo;
+                    return  R.data(200,taskProcessInfo,"操作成功");
 
                 /*非预设流程(默认顺序审批)*/
             } else if (ObjectUtil.isEmpty(task.getFixedFlowId()) || task.getFixedFlowId().equals(0L)) {
@@ -310,9 +310,9 @@ public class APIController {
                     }
                     taskProcessInfo.add(taskUserOther);
                 }
-                return  taskProcessInfo;
+                return  R.data(200,taskProcessInfo,"操作成功");
             }
         }
-        return null;
+        return R.data(200,null,"操作成功");
     }
 }