Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liqin
chnmuseum-party
Commits
7cc2a9f3
Commit
7cc2a9f3
authored
May 06, 2021
by
jiawei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 TBoxOperationController==》》getTBoxOperationPageList 返回区域名称和用户名
parent
3a0ac7eb
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
62 additions
and
25 deletions
+62
-25
TBoxOperation.java
src/main/java/cn/chnmuseum/party/model/TBoxOperation.java
+4
-0
TBoxOperationController.java
...nmuseum/party/web/controller/TBoxOperationController.java
+56
-24
TBoxOperationMapper.xml
src/main/resources/mapper/TBoxOperationMapper.xml
+2
-1
No files found.
src/main/java/cn/chnmuseum/party/model/TBoxOperation.java
View file @
7cc2a9f3
...
@@ -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
;
...
...
src/main/java/cn/chnmuseum/party/web/controller/TBoxOperationController.java
View file @
7cc2a9f3
This diff is collapsed.
Click to expand it.
src/main/resources/mapper/TBoxOperationMapper.xml
View file @
7cc2a9f3
...
@@ -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'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment