维护成员

olive-console/src/main/java/com/zrqx/olive/project/controller/TeamController.java

@@ -8,7 +8,6 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -35,10 +34,10 @@ import com.zrqx.olive.project.service.StatisticsProjectService;
 import com.zrqx.olive.project.service.TeamMemberRelationService;
 import com.zrqx.olive.project.service.TeamRecordService;
 import com.zrqx.olive.project.service.TeamService;
-import com.zrqx.olive.project.vo.MemberListVo;
 import com.zrqx.olive.project.vo.ProjectVo;
 import com.zrqx.olive.project.vo.TeamMemberListVo;
 import com.zrqx.olive.project.vo.TeamRecordListVo;
+import com.zrqx.olive.project.vo.TeamVo;
 import com.zrqx.olive.system.model.SystemAdmin;
 import com.zrqx.olive.system.response.SystemAdminResponse;
 import com.zrqx.olive.system.service.SystemAdminService;
@@ -157,8 +156,8 @@ public class TeamController {
 	}
 	
 	@ApiOperation(value = "批量删除成员", notes = "批量删除成员")
-	@RequestMapping(value = "/delete", method = RequestMethod.GET)
-    public CommonResult<String> delete(@PathVariable List<String> ids){
+	@RequestMapping(value = "/delete", method = RequestMethod.POST)
+    public CommonResult<String> delete(@RequestBody List<String> ids){
         if(relationService.removeByIds(ids)){
             return CommonResult.success();
         }else{
@@ -177,8 +176,8 @@ public class TeamController {
 	}
 	  @ApiOperation(value = "维护成员列表", notes = "维护成员列表")
 	  @RequestMapping(value = "/upholdMember", method = RequestMethod.GET) 
-	  public CommonResult<MemberListVo> upholdMember(QueryUpholdMemberRequest  request){ 
-		  MemberListVo vo = relationService.upholdMember(request);
+	  public CommonResult<TeamVo> upholdMember(QueryUpholdMemberRequest  request){ 
+		  TeamVo vo = relationService.upholdMember(request);
 		  return CommonResult.success(vo); 
 	}
 }

olive-console/src/main/java/com/zrqx/olive/project/dao/TeamMemberRelationDao.java

@@ -16,7 +16,7 @@ import com.zrqx.olive.project.vo.TeamMemberVo;
 @Mapper
 public interface TeamMemberRelationDao extends BaseMapper<TeamMemberRelation> {
 	@Select("<script>"
-			+ "SELECT t2.id,t2.account,t4.department_name,t1.role_name,DATE_FORMAT(t1.upload_time,'%Y-%m-%d') upload_time "
+			+ "SELECT t2.id,t2.real_name account,t4.department_name,t1.role_name,DATE_FORMAT(t1.upload_time,'%Y-%m-%d') upload_time "
 			+ "from t_team_member_relation t1 " 
 			+ "INNER JOIN eb_system_admin t2 on t1.account_id=t2.id "   
 			+ "INNER JOIN sys_department t4 on t2.department_id=t4.id where 1=1"
@@ -38,14 +38,18 @@ public interface TeamMemberRelationDao extends BaseMapper<TeamMemberRelation> {
 			+ "</script>")
 	List<TeamMemberListVo> getByMember(@Param("form")QueryTeamMemberRequest form);
 	@Select("<script>"
-			+ "SELECT id,account,roleName from t_team_member_relation t1 "
+			+ "select id accountId,real_name,department_id,roles from eb_system_admin where id not in (select account_id from t_team_member_relation "
+			+ "where 1=1"
+			+ "<if test = 'projectId!=\"\" and projectId !=null'> "
+			+ " and project_id=#{projectId} "
+			+ "</if>"
+			+ ") " 
 			// 项目id
-			+ "<if test = 'id!=\"\" and id !=null'> "
-			+ "AND t1.team_id = #{id} "
+			+ "<if test = 'departmentId!=\"\" and departmentId !=null'> "
+			+ "AND department_id = #{departmentId} "
 			+ "</if>"
-			+ " order by upload_time desc"
 			+ "</script>")
-	List<TeamMemberVo> getTeamId(String id,Integer departmentId);
+	List<TeamMemberVo> getTeamId(@Param("projectId")String projectId,@Param("departmentId")String departmentId);
 
 	
 	

olive-console/src/main/java/com/zrqx/olive/project/request/QueryUpholdMemberRequest.java

@@ -17,6 +17,6 @@ public class QueryUpholdMemberRequest {
 	
 	@ApiModelProperty("项目Id")
 	private String projectId;
-	@ApiModelProperty("团队Id")
-	private String teamId;
+	@ApiModelProperty("部门id") 
+	private String departmentId;
 }

olive-console/src/main/java/com/zrqx/olive/project/request/UpdateTeamMemberRequest.java

@@ -22,9 +22,14 @@ public class UpdateTeamMemberRequest implements Serializable {
 	private String teamId;
 	@ApiModelProperty("项目Id")
 	private String projectId;
+	@ApiModelProperty("部门id") 
+	private Integer departmentId;
+	@ApiModelProperty(value = "部门名称" ) 
+	private String departmentName;
 	@ApiModelProperty("角色名")
 	private String roleName;
 	@ApiModelProperty(value = "后台管理员账号")
     private Integer accountId;
-	
+	@ApiModelProperty(value = "后台管理员姓名")
+    private String realName;
 }

olive-console/src/main/java/com/zrqx/olive/project/service/TeamMemberRelationService.java

@@ -7,8 +7,8 @@ import com.zrqx.olive.project.model.TeamMemberRelation;
 import com.zrqx.olive.project.request.QueryTeamMemberRequest;
 import com.zrqx.olive.project.request.QueryUpholdMemberRequest;
 import com.zrqx.olive.project.request.UpdateTeamMemberListRequest;
-import com.zrqx.olive.project.vo.MemberListVo;
 import com.zrqx.olive.project.vo.TeamMemberListVo;
+import com.zrqx.olive.project.vo.TeamVo;
 
 public interface TeamMemberRelationService extends IService<TeamMemberRelation> {
 	/**
@@ -37,6 +37,6 @@ public interface TeamMemberRelationService extends IService<TeamMemberRelation>
 	 * @author 任建彩
 	 * @date 2021年8月12日
 	 */
-	MemberListVo upholdMember(QueryUpholdMemberRequest request);
+	TeamVo upholdMember(QueryUpholdMemberRequest request);
 	
 }

olive-console/src/main/java/com/zrqx/olive/project/service/impl/TeamMemberRelationServiceImpl.java

@@ -6,11 +6,14 @@ import java.util.List;
 import javax.annotation.Resource;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zrqx.olive.dept.dao.DepartmentDao;
+import com.zrqx.olive.dept.model.Department;
 import com.zrqx.olive.project.dao.TeamDao;
 import com.zrqx.olive.project.dao.TeamMemberRelationDao;
 import com.zrqx.olive.project.model.Team;
@@ -39,6 +42,8 @@ public class TeamMemberRelationServiceImpl extends ServiceImpl<TeamMemberRelatio
 	private SystemAdminDao systemAdminDao;
 	@Autowired
 	private TeamDao teamDao; 
+	@Autowired
+	private DepartmentDao dao;
 	
 	
 	@Override
@@ -56,28 +61,18 @@ public class TeamMemberRelationServiceImpl extends ServiceImpl<TeamMemberRelatio
 				if(request.getId()==null) {
 					TeamMemberRelation relation = new TeamMemberRelation();
 					relation.setAccountId(relation.getAccountId());
-					if(request.getRoleName()==null) {
-						SystemAdmin systemAdmin = systemAdminDao.selectById(relation.getAccountId());
-						SystemRole role = roleDao.selectById(systemAdmin.getRoles());
-						relation.setRoleName(role.getRoleName());	
-					}else {
-						relation.setRoleName(request.getRoleName());
-					}
+					relation.setRoleName(request.getRoleName());
 					relation.setProjectId(request.getProjectId());
 					relation.setTeamId(request.getTeamId());
+					relation.setDepartmentId(request.getDepartmentId());
 					relationDao.insert(relation);
 				}else {
 					TeamMemberRelation relation = new TeamMemberRelation();
 					relation.setAccountId(relation.getAccountId());
-					if(request.getRoleName()==null) {
-						SystemAdmin systemAdmin = systemAdminDao.selectById(relation.getAccountId());
-						SystemRole role = roleDao.selectById(systemAdmin.getRoles());
-						relation.setRoleName(role.getRoleName());	
-					}else {
-						relation.setRoleName(request.getRoleName());
-					}
+					relation.setRoleName(request.getRoleName());
 					relation.setProjectId(request.getProjectId());
 					relation.setTeamId(request.getTeamId());
+					relation.setDepartmentId(request.getDepartmentId());
 					relationDao.updateById(relation);
 				}
 			}
@@ -86,27 +81,49 @@ public class TeamMemberRelationServiceImpl extends ServiceImpl<TeamMemberRelatio
 	}
 
 	@Override
-	public MemberListVo upholdMember(QueryUpholdMemberRequest request) {
-		List<Object> list = new ArrayList<Object>();
-		MemberListVo vo= new MemberListVo();
+	public TeamVo upholdMember(QueryUpholdMemberRequest request) {
+		TeamVo vo = new TeamVo(); 
+		List<TeamMemberVo> list = new ArrayList<TeamMemberVo>();
 		if(StringUtils.isNotBlank(request.getProjectId())) {
-			QueryWrapper<Team> qw = new QueryWrapper<Team>();
-			qw.eq("project_id", request.getProjectId());
-			List<TeamVo> teamList = teamDao.getProjectId(request.getProjectId());
-			if(teamList!=null && teamList.size()>0) {
-				for (TeamVo team : teamList) {
-					List<TeamMemberVo> teamMemberList = relationDao.getTeamId(team.getId(),team.getDepartmentId());
-					
-					team.setTeamMemberList(teamMemberList);
+			if(StringUtils.isBlank(request.getDepartmentId())) {
+				QueryWrapper<Team> qw = new QueryWrapper<Team>();
+				qw.eq("project_id", request.getProjectId());
+				List<TeamVo> teamList = teamDao.getProjectId(request.getProjectId());
+				if(teamList!=null && teamList.size()>0) {
+					for (TeamVo team : teamList) {
+						List<TeamMemberVo> teamMemberList = relationDao.getTeamId(request.getProjectId(),team.getDepartmentId().toString());
+						  for (TeamMemberVo teamMemberVo : teamMemberList) { 
+							  if(StringUtils.isNotBlank(teamMemberVo.getDepartmentId().toString())) {
+								  Department department = dao.selectById(teamMemberVo.getDepartmentId());
+								  teamMemberVo.setDepartmentName(department.getDepartmentName());
+							  }
+							  if(StringUtils.isNotBlank(teamMemberVo.getRoles())) {
+								  SystemRole role = roleDao.selectById(teamMemberVo.getRoles());
+								  teamMemberVo.setRoleName(role.getRoleName());
+							  }
+							  list.add(teamMemberVo); 
+							  vo.setTeamMemberList(list);
+						}
+					}
+				}
+			}else {
+				List<TeamMemberVo> teamMemberList = relationDao.getTeamId(request.getProjectId(),request.getDepartmentId());
+				  for (TeamMemberVo teamMemberVo : teamMemberList) { 
+					  if(StringUtils.isNotBlank(teamMemberVo.getDepartmentId().toString())) {
+						  Department department = dao.selectById(teamMemberVo.getDepartmentId());
+						  teamMemberVo.setDepartmentName(department.getDepartmentName());
+					  }
+					  if(StringUtils.isNotBlank(teamMemberVo.getRoles())) {
+						  SystemRole role = roleDao.selectById(teamMemberVo.getRoles());
+						  teamMemberVo.setRoleName(role.getRoleName());
+					  }
+					  list.add(teamMemberVo); 
+					  vo.setTeamMemberList(list);
 				}
 			}
-			vo.setTeamList(teamList);
 		}
 		return vo;
 	}
 
 	
-
-
-	
 }

olive-console/src/main/java/com/zrqx/olive/project/vo/TeamMemberListVo.java

@@ -23,7 +23,7 @@ public class TeamMemberListVo {
 	@ApiModelProperty("消耗")
 	private BigDecimal consume;
 	@ApiModelProperty("上传时间")
-	private Date uploadTime;
+	private String uploadTime;
 	
 
 }

olive-console/src/main/java/com/zrqx/olive/project/vo/TeamMemberVo.java

@@ -5,12 +5,17 @@ import lombok.Data;
 @Data
 public class TeamMemberVo {
 
-	@ApiModelProperty("成员id，新增时不需要填写")
-	private String id;
+	@ApiModelProperty("后台管理id，新增时不需要填写")
+	private String accountId;
 	@ApiModelProperty(value = "后台管理员姓名")
-    private String account;
+    private String realName;
     @ApiModelProperty(value = "后台管理员权限(menus_id)")
-    private String roleName;
-	
+    private String roles;
+    @ApiModelProperty("角色名")
+	private String roleName;
+    @ApiModelProperty("部门id")
+	private Integer departmentId;
+    @ApiModelProperty("部门名称")
+	private String departmentName;
 
 }

olive-console/src/main/java/com/zrqx/olive/project/vo/TeamVo.java

@@ -7,12 +7,12 @@ import lombok.Data;
 @Data
 public class TeamVo {
 
-	@ApiModelProperty("团队id，新增时不需要填写")
+	@ApiModelProperty("团队id，新增时不需要填写") 
 	private String id;
-	@ApiModelProperty("部门id")
+	@ApiModelProperty("部门id") 
 	private Integer departmentId;
-	@ApiModelProperty(value = "部门名称" )
-	private String  departmentName;
+	@ApiModelProperty(value = "部门名称" ) 
+	private String departmentName;
 	@ApiModelProperty("关联用户")
 	private List<TeamMemberVo> teamMemberList;
 }