数据应用申请增加列表展示字段

leiSP-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -61,7 +61,7 @@
 	</select>
 
 	<select id="selectMenuListByParentId" parameterType="Long" resultMap="SysMenuResult">
-		select m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, ifnull(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
+		select m.menu_id, m.parent_id, m.menu_name, (select menu_name from sys_menu where menu_id = m.parent_id) url, m.visible, ifnull(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m
 		where m.menu_type in ('M', 'C') and m.visible = 0 and m.parent_id = #{parentId}
 		order by m.order_num

mybusiness/src/main/java/com/sooka/system/controller/TUInterfaceinfoController.java

@@ -94,8 +94,8 @@ public class TUInterfaceinfoController extends BaseController {
     /**
      * 【数据应用审批管理】根据部门ID获取数据应用
      */
-    @GetMapping("/selectDataByDeptId/{deptId}")
-    public String selectDataByDeptId(@PathVariable("deptId") Long deptId, ModelMap mmap)
+    @GetMapping("/selectDataByDeptId/{deptId}/{shareType}")
+    public String selectDataByDeptId(@PathVariable("deptId") Long deptId, @PathVariable("shareType") String shareType, ModelMap mmap)
     {
         startPage();
         List<SysMenu> menuList = menuMapper.selectMenuListByParentId(deptId);
@@ -104,6 +104,8 @@ public class TUInterfaceinfoController extends BaseController {
             TUInterfaceinfo tuInterfaceinfo = new TUInterfaceinfo();
             tuInterfaceinfo.setId(menuList.get(i).getMenuId().toString());
             tuInterfaceinfo.setInterfaceName(menuList.get(i).getMenuName());
+            tuInterfaceinfo.setInterfaceAddress(menuList.get(i).getUrl());
+            tuInterfaceinfo.setShareType(shareType);
             list.add(tuInterfaceinfo);
         }
         mmap.put("list", list.stream().collect(Collectors.toList()));

mybusiness/src/main/resources/templates/applyData/record/add.html

@@ -174,10 +174,11 @@
     /**获取部门接口弹窗**/
     function selectInterface() {
         let deptId = $("#treeId").val();
+        let shareType = $("input[name='shareType']:checked").val();
         if(deptId == "" || deptId == null){
             $.modal.alertError('请先选择数据应用提供部门');
         }else{
-            let url = prefix + '/interfaceinfo/selectDataByDeptId/' + deptId;
+            let url = prefix + '/interfaceinfo/selectDataByDeptId/' + deptId + '/' + shareType;
             $.modal.open("请选择数据应用", url, ($(window).width() - 50),($(window).height() - 50), interfaceCallback);
         }
     }

mybusiness/src/main/resources/templates/applyData/record/edit.html

@@ -223,10 +223,11 @@
     /**获取部门接口弹窗**/
     function selectInterface() {
         let deptId = $("#treeId").val();
+        let shareType = $("input[name='shareType']:checked").val();
         if(deptId == "" || deptId == null){
             $.modal.alertError('请先选择数据应用提供部门');
         }else{
-            let url = prefix + '/interfaceinfo/selectDataByDeptId/' + deptId;
+            let url = prefix + '/interfaceinfo/selectDataByDeptId/' + deptId + '/' + shareType;
             $.modal.open("请选择数据应用", url, ($(window).width() - 50),($(window).height() - 50), interfaceCallback);
         }
     }

mybusiness/src/main/resources/templates/system/interfaceinfo/selectData.html

@@ -49,7 +49,13 @@
                 title: '主键ID',
                 visible: false
             },
-
+            {
+                field: 'rownum',
+                title: '序号',
+                formatter: function (value, item, index) {
+                    return index + 1;
+                },
+            },
             {
                 field: 'remark',
                 title: '注释',
@@ -65,6 +71,17 @@
                 title: '数据应用名称'
             },
             {
+                field: 'shareTyppe',
+                title: '数据来源',
+                formatter: function (value, item, index) {
+                    return $.table.selectDictLabel(shareType_datas, item.shareType);
+                },
+            },
+            {
+                field: 'interfaceAddress',
+                title: '数据应用所属部门'
+            },
+            {
                 field: 'infoItem',
                 title: '信息项',
                 visible: false

mybusiness/src/main/resources/templates/system/interfaceinfo/selectInterface.html

@@ -49,7 +49,13 @@
                 title: '主键ID',
                 visible: false
             },
-
+            {
+                field: 'rownum',
+                title: '序号',
+                formatter: function (value, item, index) {
+                    return index + 1;
+                },
+            },
             {
                 field: 'remark',
                 title: '注释',