2 Achegas b02b2de9fa ... 67af169f9a

Autor SHA1 Mensaxe Data
  jihs 67af169f9a Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-service %!s(int64=3) %!d(string=hai) anos
  jihs 7ef210ce3d 更新 %!s(int64=3) %!d(string=hai) anos

+ 18 - 2
jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActBusinessController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
@@ -23,14 +24,14 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
-
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  *
@@ -212,4 +213,19 @@ public class ActBusinessController {
         });
         return Result.ok(actBusinessList);
     }
+
+
+    @RequestMapping(value = "/getTableInfoList")
+    @ResponseBody
+    public Result<Object> listData(){
+        List<Map> list = new ArrayList();
+        Map map = Maps.newHashMap();
+        map.put("text", "实例表单1");
+        map.put("routeName", 1);
+        map.put("businessTable", "test_demo1");
+        list.add(map);
+        return Result.ok(list);
+    }
+
+
 }