FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

工作组 单位不回显bug修复

Browse Source
This commit is contained in:
yuezhihang
2021-12-15 10:14:45 +08:00
parent 1062cd6c36
commit 99f33ac218
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java
+3 -3
View File
@@ -54,11 +54,11 @@ public class WgDeptShow extends BaseEntity {
@ApiModelProperty(value = "中文名")
private String name;
@ApiModelProperty(value = "单位")
@ApiModelProperty(value = "单位名称")
private String unit;
@ApiModelProperty(value = "单位名称")
private String unitName;
@ApiModelProperty(value = "单位")
private String unitId;
@ApiModelProperty(value = "电话")
private String phone;
adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java
+3 -3
View File
@@ -48,11 +48,11 @@ public class WgNetInfoDTO extends BaseEntity {
@ApiModelProperty(value = "中文名")
private String name;
@ApiModelProperty(value = "单位")
@ApiModelProperty(value = "单位名称")
private String unit;
@ApiModelProperty(value = "单位名称")
private String unitName;
@ApiModelProperty(value = "单位")
private String unitId;
@ApiModelProperty(value = "电话")
private String phone;
adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml
+2 -2
View File
@@ -12,8 +12,8 @@
</select>
<select id="researchAllDatas" resultType="com.adc.da.slrs.wgDept.entity.WgDeptShow">
select wg_dept.* ,ts_user.UNAME as name ,wg_dept.PHONE as phone ,wg_dept.EMAIL as email,ts_user.INSTITUTION_ID as deptId
,ts_user.INSTITUTION_NAME as deptName ,ts_institution.name as unitName , ts_institution.id as unit
select wg_dept.* ,concat(ts_user.UNAME,concat('(',concat(ts_user.USID,')'))) as name ,wg_dept.PHONE as phone ,wg_dept.EMAIL as email,ts_user.INSTITUTION_ID as deptId
,ts_user.INSTITUTION_NAME as deptName ,ts_institution.name as unit , ts_institution.id as unitId
from wg_dept
left join ts_user on ts_user.ACCOUNT = wg_dept.dept_people_id
left join wg_work_group on wg_work_group.id = wg_dept.wg_id
adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingUserRelation/WgMeetingUserRelationMapper.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<select id="getMeetingAllPeoples"
resultType="com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelationShow">
select wg_meeting_user_relation.*,ts_user.UNAME as name from wg_meeting_user_relation
select wg_meeting_user_relation.*,concat(ts_user.UNAME,concat('(',concat(ts_user.USID,')'))) as name from wg_meeting_user_relation
left join ts_user on ts_user.ACCOUNT = wg_meeting_user_relation.user_id
left join wg_meeting_info on wg_meeting_info.id = wg_meeting_user_relation.meeting_id
left join wg_work_group on wg_work_group.id = wg_meeting_info.wg_id
adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml
+3 -2
View File
@@ -11,11 +11,12 @@
</select>
<select id="researchAllDatas" resultType="com.adc.da.slrs.wgNetInfo.entity.WgNetInfoDTO">
select wg_net_info.net_id,ts_user.UNAME as name ,wg_net_info.PHONE as phone, wg_net_info.EMAIL as email
,wg_net_info.id,wg_net_info.wg_id , wg_net_info.join_id
select wg_net_info.net_id,concat(ts_user.UNAME,concat('(',concat(ts_user.USID,')'))) as name ,wg_net_info.PHONE as phone, wg_net_info.EMAIL as email
,wg_net_info.id,wg_net_info.wg_id , wg_net_info.join_id ,ts_institution.name as unit , ts_institution.id as unitId
from wg_net_info
left join ts_user on ts_user.ACCOUNT = wg_net_info.net_id
left join wg_work_group on wg_work_group.id = wg_net_info.wg_id
left join ts_institution ON ts_institution.id = (SELECT parent_id from ts_institution WHERE id = ts_user.INSTITUTION_ID)
where wg_work_group.type = #{type}
</select>