更新

eureka/src/main/resources/bootstrap.yml

 server:
-  port: 8161
\ No newline at end of file
+  port: 8162
\ No newline at end of file

olive-console/src/main/java/com/zrqx/olive/dept/controller/DepartmentController.java

@@ -4,6 +4,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -16,6 +17,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.common.CommonResult;
 import com.utils.UUIDUtil;
 import com.utils.bean.BeanUtils;
+import com.zrqx.olive.article.model.Article;
 import com.zrqx.olive.dept.model.Department;
 import com.zrqx.olive.dept.service.DepartmentService;
 import com.zrqx.olive.dept.vo.DepartmentOneVO;
@@ -30,7 +32,7 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 @RestController
 @RequestMapping("api/admin/dept")
-@Api(description = "权限管理-部门")
+@Api(tags = "权限管理-部门")
 public class DepartmentController {
 	
 	@Autowired
@@ -89,8 +91,12 @@ public class DepartmentController {
 	
 	@ApiOperation(value = "查询所有部门" , notes ="查询所有部门")
 	@GetMapping(value = "/list")
-	public CommonResult<List<Department>> getList(){
-		List<Department> list = departmentSerivce.list();
+	public CommonResult<List<Department>> getList(String name){
+		QueryWrapper<Department> qw = new QueryWrapper<Department>();
+		if(StringUtils.isNotBlank(name)){
+			qw.eq("department_name", name);
+        }
+		List<Department> list = departmentSerivce.list(qw);
 		/*
 		 * list.stream().forEach(li -> { if(li.getParentId() != null && li.getParentId()
 		 * != 0){ Department parent = departmentSerivce.getById(li.getParentId());

olive-console/src/main/java/com/zrqx/olive/dept/request/DepartmentRequest.java

+package com.zrqx.olive.dept.request;
+
+import java.util.List;
+
+import com.zrqx.olive.system.model.SystemAdmin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+ * 部门表
+ *
+ */
+@Data
+@ApiModel(value="DepartmentRequest",description="部门")
+public class DepartmentRequest{
+	
+	@ApiModelProperty("部门id")
+	private Integer id;
+	@ApiModelProperty(value = "部门名称")
+	private String departmentName;
+	@ApiModelProperty("关联用户")
+	private List<SystemAdmin> adminList;
+}

olive-console/src/main/java/com/zrqx/olive/dept/vo/DepartmentListVO.java

+package com.zrqx.olive.dept.vo;
+
+import java.util.List;
+
+import com.zrqx.olive.system.model.SystemAdmin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+ * 部门表
+ *
+ */
+@Data
+@ApiModel(value="DepartmentListVO",description="部门VO")
+public class DepartmentListVO{
+	
+	@ApiModelProperty("部门id")
+	private Integer id;
+	@ApiModelProperty(value = "部门名称")
+	private String departmentName;
+	@ApiModelProperty("关联用户")
+	private List<SystemAdmin> adminList;
+}

olive-console/src/main/java/com/zrqx/olive/dept/vo/DeptVO.java

 package com.zrqx.olive.dept.vo;
 
-import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+
 import lombok.Data;
 
 @Data
 public class DeptVO {
-	@ApiModelProperty("部门id")
-	private Integer deptId;
-	@ApiModelProperty(value = "部门名称")
-	private String  deptName;
+	List<DepartmentListVO> list;
 }

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

@@ -2,6 +2,8 @@ package com.zrqx.olive.project.controller;
 
 import java.util.List;
 
+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;
@@ -11,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.common.CheckAdminToken;
 import com.common.CommonResult;
 import com.common.PageParamRequest;
 import com.github.pagehelper.PageInfo;
@@ -42,11 +45,14 @@ public class ProjectController {
 	private ProjectRecordService recordService;
 	@Autowired
     private SystemAdminService systemAdminService;
-    
+	 @Autowired
+	    private CheckAdminToken checkAdminToken;
+	 
 	@ApiOperation(value = "新增/修改", notes = "新增一个")
 	@RequestMapping(value = "/save", method = RequestMethod.POST)
-	public CommonResult<Boolean> save(@RequestBody SaveProjectRequest form) throws Exception {
-        SystemAdminResponse systemAdminResponse = systemAdminService.getInfoByToken(form.getToken());
+	public CommonResult<Boolean> save(@RequestBody SaveProjectRequest form,HttpServletRequest request) throws Exception {
+		String token = checkAdminToken.getTokenFormRequest(request);
+		SystemAdminResponse systemAdminResponse = systemAdminService.getInfoByToken(token);
 		if (!service.saveOrUpdate(form,systemAdminResponse)) {
 			return CommonResult.failed("添加失败");
 		}
@@ -61,9 +67,9 @@ public class ProjectController {
 	
 	@ApiOperation(value = "查询历史记录", notes = "查询历史记录")
 	@GetMapping(value = "/list")
-	public CommonResult<ProjectRecord> getByRecord(@PathVariable String oid) {
-		ProjectRecord vo =recordService.getById(oid);
-		return CommonResult.success(vo);
+	public CommonResult<List<ProjectRecord>> getByRecord(String oid) {
+		List<ProjectRecord> list =recordService.list(oid);
+		return CommonResult.success(list);
 	}
 	
 	@ApiOperation(value = "查询最大排序号", notes = "查询最大排序号")

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

+package com.zrqx.olive.project.controller;
+
+import java.util.List;
+
+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;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.common.CheckAdminToken;
+import com.common.CommonPage;
+import com.common.CommonResult;
+import com.common.PageParamRequest;
+import com.zrqx.olive.dept.model.Department;
+import com.zrqx.olive.dept.service.DepartmentService;
+import com.zrqx.olive.dept.vo.DepartmentListVO;
+import com.zrqx.olive.dept.vo.DeptVO;
+import com.zrqx.olive.project.model.Team;
+import com.zrqx.olive.project.request.QueryTeamRequest;
+import com.zrqx.olive.project.request.SaveTeamRequest;
+import com.zrqx.olive.project.request.UpdateTeamRequest;
+import com.zrqx.olive.project.service.StatisticsProjectService;
+import com.zrqx.olive.project.service.TeamService;
+import com.zrqx.olive.project.vo.ProjectVo;
+import com.zrqx.olive.system.model.SystemAdmin;
+import com.zrqx.olive.system.response.SystemAdminResponse;
+import com.zrqx.olive.system.service.SystemAdminService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequestMapping("api/admin/team")
+@Api(tags = "项目管理-团队")
+public class TeamController {
+
+	@Autowired
+	private StatisticsProjectService service;
+	@Autowired
+    private SystemAdminService systemAdminService;
+	@Autowired
+	private DepartmentService departmentService;
+	@Autowired
+	private TeamService teamService;
+    @Autowired
+    private CheckAdminToken checkAdminToken;
+    
+	
+	@ApiOperation(value = "新增/修改", notes = "新增团队")
+	@RequestMapping(value = "/save", method = RequestMethod.POST)
+	public CommonResult<String> save(@RequestBody SaveTeamRequest saveTeamRequest,HttpServletRequest request) throws Exception {
+		String token = checkAdminToken.getTokenFormRequest(request);
+		SystemAdminResponse systemAdminResponse = systemAdminService.getInfoByToken(token);
+        if(teamService.save(saveTeamRequest,systemAdminResponse)){
+            return CommonResult.success();
+        }else{
+            return CommonResult.failed();
+        }
+	}
+	@ApiOperation(value = "查询", notes = "根据ID查询")
+	@GetMapping(value = "/getId")
+	public CommonResult<ProjectVo> getById(@PathVariable String oid) {
+		ProjectVo vo =service.getById(oid);
+		return CommonResult.success(vo);
+	}
+
+	@ApiOperation(value = "分页查询", notes = "分页查询")
+	@GetMapping(value = "/list")
+	public CommonResult<CommonPage<Team>> getByList(QueryTeamRequest queryTeamRequest, PageParamRequest pageParamRequest) {
+		CommonPage<Team> list = CommonPage.restPage(teamService.page(queryTeamRequest, pageParamRequest));
+		return CommonResult.success(list);
+	}
+	
+	@ApiOperation(value = "分配项目")
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    public CommonResult<String> update(UpdateTeamRequest updateTeamRequest){
+		Team team = teamService.getById(updateTeamRequest.getTeamId());
+		team.setAllocateSurplus(updateTeamRequest.getTime());
+		team.setToBeAllocated(team.getToBeAllocated()-updateTeamRequest.getTime());
+        if(teamService.updateById(team)){
+            return CommonResult.success();
+        }else{
+            return CommonResult.failed();
+        }
+    }
+	@ApiOperation(value = "查询所有部门关联用户", notes = "查询所有部门关联用户")
+	@GetMapping(value = "/deptList")
+	public CommonResult<List<DepartmentListVO>> getByDepartment() {
+		DeptVO vo = new DeptVO();
+		List<DepartmentListVO> list = vo.getList();
+		for (DepartmentListVO departmentListVO : list) {
+			List<Department> list1 = departmentService.list();
+			for (Department department : list1) {
+				QueryWrapper<SystemAdmin> qw = new QueryWrapper<>();
+				if(department.getId()!=null){
+					qw.eq("departmentId", department.getId());
+				}
+				List<SystemAdmin> list2 = systemAdminService.list(qw);
+				departmentListVO.setAdminList(list2);
+				departmentListVO.setId(department.getId());
+				departmentListVO.setDepartmentName(department.getDepartmentName());
+				
+			}
+		}
+		return CommonResult.success(list);
+	}
+	
+}

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

+package com.zrqx.olive.project.dao;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zrqx.olive.project.model.Team;
+import com.zrqx.olive.project.request.QueryTeamRequest;
+import com.zrqx.olive.project.vo.TeamListVo;
+
+@Mapper
+public interface TeamDao extends BaseMapper<Team> {
+	@Select("<script>"
+			+ "SELECT id,department_id,department_name,project_id,total,"
+			+ "DATE_FORMAT(upload_time,'%Y-%m-%d %H:%i:%s') upload_time  FROM t_team where 1=1 "	
+			// 项目ID
+			+ "<if test = 'form.projectId!=null '> "
+			+ " AND projectId = #{form.projectId} "
+			+ "</if>"
+			+ "</script>")
+	List<TeamListVo> query(@Param("form")QueryTeamRequest form);
+
+	
+	
+}

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

+package com.zrqx.olive.project.dao;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zrqx.olive.project.model.TeamMemberRelation;
+
+@Mapper
+public interface TeamMemberRelationDao extends BaseMapper<TeamMemberRelation> {
+
+	
+	
+}

olive-console/src/main/java/com/zrqx/olive/project/model/Team.java

+package com.zrqx.olive.project.model;
+
+import java.util.Date;
+
+import org.springframework.data.annotation.Id;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_team")
+@ApiModel(value="T_Team对象", description="项目管理-团队")
+public class Team {
+	@Id
+	@TableId(value = "id", type = IdType.ASSIGN_UUID)
+	@ApiModelProperty("团队id，新增时不需要填写")
+	private String id;
+	@ApiModelProperty("部门id")
+	private Integer departmentId;
+	@ApiModelProperty(value = "部门名称" )
+	private String  departmentName;
+	@ApiModelProperty("项目Id")
+	private String projectId;
+	@ApiModelProperty("总工时")
+	private float total;
+	@ApiModelProperty("剩余")
+	private float surplus;
+	@ApiModelProperty("待分配")
+	private float toBeAllocated;
+	@ApiModelProperty("已分配剩余")
+	private float allocateSurplus;
+	@ApiModelProperty("上传时间")
+	private Date uploadTime;
+	@ApiModelProperty("修改时间")
+	private Date updateTime;
+	
+}

olive-console/src/main/java/com/zrqx/olive/project/model/TeamMemberRelation.java

+package com.zrqx.olive.project.model;
+
+import java.util.Date;
+
+import org.springframework.data.annotation.Id;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_team_member_relation")
+@ApiModel(value="T_TeamMemberRelation对象", description="项目管理-成员")
+public class TeamMemberRelation {
+	@Id
+	@TableId(value = "id", type = IdType.ASSIGN_UUID)
+	@ApiModelProperty("成员id，新增时不需要填写")
+	private String id;
+	@ApiModelProperty(value = "用户id" )
+	private Integer  accountId;
+	@ApiModelProperty("项目Id")
+	private String projectId;
+	@ApiModelProperty(value = "团队id" )
+	private String  teamId;
+	@ApiModelProperty("总工时")
+	private float total;
+	@ApiModelProperty("消耗")
+	private float consume;
+	@ApiModelProperty("上传时间")
+	private Date uploadTime;
+	
+}

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

+package com.zrqx.olive.project.request;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="QueryTeamRequest对象", description="查询团队表")
+public class QueryTeamRequest implements Serializable {
+
+	private static final long serialVersionUID=1L;
+	
+	@ApiModelProperty("项目名")
+	private String projectId;
+}

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

+package com.zrqx.olive.project.request;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.zrqx.olive.dept.request.DepartmentRequest;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="SaveTeamRequest对象", description="团队")
+public class SaveTeamRequest implements Serializable {
+
+	private static final long serialVersionUID=1L;
+	@ApiModelProperty("项目Id")
+	private String projectId;
+	@ApiModelProperty("团队id，新增时不需要填写")
+	private List<DepartmentRequest> deptList;
+
+	
+	
+}

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

+package com.zrqx.olive.project.request;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="UpdateTeamRequest对象", description="分配工时")
+public class UpdateTeamRequest implements Serializable {
+
+	private static final long serialVersionUID=1L;
+	
+	@ApiModelProperty("团队id，新增时不需要填写")
+	private String teamId;
+	@ApiModelProperty("分配共时")
+	private float time;
+	@ApiModelProperty("项目Id")
+	private String projectId;
+	
+	
+}

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

+package com.zrqx.olive.project.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.common.PageParamRequest;
+import com.github.pagehelper.PageInfo;
+import com.zrqx.olive.project.model.Team;
+import com.zrqx.olive.project.model.TeamMemberRelation;
+import com.zrqx.olive.project.request.QueryTeamRequest;
+
+public interface TeamMemberRelationService extends IService<TeamMemberRelation> {
+	
+}

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

+package com.zrqx.olive.project.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.common.PageParamRequest;
+import com.github.pagehelper.PageInfo;
+import com.zrqx.olive.project.model.Team;
+import com.zrqx.olive.project.request.QueryTeamRequest;
+import com.zrqx.olive.project.request.SaveProjectRequest;
+import com.zrqx.olive.project.request.SaveTeamRequest;
+import com.zrqx.olive.system.response.SystemAdminResponse;
+
+public interface TeamService extends IService<Team> {
+	/**
+	 * 分页查询
+	 * @Title: TeamService.java
+	 * @Package com.zrqx.olive.project.service
+	 * @Description: TODO
+	 * @author 任建彩
+	 * @date 2021年8月2日
+	 */
+	PageInfo<Team> page(QueryTeamRequest queryTeamRequest,PageParamRequest pageParamRequest);
+	/**
+	 * 添加团队
+	 * @Title: TeamService.java
+	 * @Package com.zrqx.olive.project.service
+	 * @Description: TODO
+	 * @author 任建彩
+	 * @date 2021年8月3日
+	 */
+	boolean save(SaveTeamRequest saveTeamRequest, SystemAdminResponse systemAdminResponse);
+	
+}

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

-package com.zrqx.olive.project.service;
+package com.zrqx.olive.project.service.impl;
 
 import java.util.List;
 
@@ -16,6 +16,7 @@ import com.zrqx.olive.project.model.Customer;
 import com.zrqx.olive.project.model.StatisticsProject;
 import com.zrqx.olive.project.request.QueryCustomerRequest;
 import com.zrqx.olive.project.request.SaveCustomerRequest;
+import com.zrqx.olive.project.service.CustomerService;
 @Service
 public class CustomerServiceImpl extends ServiceImpl<CustomerDao, Customer>  implements CustomerService {
 	

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

-package com.zrqx.olive.project.service;
+package com.zrqx.olive.project.service.impl;
 
 import java.util.List;
 
@@ -8,6 +8,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zrqx.olive.project.dao.DiyTypeDao;
 import com.zrqx.olive.project.model.DiyType;
+import com.zrqx.olive.project.service.DiyTypeService;
 /**
  * 自定义分类
  */

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

-package com.zrqx.olive.project.service;
+package com.zrqx.olive.project.service.impl;
 
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zrqx.olive.project.dao.ProjectFileDao;
 import com.zrqx.olive.project.model.ProjectFile;
+import com.zrqx.olive.project.service.ProjectFileService;
 @Service
 public class ProjectFileServiceImpl extends ServiceImpl<ProjectFileDao, ProjectFile>  implements ProjectFileService {
 

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

-package com.zrqx.olive.project.service;
+package com.zrqx.olive.project.service.impl;
 
 import java.util.Date;
 import java.util.List;
@@ -9,6 +9,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zrqx.olive.project.dao.ProjectRecordDao;
 import com.zrqx.olive.project.model.ProjectRecord;
+import com.zrqx.olive.project.service.ProjectRecordService;
 @Service
 public class ProjectRecordServiceImpl extends ServiceImpl<ProjectRecordDao, ProjectRecord>  implements ProjectRecordService {
 	

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

-package com.zrqx.olive.project.service;
+package com.zrqx.olive.project.service.impl;
 
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zrqx.olive.project.dao.ProjectUserDao;
 import com.zrqx.olive.project.model.ProjectUser;
+import com.zrqx.olive.project.service.ProjectUserService;
 @Service
 public class ProjectUserServiceImpl extends ServiceImpl<ProjectUserDao, ProjectUser>  implements ProjectUserService {
 	

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

-package com.zrqx.olive.project.service;
+package com.zrqx.olive.project.service.impl;
 
 import java.util.Date;
 import java.util.List;
@@ -25,6 +25,7 @@ import com.zrqx.olive.project.model.ProjectUser;
 import com.zrqx.olive.project.model.StatisticsProject;
 import com.zrqx.olive.project.request.QueryProjectRequest;
 import com.zrqx.olive.project.request.SaveProjectRequest;
+import com.zrqx.olive.project.service.StatisticsProjectService;
 import com.zrqx.olive.project.vo.ProjectListVo;
 import com.zrqx.olive.project.vo.ProjectVo;
 import com.zrqx.olive.system.response.SystemAdminResponse;

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

+package com.zrqx.olive.project.service.impl;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang3.StringUtils;
+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.common.PageParamRequest;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.zrqx.olive.dept.request.DepartmentRequest;
+import com.zrqx.olive.project.dao.TeamDao;
+import com.zrqx.olive.project.dao.TeamMemberRelationDao;
+import com.zrqx.olive.project.model.Team;
+import com.zrqx.olive.project.model.TeamMemberRelation;
+import com.zrqx.olive.project.request.QueryTeamRequest;
+import com.zrqx.olive.project.request.SaveTeamRequest;
+import com.zrqx.olive.project.service.TeamService;
+import com.zrqx.olive.system.model.SystemAdmin;
+import com.zrqx.olive.system.response.SystemAdminResponse;
+@Service
+public class TeamMemberRelationServiceImpl extends ServiceImpl<TeamDao, Team>  implements TeamService {
+	
+	@Resource
+	private TeamDao dao;
+	@Autowired
+	private TeamMemberRelationDao relationDao;
+
+
+	@Override
+	public PageInfo<Team> page(QueryTeamRequest queryTeamRequest, PageParamRequest pageParamRequest) {
+		PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
+		QueryWrapper<Team> qw = new QueryWrapper<Team>();
+		if(StringUtils.isNotBlank(queryTeamRequest.getProjectId())) {
+			qw.eq("projectId", queryTeamRequest.getProjectId());
+		}
+		List<Team> list = dao.selectList(qw);
+		return new PageInfo<Team>(list);
+	}
+
+
+	@Override
+	public boolean save(SaveTeamRequest saveTeamRequest, SystemAdminResponse systemAdminResponse) {
+		// TODO Auto-generated method stub
+		List<DepartmentRequest> deptList = saveTeamRequest.getDeptList();
+		for (DepartmentRequest dept : deptList) {
+			Team team = new Team();
+			team.setDepartmentId(dept.getId());
+			team.setDepartmentName(dept.getDepartmentName());
+			team.setUploadTime(new Date());
+			team.setProjectId(saveTeamRequest.getProjectId());
+			dao.insert(team);
+			List<SystemAdmin> adminList = dept.getAdminList();
+			if(adminList.size()>0 && adminList!=null) {
+				for (int i = 0; i < adminList.size(); i++) {
+					if(adminList.get(i).getType()!=null) {
+						if(adminList.get(i).getType()!=true) {
+							TeamMemberRelation relation = new TeamMemberRelation();
+							relation.setAccountId(systemAdminResponse.getId());
+							relation.setProjectId(saveTeamRequest.getProjectId());
+							relation.setTeamId(team.getId());
+							relationDao.insert(relation);
+						}
+					}
+				}
+			}
+		}
+		return false;
+	}
+
+
+
+
+	
+}

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

+package com.zrqx.olive.project.service.impl;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zrqx.olive.project.dao.TeamMemberRelationDao;
+import com.zrqx.olive.project.model.TeamMemberRelation;
+import com.zrqx.olive.project.service.TeamMemberRelationService;
+@Service
+public class TeamServiceImpl extends ServiceImpl<TeamMemberRelationDao, TeamMemberRelation>  implements TeamMemberRelationService {
+	
+	@Resource
+	private TeamMemberRelationDao dao;
+
+
+
+
+
+
+	
+}

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

@@ -26,11 +26,11 @@ public class ProjectListVo {
 	@ApiModelProperty("项目状态： 1 进行中 2开发完成 3试运行 4验收完成 5已关闭 ")
 	private String status_Name;
 	@ApiModelProperty("总工时")
-	private Integer total;
+	private float total;
 	@ApiModelProperty("消耗")
-	private Integer consume;
+	private float consume;
 	@ApiModelProperty("剩余")
-	private Integer surplus;
+	private float surplus;
 	@ApiModelProperty("待分配")
-	private Integer toBeAllocated;
+	private float toBeAllocated;
 }

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

+package com.zrqx.olive.project.vo;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class TeamListVo {
+
+	@ApiModelProperty("客户id，新增时不需要填写")
+	private String id;
+	@ApiModelProperty("部门id")
+	private Integer departmentId;
+	@ApiModelProperty(value = "部门名称" )
+	private String  departmentName;
+	@ApiModelProperty("项目Id")
+	private String projectId;
+	@ApiModelProperty("成员数")
+	private Integer memberNumber;
+	@ApiModelProperty("总工时")
+	private Integer total;
+	@ApiModelProperty("消耗")
+	private Integer consume;
+	@ApiModelProperty("剩余")
+	private Integer surplus;
+	@ApiModelProperty("待分配")
+	private Integer toBeAllocated;
+	@ApiModelProperty("上传时间")
+	private Date uploadTime;
+	
+
+}

olive-console/src/main/java/com/zrqx/olive/system/controller/SystemAdminController.java

 package com.zrqx.olive.system.controller;
 
+import javax.validation.Valid;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.common.CommonPage;
 import com.common.CommonResult;
 import com.common.PageParamRequest;
+import com.zrqx.olive.dept.model.Department;
+import com.zrqx.olive.dept.service.DepartmentService;
 import com.zrqx.olive.system.model.SystemAdmin;
 import com.zrqx.olive.system.request.SystemAdminAddRequest;
 import com.zrqx.olive.system.request.SystemAdminRequest;
 import com.zrqx.olive.system.response.SystemAdminResponse;
 import com.zrqx.olive.system.service.SystemAdminService;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-import javax.validation.Valid;
 
 
 /**
@@ -42,7 +49,8 @@ public class SystemAdminController {
 
     @Autowired
     private SystemAdminService systemAdminService;
-
+    @Autowired
+    private DepartmentService departmentService;
     /**
      * 分页显示后台管理员表
      * @param systemAdminRequest 搜索条件
@@ -141,6 +149,8 @@ public class SystemAdminController {
     @RequestMapping(value = "/info", method = RequestMethod.GET)
     public CommonResult<SystemAdmin> info(@RequestParam(value = "id") @Valid Integer id){
         SystemAdmin systemAdmin = systemAdminService.getById(id);
+        Department department = departmentService.getById(systemAdmin.getDepartmentId());
+        systemAdmin.setDepartmentName(department.getDepartmentName());
         return CommonResult.success(systemAdmin);
     }
 

olive-console/src/main/java/com/zrqx/olive/system/model/SystemAdmin.java

@@ -12,6 +12,8 @@ import lombok.experimental.Accessors;
 import java.io.Serializable;
 import java.util.Date;
 
+import org.springframework.data.annotation.Transient;
+
 /**
  * 后台管理员表
  * +----------------------------------------------------------------------
@@ -75,4 +77,15 @@ public class SystemAdmin implements Serializable {
 
     @ApiModelProperty(value = "是否接收短信")
     private Boolean isSms;
+    
+    @ApiModelProperty(value = "部门")
+    private String  departmentId;
+    
+    @Transient
+    @ApiModelProperty(value = "部门")
+    private String  departmentName;
+    
+    @Transient
+    @ApiModelProperty(value = "是否选中 true是 0false")
+	private Boolean type;
 }

olive-console/src/main/java/com/zrqx/olive/system/request/SystemAdminRequest.java

@@ -78,4 +78,6 @@ public class SystemAdminRequest implements Serializable {
     
     @ApiModelProperty(value = "部门")
     private String  departmentId;
+    @ApiModelProperty(value = "部门名称")
+    private String  departmentName;
 }

olive-console/src/main/java/com/zrqx/olive/system/response/SystemAdminResponse.java

@@ -55,4 +55,9 @@ public class SystemAdminResponse implements Serializable {
 
     @ApiModelProperty(value = "是否接收短信")
     private Boolean isSms;
+	//部门名称
+	@ApiModelProperty(value = "部门Id" )
+	private Integer  departmentId;
+	@ApiModelProperty(value = "部门名称" )
+	private String  departmentName;
 }

olive-console/src/main/java/com/zrqx/olive/system/service/impl/SystemAdminServiceImpl.java

@@ -17,6 +17,8 @@ import com.utils.CrmebUtil;
 import com.utils.ValidateFormUtil;
 import com.zrqx.olive.authorization.manager.TokenManager;
 import com.zrqx.olive.authorization.model.TokenModel;
+import com.zrqx.olive.dept.model.Department;
+import com.zrqx.olive.dept.service.DepartmentService;
 import com.zrqx.olive.system.dao.SystemAdminDao;
 import com.zrqx.olive.system.model.SystemAdmin;
 import com.zrqx.olive.system.model.SystemRole;
@@ -86,6 +88,9 @@ public class SystemAdminServiceImpl extends ServiceImpl<SystemAdminDao, SystemAd
 
     @Autowired
     private SystemGroupDataService systemGroupDataService;
+    
+    @Autowired
+    private DepartmentService departmentService;
 
 
     @Override
@@ -127,6 +132,9 @@ public class SystemAdminServiceImpl extends ServiceImpl<SystemAdminDao, SystemAd
         if(null != systemAdmin.getStatus()){
             lambdaQueryWrapper.eq(SystemAdmin::getStatus, systemAdmin.getStatus());
         }
+        if(StringUtils.isNotBlank(systemAdmin.getDepartmentId())){
+            lambdaQueryWrapper.eq(SystemAdmin::getDepartmentId, systemAdmin.getDepartmentId());
+        }
         List<SystemAdmin> systemAdmins = dao.selectList(lambdaQueryWrapper);
         List<SystemAdminResponse> systemAdminResponses = new ArrayList<>();
         PageParamRequest pageRole = new PageParamRequest();
@@ -147,6 +155,10 @@ public class SystemAdminServiceImpl extends ServiceImpl<SystemAdminDao, SystemAd
             }
             sar.setRoleNames(StringUtils.join(roleNames,","));
             systemAdminResponses.add(sar);
+            Department department = departmentService.getById(admin.getDepartmentId());
+            if(department!=null) {
+            	sar.setDepartmentName(department.getDepartmentName());
+            }
         }
         return systemAdminResponses;
     }

olive-console/src/main/java/com/zrqx/olive/system/vo/SystemAdminListVo.java

+package com.zrqx.olive.system.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SystemAdminListVo {
+
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    @ApiModelProperty(value = "后台管理员账号")
+    private String account;
+    @ApiModelProperty(value = "部门")
+    private String  departmentId;
+
+}