oss

src/main/java/com/laowu/service/impl/TeamDictServiceImpl.java

@@ -48,6 +48,9 @@ public class TeamDictServiceImpl extends ServiceImpl<TeamDictMapper, TeamDictDO>
     @Autowired
     @Autowired
     private WorkstationAdministersMapper workstationAdministersMapper;
     private WorkstationAdministersMapper workstationAdministersMapper;
 
 
+    @Autowired
+    private MemberPositionsMapper memberPositionsMapper;
+
     public IPage<TeamsVO> teams(TeamsDTO teamsDTO) {
     public IPage<TeamsVO> teams(TeamsDTO teamsDTO) {
         Page pager = new Page(teamsDTO.getPageNum(), teamsDTO.getPageSize());
         Page pager = new Page(teamsDTO.getPageNum(), teamsDTO.getPageSize());
         return this.baseMapper.teams(pager, teamsDTO.getStationId(), teamsDTO.getTeamName(),teamsDTO.getProvince());
         return this.baseMapper.teams(pager, teamsDTO.getStationId(), teamsDTO.getTeamName(),teamsDTO.getProvince());
@@ -287,7 +290,7 @@ public class TeamDictServiceImpl extends ServiceImpl<TeamDictMapper, TeamDictDO>
     }
     }
 
 
 
 
-    public IPage<MemberManagementVO> memberManagement(MemberManagementDTO memberManagementDTO) {
+    public IPage<MemberManagementVO>  memberManagement(MemberManagementDTO memberManagementDTO) {
 
 
         Page pager = new Page(memberManagementDTO.getPageNum(), memberManagementDTO.getPageSize());
         Page pager = new Page(memberManagementDTO.getPageNum(), memberManagementDTO.getPageSize());
 
 
@@ -314,6 +317,9 @@ public class TeamDictServiceImpl extends ServiceImpl<TeamDictMapper, TeamDictDO>
                 memberManagementVO.setCompanyCounty(recentJobInfoVO.getCounty());
                 memberManagementVO.setCompanyCounty(recentJobInfoVO.getCounty());
                 memberManagementVO.setCompanyAddress(recentJobInfoVO.getAddress());
                 memberManagementVO.setCompanyAddress(recentJobInfoVO.getAddress());
             }
             }
+            //技能
+            List<PositionDictDO> positionDictDOS = memberPositionsMapper.memberPositions(memberManagementVO.getId());
+            memberManagementVO.setPositionDictDOList(positionDictDOS);
         }
         }
         return memberManagementVOIPage;
         return memberManagementVOIPage;
     }
     }

src/main/java/com/laowu/vo/team/MemberManagementVO.java

 package com.laowu.vo.team;
 package com.laowu.vo.team;
 
 
+import com.laowu.model.PositionDictDO;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.util.List;
+
 @Data
 @Data
 public class MemberManagementVO {
 public class MemberManagementVO {
 
 
@@ -21,6 +24,8 @@ public class MemberManagementVO {
 
 
     private String city;
     private String city;
 
 
+    private String county;
+
     private String address;
     private String address;
 
 
     private String startDate;
     private String startDate;
@@ -47,5 +52,6 @@ public class MemberManagementVO {
 
 
     private String companyAddress;
     private String companyAddress;
 
 
+    private List<PositionDictDO> positionDictDOList;
 
 
 }
 }

src/main/resources/mapper/MemberTeamMappingMapper.xml

@@ -39,13 +39,15 @@
          member_dict t1
          member_dict t1
         WHERE
         WHERE
          t1.delete_date IS NULL
          t1.delete_date IS NULL
-         AND t1.id NOT IN (
+        AND t1.id IN (
          SELECT
          SELECT
-          t2.member_id
+          t1.member_id
          FROM
          FROM
-          member_team_mapping t2
+          workstation_member_mapping t1
+         LEFT JOIN team_dict t2 ON t1.station_id = t2.station_id
          WHERE
          WHERE
-          t2.team_id = #{teamId}
+          t2.id = #{teamId}
+         AND t1.delete_date IS NULL
          AND t2.delete_date IS NULL
          AND t2.delete_date IS NULL
          )
          )
          <if test="userName != null and userName != ''">
          <if test="userName != null and userName != ''">

src/main/resources/mapper/TeamDictMapper.xml

@@ -129,6 +129,7 @@
             t1.id_card,
             t1.id_card,
             t1.province,
             t1.province,
             t1.city,
             t1.city,
+            t1.county,
             t1.address,
             t1.address,
             t1.start_date,
             t1.start_date,
             t1.end_date,
             t1.end_date,
@@ -137,16 +138,12 @@
             t1.is_party
             t1.is_party
         FROM
         FROM
         member_dict t1
         member_dict t1
-        LEFT JOIN member_team_mapping t2 ON t1.id = t2.member_id
-        LEFT JOIN team_dict t3 ON t2.team_id = t3.id
-        LEFT JOIN workstation_member_mapping t5 ON t1.id = t5.member_id
-        LEFT JOIN workstation_dict t4 ON t5.station_id = t4.id
+        LEFT JOIN workstation_member_mapping t5 ON t1.id = t5.member_id and t5.delete_date is null
+        LEFT JOIN workstation_dict t4 ON t5.station_id = t4.id AND t4.delete_date IS NULL
+        LEFT JOIN member_team_mapping t2 ON t1.id = t2.member_id AND t2.delete_date IS NULL
+        LEFT JOIN team_dict t3 ON t2.team_id = t3.id AND t3.delete_date IS NULL
         WHERE
         WHERE
             t1.delete_date IS NULL
             t1.delete_date IS NULL
-            AND t2.delete_date IS NULL
-            AND t3.delete_date IS NULL
-            AND t4.delete_date IS NULL
-            and t5.delete_date is null
             <if test="jobStatus != null and jobStatus != ''">
             <if test="jobStatus != null and jobStatus != ''">
                 AND t1.job_status = #{jobStatus}
                 AND t1.job_status = #{jobStatus}
             </if>
             </if>

src/main/resources/mapper/WorkstationDictMapper.xml

@@ -100,23 +100,9 @@
             LEFT JOIN (
             LEFT JOIN (
             SELECT
             SELECT
                 t9.id,
                 t9.id,
-                sum( ct8 + ct9 ) AS ct1
+                sum( ct9 ) AS ct1
             FROM
             FROM
-                (
-                SELECT
-                    t1.id,
-                    count( DISTINCT t3.member_id ) AS ct8
-                FROM
-                    workstation_dict t1
-                    LEFT JOIN team_dict t2 ON t1.id = t2.station_id
-                    LEFT JOIN member_team_mapping t3 ON t2.id = t3.team_id
-                WHERE
-                    t1.id = #{stationId}
-                    AND t1.delete_date IS NULL
-                    AND t2.delete_date IS NULL
-                    AND t3.delete_date IS NULL
-                ) t9
-                LEFT JOIN (
+                 (
                 SELECT
                 SELECT
                     t1.id,
                     t1.id,
                     count( DISTINCT t2.id ) AS ct9
                     count( DISTINCT t2.id ) AS ct9
@@ -128,7 +114,7 @@
                     t2.delete_date IS NULL
                     t2.delete_date IS NULL
                     AND t3.delete_date IS NULL
                     AND t3.delete_date IS NULL
                     AND t1.id = #{stationId}
                     AND t1.id = #{stationId}
-                ) t10 ON t9.id = t10.id
+                ) t9
             ) t4 ON t1.id = t4.id
             ) t4 ON t1.id = t4.id
             LEFT JOIN (
             LEFT JOIN (
             SELECT
             SELECT