Просмотр исходного кода

加一个单选按钮,接口来源:(省共享、市共享)

wangzhe 2 лет назад
Родитель
Сommit
10a32f0dfe

+ 25 - 0
leiSP-admin/src/main/java/com/sooka/web/controller/system/SysDeptController.java

@@ -167,6 +167,31 @@ public class SysDeptController extends BaseController
     }
 
     /**
+     * 接口申请选择部门树
+     *
+     * @param deptId 部门ID
+     * @param shareType 共享类型
+     */
+    @GetMapping(value = {"/selectDeptTreeByShareType/{deptId}/{shareType}" })
+    public String selectDeptTreeByShareType(@PathVariable("deptId") Long deptId,
+            @PathVariable(value = "shareType", required = false) String shareType, ModelMap mmap)
+    {
+        mmap.put("dept", deptService.selectDeptById(deptId));
+        mmap.put("shareType", shareType);
+        return "apply/record" + "/provideDeptTree";
+    }
+    /**
+     * 接口申请加载部门列表树
+     */
+    @GetMapping("/provideDeptTreeData/{shareType}")
+    @ResponseBody
+    public List<Ztree> provideDeptTreeData(@PathVariable(value = "shareType", required = false) String shareType)
+    {
+        List<Ztree> ztrees = deptService.selectProvideDeptTree(shareType);
+        return ztrees;
+    }
+
+    /**
      * 加载部门列表树
      */
     @GetMapping("/treeData")

+ 8 - 0
leiSP-system/src/main/java/com/sooka/system/mapper/SysDeptMapper.java

@@ -37,6 +37,14 @@ public interface SysDeptMapper
     public List<SysDept> selectDeptList(SysDept dept);
 
     /**
+     * 查询接口提供部门数据
+     *
+     * @param shareType 共享类型
+     * @return 部门信息集合
+     */
+    public List<SysDept> selectProvideDeptList(String shareType);
+
+    /**
      * 删除部门管理信息
      * 
      * @param deptId 部门ID

+ 8 - 0
leiSP-system/src/main/java/com/sooka/system/service/ISysDeptService.java

@@ -29,6 +29,14 @@ public interface ISysDeptService
     public List<Ztree> selectDeptTree(SysDept dept);
 
     /**
+     * 查询接口提供部门数据
+     *
+     * @param shareType 共享类型
+     * @return 部门信息集合
+     */
+    public List<Ztree> selectProvideDeptTree(String shareType);
+
+    /**
      * 查询部门管理树(排除下级)
      * 
      * @param dept 部门信息

+ 15 - 0
leiSP-system/src/main/java/com/sooka/system/service/impl/SysDeptServiceImpl.java

@@ -58,6 +58,21 @@ public class SysDeptServiceImpl implements ISysDeptService
     }
 
     /**
+     * 查询部门管理树
+     *
+     * @param shareType 共享类型
+     * @return 所有部门信息
+     */
+    @Override
+    @DataScope(deptAlias = "d")
+    public List<Ztree> selectProvideDeptTree(String shareType)
+    {
+        List<SysDept> deptList = deptMapper.selectProvideDeptList(shareType);
+        List<Ztree> ztrees = initZtree(deptList);
+        return ztrees;
+    }
+
+    /**
      * 查询部门管理树(排除下级)
      * 
      * @param deptId 部门ID

+ 7 - 0
leiSP-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -51,6 +51,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		${params.dataScope}
 		order by d.parent_id, d.order_num
     </select>
+
+	<select id="selectProvideDeptList" parameterType="java.lang.String" resultMap="SysDeptResult">
+        <include refid="selectDeptVo"/>
+		left join t_u_interfaceinfo t on d.dept_id = t.dept_id
+        where d.del_flag = '0'
+		and t.share_type = #{shareType} group by d.dept_id
+    </select>
 	
 	<select id="checkDeptExistUser" parameterType="Long" resultType="int">
 		select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0'

+ 0 - 23
mybusiness/src/main/resources/static/visualization/js/echarts_div.js

@@ -9,29 +9,6 @@ function countAndPercent(year){
 	$.post("/visualization/countAndPercent",{
 		year:year
 	},function (res) {
-        // let res = new Object();
-        // let count = new Array();
-        // let percent = new Array();
-        // res.count = count;
-        // res.percent = percent;
-        // count.push({'shareType': '市共享', 'count': 0, 'percent': 0});
-        // count.push({'shareType': '市归集', 'count': 0, 'percent': 0});
-        // count.push({'shareType': '省上报', 'count': 0, 'percent': 0});
-        // count.push({'shareType': '省共享', 'count': 0, 'percent': 0});
-        // percent.push({'shareType': '市共享', 'count': 0, 'percent': 0});
-        // percent.push({'shareType': '市归集', 'count': 0, 'percent': 0});
-        // percent.push({'shareType': '省上报', 'count': 0, 'percent': 0});
-        // percent.push({'shareType': '省共享', 'count': 0, 'percent': 0});
-        // for(let i = 0; i < count.length; i++){
-        //     for(let j = 0; j < response.count.length; j++){
-        //         if(count[i].shareType == response.count[j].shareType){
-        //             count[i].count = parseInt(response.count[j].count);
-        //             count[i].percent = parseInt(response.count[j].percent);
-        //             percent[i].count = parseInt(response.count[j].count);
-        //             percent[i].percent = parseInt(response.count[j].percent);
-        //         }
-        //     }
-        // }
 		//渲染接口数量
 		if(res.count.length > 0){
 			$(".data1").remove();

+ 18 - 3
mybusiness/src/main/resources/templates/apply/record/add.html

@@ -47,8 +47,15 @@
                             </div>
                         </div>
                         <div class="form-group">
+                            <label class="col-sm-2 control-label is-required">接口来源</label>
+                            <div class="col-sm-4">
+                                <select class='form-control' id="shareType" name='shareType' onchange="changeShareType()">
+                                    <option value="share_type_1">市共享</option>
+                                    <option value="share_type_4">省共享</option>
+                                </select>
+                            </div>
                             <label class="col-sm-2 control-label is-required">接口提供部门</label>
-                            <div class="col-sm-10">
+                            <div class="col-sm-4">
                                 <div class="input-group">
                                     <input name="provideDeptName" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择归属部门" class="form-control" required>
                                     <input name="provideDeptId" type="hidden" id="treeId"/>
@@ -103,6 +110,11 @@
 <th:block th:include="include :: select2-js" />
 <th:block th:include="include :: bootstrap-fileinput-js" />
 <script th:inline="javascript">
+    function changeShareType(){
+        let shareType = $("#shareType").val();
+        // alert(shareType)
+    }
+
 
     let prefix = ctx + "system";
     let datas = [[${@dict.getType('share_type')}]];
@@ -206,9 +218,11 @@
 
     /**选择部门树**/
     function selectDeptTree() {
+        let shareType = $("#shareType").val();
         var treeId = $("#treeId").val();
         var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
-        var url = ctx + "system/dept/selectDeptTree/" + deptId;
+        // var url = ctx + "system/dept/selectDeptTree/" + deptId;
+        var url = ctx + "system/dept/selectDeptTreeByShareType/" + deptId + "/" + shareType;
         var options = {
             title: '选择部门',
             width: "380",
@@ -220,7 +234,8 @@
 
     function doSubmit(index, layero){
         var tree = layero.find("iframe")[0].contentWindow.$._tree;
-        if ($.tree.notAllowParents(tree)) {
+        // if ($.tree.notAllowParents(tree)) {
+        if (true) {//不能选择根节点
             var body = layer.getChildFrame('body', index);
             $("#treeId").val(body.find('#treeId').val());
             $("#treeName").val(body.find('#treeName').val());

+ 54 - 0
mybusiness/src/main/resources/templates/apply/record/provideDeptTree.html

@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+	<th:block th:include="include :: header('部门树选择')" />
+	<th:block th:include="include :: ztree-css" />
+</head>
+<style>
+	body{height:auto;font-family: "Microsoft YaHei";}
+	button{font-family: "SimSun","Helvetica Neue",Helvetica,Arial;}
+</style>
+<body class="hold-transition box box-main">
+	<input id="treeId"   name="treeId"    type="hidden" th:value="${dept.deptId}"/>
+	<input id="treeName" name="treeName"  type="hidden" th:value="${dept.deptName}"/>
+	<div class="wrapper"><div class="treeShowHideButton" onclick="$.tree.toggleSearch();">
+		<label id="btnShow" title="显示搜索" style="display:none;">︾</label>
+		<label id="btnHide" title="隐藏搜索">︽</label>
+	</div>
+	<div class="treeSearchInput" id="search">
+		<label for="keyword">关键字:</label><input type="text" class="empty" id="keyword" maxlength="50">
+		<button class="btn" id="btn" onclick="$.tree.searchNode()"> 搜索 </button>
+	</div>
+	<div class="treeExpandCollapse">
+		<a href="#" onclick="$.tree.expand()">展开</a> /
+		<a href="#" onclick="$.tree.collapse()">折叠</a>
+	</div>
+	<div id="tree" class="ztree treeselect"></div>
+	</div>
+	<th:block th:include="include :: footer" />
+	<th:block th:include="include :: ztree-js" />
+	<script th:inline="javascript">
+	    var prefix = ctx + "system/dept"
+	    var deptId = [[${deptId}]];
+	    var excludeId = [[${excludeId}]];
+	    var shareType = [[${shareType}]];
+		$(function() {
+			// var url = $.common.isEmpty(excludeId) ? prefix + "/treeData" + "/" + shareType: prefix + "/treeData/" + excludeId;
+			var url = prefix + "/provideDeptTreeData" + "/" + shareType;
+			var options = {
+		        url: url,
+		        expandLevel: 2,
+		        onClick : zOnClick
+		    };
+			$.tree.init(options);
+		});
+		
+		function zOnClick(event, treeId, treeNode) {
+		    var treeId = treeNode.id;
+		    var treeName = treeNode.name;
+		    $("#treeId").val(treeId);
+		    $("#treeName").val(treeName);
+		}
+	</script>
+</body>
+</html>