commit
This commit is contained in:
+3
-1
@@ -305,10 +305,12 @@ public class ActivityUnionManageController {
|
|||||||
u.unionname,
|
u.unionname,
|
||||||
u.sex,
|
u.sex,
|
||||||
u.mobile,
|
u.mobile,
|
||||||
atp.applyDateTime
|
atp.applyDateTime,
|
||||||
|
u2.username applyUserName
|
||||||
FROM
|
FROM
|
||||||
`activity_tissue_person` atp
|
`activity_tissue_person` atp
|
||||||
LEFT JOIN `user` u ON u.id = atp.userId
|
LEFT JOIN `user` u ON u.id = atp.userId
|
||||||
|
LEFT JOIN sys_user u2 ON u2.id=applyUserId
|
||||||
$condition
|
$condition
|
||||||
""");
|
""");
|
||||||
Cnd cnd = Cnd.NEW();
|
Cnd cnd = Cnd.NEW();
|
||||||
|
|||||||
+3
-1
@@ -97,10 +97,12 @@ public class ActivityUnionUserStatisticsController {
|
|||||||
u.mobile,
|
u.mobile,
|
||||||
atp.applyUserId,
|
atp.applyUserId,
|
||||||
atp.id atpId ,
|
atp.id atpId ,
|
||||||
atp.applyDateTime
|
atp.applyDateTime,
|
||||||
|
u2.username applyUserName
|
||||||
FROM
|
FROM
|
||||||
`activity_tissue_person` atp
|
`activity_tissue_person` atp
|
||||||
LEFT JOIN `user` u ON u.id = atp.userId
|
LEFT JOIN `user` u ON u.id = atp.userId
|
||||||
|
LEFT JOIN sys_user u2 ON u2.id=applyUserId
|
||||||
$condition
|
$condition
|
||||||
""");
|
""");
|
||||||
Cnd cnd = Cnd.NEW();
|
Cnd cnd = Cnd.NEW();
|
||||||
|
|||||||
@@ -136,7 +136,8 @@
|
|||||||
{prop: 'mobile', label: '联系方式'},
|
{prop: 'mobile', label: '联系方式'},
|
||||||
{prop: 'unitname', label: '所属单位'},
|
{prop: 'unitname', label: '所属单位'},
|
||||||
{prop: 'unionname', label: '所属工会'},
|
{prop: 'unionname', label: '所属工会'},
|
||||||
{prop: 'applyDateTime', label: '报名时间'}
|
{prop: 'applyDateTime', label: '报名时间'},
|
||||||
|
{prop: 'applyUserName', label: '报名人'}
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user