傅行帆 4 年 前
コミット
07a1fb7b43

+ 1
- 1
src/main/java/com/huiju/estateagents/property/controller/TpTicketController.java ファイルの表示

@@ -46,7 +46,7 @@ public class TpTicketController extends BaseController {
46 46
                     "status:流转状态(0:待分配  1:拒绝受理 2:待处理 3:正在处理 4:待评价 5:已评价 6:已终止')" +
47 47
                     "tpUserId:当前处理人" )
48 48
     })
49
-    @RequestMapping(value = "/ticketLiset", method = RequestMethod.POST)
49
+    @RequestMapping(value = "/admin/ticketLiset", method = RequestMethod.POST)
50 50
     public ResponseBean ticketLiset(@RequestBody String parameter, HttpServletRequest request){
51 51
         TaUser userElement = getTaUser(request);
52 52
         ResponseBean  responseBean = tpTicketService.ticketLiset(parameter,userElement.getOrgId());

+ 5
- 0
src/main/java/com/huiju/estateagents/property/model/TpTicket.java ファイルの表示

@@ -98,6 +98,11 @@ public class TpTicket implements Serializable {
98 98
      */
99 99
     private Integer updateUser;
100 100
 
101
+    /**
102
+     * 用户姓名
103
+     */
104
+    @TableField(exist = false)
105
+    private String userName;
101 106
     /**
102 107
      * 更新时间
103 108
      */

+ 3
- 4
src/main/resources/mapper/property/TpTicketMapper.xml ファイルの表示

@@ -21,8 +21,7 @@
21 21
     us.user_name
22 22
     FROM
23 23
     tp_ticket p
24
-    LEFT JOIN ta_user AS us ON p.create_user=us.id
25
-    LEFT JOIN tp_user AS u ON p.tp_user_id = u.id
24
+    LEFT JOIN ta_user AS us ON p.create_user=us.user_id
26 25
 <where>
27 26
     <if test="ticket.id != null and ticket.id !=''">
28 27
         and  p.id like concat('%',#{ticket.id,jdbcType=INTEGER},'%')
@@ -34,13 +33,13 @@
34 33
         and p.ticket_title like concat('%',#{ticket.ticketTitle,jdbcType=VARCHAR},'%')
35 34
     </if>
36 35
     <if test="userName != null and userName !=''">
37
-        and us.user_name like concat('%',#{ userName,jdbcType=VARCHAR},'%')
36
+        and AS.user_name like concat('%',#{ userName,jdbcType=VARCHAR},'%')
38 37
     </if>
39 38
     <if test="ticket.status != null and ticket.status !=''">
40 39
         and  p.status=#{ticket.status,jdbcType=INTEGER}
41 40
     </if>
42 41
     <if test="updateUserNmae != null and updateUserNmae !=''">
43
-        and u.user_name like concat('%',#{ updateUserNmae,jdbcType=VARCHAR},'%')
42
+        and us.user_name like concat('%',#{ updateUserNmae,jdbcType=VARCHAR},'%')
44 43
     </if>
45 44
     and p.org_id=#{orgId,jdbcType=INTEGER}
46 45
 </where>

+ 2
- 2
src/main/resources/mapper/property/UserMapper.xml ファイルの表示

@@ -5,8 +5,8 @@
5 5
         SELECT
6 6
          user_name
7 7
         FROM
8
-        tp_user
9
-        WHERE id=#{id,jdbcType=INTEGER}
8
+        ta_user
9
+        WHERE user_id=#{id,jdbcType=INTEGER}
10 10
     </select>
11 11
 
12 12
     <select id="userList" resultType="com.huiju.estateagents.property.model.User" >