Commit 7cc2a9f3 authored by jiawei's avatar jiawei

修改 TBoxOperationController==》》getTBoxOperationPageList 返回区域名称和用户名

parent 3a0ac7eb
...@@ -82,6 +82,10 @@ public class TBoxOperation implements Serializable { ...@@ -82,6 +82,10 @@ public class TBoxOperation implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private String organName; private String organName;
@ApiModelProperty("用户名")
@TableField(exist = false)
private String userName;
@ApiModelProperty("机构名") @ApiModelProperty("机构名")
@TableField(exist = false) @TableField(exist = false)
private String organCode; private String organCode;
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<result column="update_time" property="updateTime"/> <result column="update_time" property="updateTime"/>
<result column="organ_name" property="organName"/> <result column="organ_name" property="organName"/>
<result column="area_name" property="areaName"/> <result column="area_name" property="areaName"/>
<result column="user_name" property="userName"></result>
<result column="permanent" property="permanent"/> <result column="permanent" property="permanent"/>
<result column="effective_date" property="effectiveDate"/> <result column="effective_date" property="effectiveDate"/>
<result column="exired_date" property="exiredDate"/> <result column="exired_date" property="exiredDate"/>
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
</select> </select>
<select id="selectPageList" resultMap="BaseResultMap"> <select id="selectPageList" resultMap="BaseResultMap">
SELECT b.id,b.organ_id,b.mac,b.status,b.area_id,b.create_time,b.update_time,u.user_name organ_name SELECT b.id,b.organ_id,b.mac,b.status,b.area_id,b.create_time,b.update_time,r.name organ_name ,u.user_name
FROM t_box_operation b FROM t_box_operation b
left join t_organ r on r.id = b.organ_id left join t_organ r on r.id = b.organ_id
left join t_user u on u.org_id = b.organ_id and u.type = '3' left join t_user u on u.org_id = b.organ_id and u.type = '3'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment