工作组 新增方法

adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml

@@ -2,8 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.wgDept.dao.WgDeptDao">
 
-    <select id="researchDatas" resultType="com.adc.da.slrs.wgDept.entity.WgDept">
-        select * from wg_dept where wg_dept.wg_id =#{data}
+    <select id="researchDatas" resultType="com.adc.da.slrs.wgDept.entity.WgDeptShow">
+        select wg_dept.* ,ts_user.UNAME as name ,ts_user.PHONE as phone ,ts_user.EMAIL as email,ts_user.INSTITUTION_ID as deptId
+        ,ts_user.INSTITUTION_NAME as deptName
+        from wg_dept
+        left join ts_user on ts_user.ACCOUNT = wg_dept.dept_people_id
+        where wg_dept.wg_id =#{data}
     </select>
 
 </mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingInfo/WgMeetingInfoMapper.xml

@@ -2,7 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.wgMeetingInfo.dao.WgMeetingInfoDao">
 
-    <select id="researchDatas" resultType="com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo">
+    <resultMap id="WgMeetingInfos" type="com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo">
+
+        <id property="id" column="id"/>
+        <result property="wgId" column="wg_id"/>
+        <result property="meetingTime" column="meeting_time"/>
+        <result property="meetingName" column="meeting_name"/>
+        <result property="meetingReport" column="meeting_report"/>
+        <result property="joinfile" column="joinfile"/>
+        <result property="joinId" column="join_id"/>
+        <association property="joinMeetingPeopleInfo" javaType="java.util.List" column="id"
+                     select="com.adc.da.slrs.wgMeetingUserRelation.dao.WgMeetingUserRelationDao.getMeetingPeoples"/>
+    </resultMap>
+
+
+    <select id="researchDatas" resultMap="WgMeetingInfos">
       select * from  wg_meeting_info where wg_meeting_info.wg_id = #{data}
     </select>
 

adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingUserRelation/WgMeetingUserRelationMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.wgMeetingUserRelation.dao.WgMeetingUserRelationDao">
+
+
+    <select id="getMeetingPeoples"
+            resultType="com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelationShow">
+        select wg_meeting_user_relation.*,ts_user.UNAME as name from wg_meeting_user_relation
+        left join ts_user on ts_user.ACCOUNT = wg_meeting_user_relation.user_id
+        where wg_meeting_user_relation.meeting_id = #{meetId}
+    </select>
+</mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml

@@ -2,8 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.wgNetInfo.dao.WgNetInfoDao">
 
-    <select id="researchDatas" resultType="com.adc.da.slrs.wgNetInfo.entity.WgNetInfo">
-      select * from  wg_net_info where  wg_net_info.wg_id =#{data}
+    <select id="researchDatas" resultType="com.adc.da.slrs.wgNetInfo.entity.WgNetInfoDTO">
+      select wg_net_info.net_id,ts_user.UNAME as name ,ts_user.PHONE as phone, ts_user.EMAIL as email
+      ,wg_net_info.id,wg_net_info.wg_id , wg_net_info.join_id
+      from   wg_net_info
+      left join ts_user on ts_user.ACCOUNT = wg_net_info.net_id
+      where  wg_net_info.wg_id =#{data}
     </select>
 
 </mapper>