1550076451 11 months ago
parent
commit
152df7b5ab

+ 9 - 1
hjzx-api/src/main/java/api/controller/system/UserController.java

@@ -2,6 +2,7 @@ package api.controller.system;
2 2
 
3 3
 import api.entity.database.call.CallLog;
4 4
 import api.entity.database.system.*;
5
+import api.entity.input.system.UserInput;
5 6
 import api.entity.view.call.CallLogView;
6 7
 import api.entity.view.system.CustomerView;
7 8
 import api.entity.view.system.UserView;
@@ -46,8 +47,10 @@ public class UserController extends BaseController {
46 47
     @ApiOperation("列表")
47 48
     @Log(title = "查询用户信息表列表", businessType = BusinessType.QUERY)
48 49
     @GetMapping
49
-    public AjaxResult getList(User input, PageInput pageInput) {
50
+    @Anonymous
51
+    public AjaxResult getList(UserInput input, PageInput pageInput) {
50 52
         LambdaQueryWrapper<User> qw = new LambdaQueryWrapper();
53
+
51 54
         qw.eq(input.getUserId() != null && input.getUserId() > 0, User::getUserId, input.getUserId());
52 55
        // qw.eq(input.getDeptId() != null && input.getDeptId() > 0, User::getDeptId, input.getDeptId());
53 56
         if (input.getDeptId() != null &&input.getDeptId()>0)
@@ -60,6 +63,11 @@ public class UserController extends BaseController {
60 63
                 wq.or().eq(User::getDeptId,input.getDeptId());
61 64
             });
62 65
         }
66
+        //查询角色
67
+        if (input.getRoleId()!=null&&input.getRoleId()>0)
68
+        {
69
+            qw.inSql(User::getUserId, "select user_id from sys_user_role where role_id="+input.getRoleId());
70
+        }
63 71
         qw.like(!StringHelper.isEmpty(input.getUserName()), User::getUserName, input.getUserName());
64 72
         qw.like(!StringHelper.isEmpty(input.getNickName()), User::getNickName, input.getNickName());
65 73
         qw.eq(!StringHelper.isEmpty(input.getUserType()), User::getUserType, input.getUserType());

BIN
hjzx-api/target/classes/api/controller/system/AreaController.class


+ 11 - 0
hjzx-entity/src/main/java/api/entity/input/system/UserInput.java

@@ -0,0 +1,11 @@
1
+package api.entity.input.system;
2
+
3
+import api.entity.database.system.User;
4
+import lombok.Data;
5
+
6
+@Data
7
+public class UserInput extends User {
8
+
9
+    //角色id
10
+    private Long roleId;
11
+}

+ 3 - 1
hjzx-entity/src/main/java/api/entity/view/system/UserView.java

@@ -11,7 +11,7 @@ import java.util.List;
11 11
 public class UserView extends User {
12 12
     /** 部门 */
13 13
     private Dept dept;
14
-
14
+    private String roleName;
15 15
     /** 角色对象 */
16 16
     private List<Role> roles;
17 17
 
@@ -19,4 +19,6 @@ public class UserView extends User {
19 19
     private List<Long> roleIds;
20 20
 
21 21
     private String extension;
22
+
23
+
22 24
 }

BIN
hjzx-entity/target/classes/api/entity/input/system/UserInput.class


+ 4 - 4
hjzx-mapper/src/main/resources/mapper/report/ReportMapper.xml

@@ -285,8 +285,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
285 285
 	</select>
286 286
 	<select id="selectSatisfaction"  parameterType="Date" resultMap="SatisfactionViewResult">
287 287
 		select
288
-		count(myd=1 or null  )  basically,
289
-		count(myd=2 and is_answer=1 or null  )  satisfied,
288
+		count(myd=2 or null  )  basically,
289
+		count(myd=1 and is_answer=1 or null  )  satisfied,
290 290
 		count(myd=3 and is_answer=1 or null  )  dissatisfied
291 291
 		from rep_record
292 292
 		where  DATE_FORMAT(create_time, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')
@@ -397,8 +397,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
397 397
 		SUM(CASE WHEN call_type = 2 AND is_answer = 0 THEN 1 ELSE 0 END) AS outbound_not_connected,
398 398
 		SUM(CASE WHEN call_type = 1 AND is_answer = 1
399 399
 		THEN TIMESTAMPDIFF(SECOND, answer_time, hangup_time)  ELSE 0 END) call_duration,
400
-		count(myd=1 or null  )  basically,
401
-		count(myd=2 or null  )  satisfied,
400
+		count(myd=2 or null  )  basically,
401
+		count(myd=1 or null  )  satisfied,
402 402
 		count(myd=3  or null  )  dissatisfied
403 403
 		from rep_record
404 404
 		where 1=1

+ 63 - 25
hjzx-mapper/src/main/resources/mapper/system/UserMapper.xml

@@ -23,6 +23,7 @@
23 23
         <result property="updateBy" column="update_by"/>
24 24
         <result property="updateTime" column="update_time"/>
25 25
         <result property="remark" column="remark"/>
26
+        <result property="roleName" column="roleName"/>
26 27
         <association property="dept" column="dept_id" javaType="api.entity.database.system.Dept"
27 28
                      resultMap="deptResult"/>
28 29
     </resultMap>
@@ -83,31 +84,68 @@
83 84
     </sql>
84 85
 
85 86
     <sql id="selectUserDeptVo">
86
-select * from (
87
-        select u.user_id,
88
-               u.dept_id,
89
-               u.user_name,
90
-               u.nick_name,
91
-               u.email,
92
-               u.avatar,
93
-               u.phonenumber,
94
-               u.password,
95
-               u.sex,
96
-               u.status,
97
-               u.del_flag,
98
-               u.login_ip,
99
-               u.login_date,
100
-               u.create_by,
101
-               u.create_time,
102
-               u.remark,
103
-               d.parent_id,
104
-               d.ancestors,
105
-               d.dept_name,
106
-               d.order_num,
107
-               d.leader,
108
-               d.status as dept_status
109
-        from sys_user u
110
-        left join sys_dept d on u.dept_id = d.dept_id) as u
87
+        SELECT *from (
88
+        SELECT
89
+        u.user_id,
90
+        u.dept_id,
91
+        u.user_name,
92
+        u.nick_name,
93
+        u.email,
94
+        u.avatar,
95
+        u.phonenumber,
96
+        u.password,
97
+        u.sex,
98
+        u.status,
99
+        u.del_flag,
100
+        u.login_ip,
101
+        u.login_date,
102
+        u.create_by,
103
+        u.create_time,
104
+        u.remark,
105
+        u.parent_id,
106
+        u.ancestors,
107
+        u.dept_name,
108
+        u.order_num,
109
+        u.leader,
110
+        u.dept_status,
111
+        COALESCE(GROUP_CONCAT(DISTINCT r.role_name ORDER BY r.role_name SEPARATOR ','), '') AS roleName
112
+        FROM (
113
+        SELECT
114
+        su.*,
115
+        d.parent_id,
116
+        d.ancestors,
117
+        d.dept_name,
118
+        d.order_num,
119
+        d.leader,
120
+        d.status AS dept_status
121
+        FROM sys_user su
122
+        LEFT JOIN sys_dept d ON su.dept_id = d.dept_id
123
+        ) AS u
124
+        LEFT JOIN sys_user_role ur ON ur.user_id = u.user_id
125
+        LEFT JOIN sys_role r ON ur.role_id = r.role_id
126
+        GROUP BY
127
+        u.user_id,
128
+        u.dept_id,
129
+        u.user_name,
130
+        u.nick_name,
131
+        u.email,
132
+        u.avatar,
133
+        u.phonenumber,
134
+        u.password,
135
+        u.sex,
136
+        u.status,
137
+        u.del_flag,
138
+        u.login_ip,
139
+        u.login_date,
140
+        u.create_by,
141
+        u.create_time,
142
+        u.remark,
143
+        u.parent_id,
144
+        u.ancestors,
145
+        u.dept_name,
146
+        u.order_num,
147
+        u.leader,
148
+        u.dept_status) as u
111 149
     </sql>
112 150
 
113 151
     <select id="selectUserDeptList" resultMap="SysUserResult" >