1550076451 лет назад: 2
Родитель
Сommit
592dfdff0f

+ 6 - 0
zxkf-api/src/main/java/api/controller/system/WorkroderTypeController.java

@@ -3,6 +3,7 @@ package api.controller.system;
3 3
 import api.entity.database.call.CallLog;
4 4
 import api.entity.database.system.Menu;
5 5
 import api.entity.database.system.WorkroderType;
6
+import api.entity.view.system.WorkroderTypeView;
6 7
 import api.service.system.IWorkroderTypeService;
7 8
 import api.util.annotation.Anonymous;
8 9
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -180,7 +181,12 @@ public class WorkroderTypeController extends BaseController {
180 181
         return Success("获取菜单下拉树列表成功", workrodertypeService.buildMenuTreeSelect(menus));
181 182
     }
182 183
 
184
+    @GetMapping("/GetWorkroderTypeView")
185
+    public AjaxResult treeselect(long id) {
183 186
 
187
+        List<WorkroderTypeView> WorkroderType = workrodertypeService.selectWorkroderType(id);
188
+        return Success("获取菜单下拉树列表成功",WorkroderType);
189
+    }
184 190
 
185 191
 
186 192
 }

+ 14 - 0
zxkf-entity/src/main/java/api/entity/view/system/WorkroderTypeView.java

@@ -0,0 +1,14 @@
1
+package api.entity.view.system;
2
+
3
+import api.entity.database.system.WorkroderType;
4
+import io.swagger.annotations.ApiModelProperty;
5
+import lombok.Data;
6
+
7
+import java.util.List;
8
+@Data
9
+public class WorkroderTypeView extends WorkroderType {
10
+
11
+    /** 角色组 */
12
+    @ApiModelProperty("ancestorsName")
13
+    private String  ancestorsName;
14
+}

+ 7 - 0
zxkf-mapper/src/main/java/api/mapper/system/WorkroderTypeMapper.java

@@ -1,10 +1,17 @@
1 1
 package api.mapper.system;
2 2
 
3
+import api.entity.database.Report.RecordReport;
4
+import api.entity.database.Report.ScreenReport;
3 5
 import api.entity.database.system.WorkroderType;
6
+import api.entity.view.system.WorkroderTypeView;
4 7
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5 8
 
6 9
 import org.apache.ibatis.annotations.Mapper;
7 10
 
11
+import java.util.List;
12
+
8 13
 @Mapper
9 14
 public interface WorkroderTypeMapper extends BaseMapper<WorkroderType> {
15
+
16
+    public List<WorkroderTypeView> selectWorkroderType(long id);
10 17
 }

+ 29 - 0
zxkf-mapper/src/main/resources/mapper/system/WorkroderTypeMapper.xml

@@ -0,0 +1,29 @@
1
+<?xml version="1.0" encoding="UTF-8" ?>
2
+<!DOCTYPE mapper
3
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
4
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
5
+<mapper namespace="api.mapper.system.WorkroderTypeMapper">
6
+    <resultMap type="api.entity.view.system.WorkroderTypeView" id="SysWorkroderType">
7
+        <id     property="id"     column="id"     />
8
+        <result property="parentId"   column="parent_id"   />
9
+        <result property="ancestors"  column="ancestors"   />
10
+        <result property="typeCode"   column="type_code"   />
11
+        <result property="typeName"   column="type_name"   />
12
+        <result property="typeOrder"     column="type_order"      />
13
+        <result property="create_time"      column="create_time"       />
14
+        <result property="isDelete"      column="is_delete"       />
15
+        <result property="createBy"     column="create_by"      />
16
+        <result property="ancestorsName"    column="ancestorsName"    />
17
+
18
+    </resultMap>
19
+    <select id="selectWorkroderType" resultType="Long" resultMap="SysWorkroderType">
20
+        select *,
21
+        (SELECT
22
+        GROUP_CONCAT(b.`type_name` SEPARATOR '/')   from workroder_type  b  where FIND_IN_SET(b.id,CONCAT( a.ancestors,',',a.id))  )   ancestorsName
23
+        FROM  workroder_type a where a.is_delete=0
24
+        <if test="id >0 ">
25
+            and  a.id=#{id}
26
+        </if>
27
+        order by a.id
28
+    </select>
29
+</mapper> 

+ 4 - 0
zxkf-service/src/main/java/api/service/system/IWorkroderTypeService.java

@@ -3,6 +3,7 @@ package api.service.system;
3 3
 import api.entity.database.system.Menu;
4 4
 import api.entity.database.system.WorkroderType;
5 5
 import api.entity.view.TreeSelect;
6
+import api.entity.view.system.WorkroderTypeView;
6 7
 import api.service.IBaseService;
7 8
 
8 9
 import java.util.List;
@@ -23,5 +24,8 @@ public interface IWorkroderTypeService extends IBaseService<WorkroderType> {
23 24
 
24 25
     public List<WorkroderType> buildMenuTree(List<WorkroderType> menus);
25 26
 
27
+
28
+    public List<WorkroderTypeView> selectWorkroderType(long id);
29
+
26 30
 }
27 31
 

+ 9 - 3
zxkf-service/src/main/java/api/service/system/impl/WorkroderTypeServiceImpl.java

@@ -1,12 +1,13 @@
1 1
 package api.service.system.impl;
2 2
 
3 3
 
4
-import api.entity.database.system.Menu;
5 4
 import api.entity.database.system.WorkroderType;
6 5
 import api.entity.view.TreeSelect;
6
+import api.entity.view.system.WorkroderTypeView;
7 7
 import api.mapper.system.WorkroderTypeMapper;
8 8
 import api.service.BaseServiceImpl;
9 9
 import api.service.system.IWorkroderTypeService;
10
+import org.springframework.beans.factory.annotation.Autowired;
10 11
 import org.springframework.stereotype.Service;
11 12
 import org.springframework.transaction.annotation.Transactional;
12 13
 
@@ -19,8 +20,13 @@ import java.util.stream.Collectors;
19 20
 @Service
20 21
 public class WorkroderTypeServiceImpl extends BaseServiceImpl<WorkroderTypeMapper, WorkroderType> implements IWorkroderTypeService {
21 22
     public WorkroderTypeServiceImpl(){ super(false); }
22
-
23
-
23
+    @Autowired
24
+    private WorkroderTypeMapper workroderTypeMapper;
25
+    @Override
26
+    public List<WorkroderTypeView> selectWorkroderType(long id)
27
+    {
28
+        return workroderTypeMapper.selectWorkroderType(id);
29
+    }
24 30
     @Override
25 31
     public List<TreeSelect> buildMenuTreeSelect(List<WorkroderType> Type) {
26 32
         List<WorkroderType> menuTrees = buildMenuTree(Type);