Commit e6feddf2 authored by 王蔡翾's avatar 王蔡翾
Browse files

优化内容

parent 62cef19d
......@@ -44,8 +44,16 @@ public class BsProjectController extends BaseController {
@ApiOperation(value = "添加")
@PostMapping("/add")
public Result<Boolean> addOrUpdate(@RequestBody BsProjectDTO bsProjectDTO){
public Result<Boolean> addOrUpdate(@RequestBody BsProjectDTO bsProjectDTO,@RequestHeader("Authorization") String token){
String name = jwtUtil.getUserNameFromToken(token);
bsProjectDTO.setLoginUser(name);
return Result.data(bsProjectService.addProject(bsProjectDTO));
}
@ApiOperation(value = "更新")
@PostMapping("/update")
public Result<Boolean> updateProject(@RequestBody BsProjectDTO bsProjectDTO){
return Result.data(bsProjectService.updateProject(bsProjectDTO));
}
}
......@@ -40,4 +40,17 @@ public class BsProjectRoleAssessmentController extends BaseController {
public Result<Boolean> update(@RequestBody List<BsProjectRoleAssessmentDTO> assessmentDTOS){
return Result.data(bsProjectRoleAssessmentService.updateBatchAssessment(assessmentDTOS));
}
@ApiOperation(value = "项目考核提交")
@PostMapping("/commit")
public Result<Boolean> commit(@RequestBody List<BsProjectRoleAssessmentDTO> assessmentDTOS){
return Result.data(bsProjectRoleAssessmentService.commitAssessment(assessmentDTOS));
}
@ApiOperation(value = "项目考核标准删除")
@DeleteMapping("/delete")
public Result<Boolean> delete(@RequestBody List<BsProjectRoleAssessmentDTO> assessmentDTOS){
return Result.data(bsProjectRoleAssessmentService.removeBatchByIds(assessmentDTOS));
}
}
......@@ -34,4 +34,7 @@ public class BsProjectEntity {
@ApiModelProperty("周期")
@TableField("cycle")
private Integer cycle;
@ApiModelProperty("项目人数")
@TableField("project_people_num")
private Integer projectPeopleNum;
}
......@@ -11,8 +11,7 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
public class BsProjectVO extends BsProjectEntity {
@ApiModelProperty("项目人数")
private Integer projectPeopleNum;
@ApiModelProperty("考核完成率")
private String checkCompleteRate;
......
......@@ -15,4 +15,7 @@ public interface BsProjectRoleAssessmentService extends IService<BsProjectRoleAs
@Transactional
boolean updateBatchAssessment(List<BsProjectRoleAssessmentDTO> assessmentList);
@Transactional
boolean commitAssessment(List<BsProjectRoleAssessmentDTO> assessmentList);
}
......@@ -15,4 +15,6 @@ public interface BsProjectService extends IService<BsProjectEntity> {
@Transactional
boolean addProject(BsProjectDTO bsProjectDTO);
boolean updateProject(BsProjectDTO bsProjectDTO);
}
package com.platform.projectBusiness.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.platform.exception.BusinessException;
import com.platform.projectBusiness.mapper.BsProjectRoleAssessmentMapper;
import com.platform.projectBusiness.model.dto.BsProjectPeopleScoreDTO;
import com.platform.projectBusiness.model.dto.BsProjectPeopleScoreDetailDTO;
......@@ -13,7 +14,6 @@ import com.platform.projectBusiness.service.BsProjectPeopleScoreDetailService;
import com.platform.projectBusiness.service.BsProjectPeopleScoreService;
import com.platform.projectBusiness.service.BsProjectRoleAssessmentService;
import com.platform.utils.DozerUtils;
import com.platform.utils.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -161,11 +161,23 @@ public class BsProjectRoleAssessmentServiceImpl extends ServiceImpl<BsProjectRol
BsProjectPeopleScoreDetailDTO bsProjectPeopleScoreDetailDTO = new BsProjectPeopleScoreDetailDTO();
bsProjectPeopleScoreDetailDTO.setAssessmentId(assessmentDTO.getId());
List<BsProjectPeopleScoreDetailVO> bsProjectPeopleScoreDetailVOS = bsProjectPeopleScoreDetailService.queryProjectPeopleScoreDetailList(bsProjectPeopleScoreDetailDTO);
for (BsProjectPeopleScoreDetailVO bsProjectPeopleScoreDetailVO : bsProjectPeopleScoreDetailVOS) {
bsProjectPeopleScoreDetailVO.setAssessmentDescription(assessmentDTO.getAssessmentDescription());
bsProjectPeopleScoreDetailVO.setAssessmentStandard(assessmentDTO.getAssessmentStandard());
bsProjectPeopleScoreDetailVO.setPercentage(assessmentDTO.getPercentage());
bsProjectPeopleScoreDetailService.updateById(bsProjectPeopleScoreDetailVO);
//如果有id则更新
if (assessmentDTO.getId()!=null) {
for (BsProjectPeopleScoreDetailVO bsProjectPeopleScoreDetailVO : bsProjectPeopleScoreDetailVOS) {
bsProjectPeopleScoreDetailVO.setAssessmentDescription(assessmentDTO.getAssessmentDescription());
bsProjectPeopleScoreDetailVO.setAssessmentStandard(assessmentDTO.getAssessmentStandard());
bsProjectPeopleScoreDetailVO.setPercentage(assessmentDTO.getPercentage());
bsProjectPeopleScoreDetailService.updateById(bsProjectPeopleScoreDetailVO);
}
}else {
//若无id代表新内容,直接新增
for (BsProjectPeopleScoreDetailVO bsProjectPeopleScoreDetailVO : bsProjectPeopleScoreDetailVOS) {
bsProjectPeopleScoreDetailVO.setAssessmentDescription(assessmentDTO.getAssessmentDescription());
bsProjectPeopleScoreDetailVO.setAssessmentStandard(assessmentDTO.getAssessmentStandard());
bsProjectPeopleScoreDetailVO.setPercentage(assessmentDTO.getPercentage());
bsProjectPeopleScoreDetailService.removeById(bsProjectPeopleScoreDetailVO.getId());
bsProjectPeopleScoreDetailService.save(bsProjectPeopleScoreDetailVO);
}
}
......@@ -177,5 +189,27 @@ public class BsProjectRoleAssessmentServiceImpl extends ServiceImpl<BsProjectRol
}
@Transactional
@Override
public boolean commitAssessment(List<BsProjectRoleAssessmentDTO> assessmentList) {
//考核项只允许是俩层结构
double sum = 0.0;
for (BsProjectRoleAssessmentDTO assessmentDTO : assessmentList){
Double percentage = 0.0;
for (BsProjectRoleAssessmentDTO children : assessmentDTO.getChildren()){
percentage += children.getPercentage();
}
assessmentDTO.setPercentage(percentage);
sum += percentage;
}
if (sum != 100.0){
throw new BusinessException("考核项占比之和必须为100%");
}else {
return updateBatchAssessment(assessmentList);
}
}
}
package com.platform.projectBusiness.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.platform.projectBusiness.mapper.BsProjectMapper;
import com.platform.projectBusiness.model.dto.BsProjectDTO;
import com.platform.projectBusiness.model.dto.BsProjectPeopleScoreDTO;
import com.platform.projectBusiness.model.dto.BsProjectPeopleScoreDetailDTO;
import com.platform.projectBusiness.model.entity.BsProjectEntity;
import com.platform.projectBusiness.model.entity.BsProjectPeopleScoreDetailEntity;
import com.platform.projectBusiness.model.entity.BsProjectPeopleScoreEntity;
import com.platform.projectBusiness.model.entity.SysUserEntity;
import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreDetailVO;
import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreVO;
import com.platform.projectBusiness.model.vo.BsProjectVO;
import com.platform.projectBusiness.service.BsProjectPeopleScoreDetailService;
import com.platform.projectBusiness.service.BsProjectPeopleScoreService;
import com.platform.projectBusiness.service.BsProjectService;
import com.platform.projectBusiness.service.SysUserService;
import com.platform.utils.DozerUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -20,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
@Service
......@@ -30,6 +35,8 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject
private BsProjectPeopleScoreService bsProjectPeopleScoreService;
@Resource
private BsProjectPeopleScoreDetailService bsProjectPeopleScoreDetailService;
@Resource
private SysUserService sysUserService;
/**
* 查询项目列表
......@@ -38,24 +45,57 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject
*/
@Override
public List<BsProjectVO> queryProjectList(BsProjectDTO bsProjectDTO){
String loginUser = bsProjectDTO.getLoginUser() ;
//查询用户列表,查出当前用户id
SysUserEntity sysUserEntity = sysUserService.getOne(new QueryWrapper<SysUserEntity>().eq("name",bsProjectDTO.getLoginUser()));
String userId = sysUserEntity.getId();
List<BsProjectVO> bsProjectVOList = baseMapper.queryProjectList(bsProjectDTO);
// 添加空值检查
if (bsProjectVOList == null) {
return new ArrayList<>(); // 返回空列表而不是null
}
List<BsProjectVO> bsProjectVOList1 = new ArrayList<>();
//只保留自己相关的项目
for (BsProjectVO bsProjectVO : bsProjectVOList){
BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO = new BsProjectPeopleScoreDTO();
bsProjectPeopleScoreDTO.setProjectId(bsProjectVO.getId());
bsProjectPeopleScoreDTO.setProjectPeople(loginUser);
List<BsProjectPeopleScoreVO> bsProjectPeopleScoreVOList = bsProjectPeopleScoreService.qyeryProjectPeopleScoreList(bsProjectPeopleScoreDTO);
if (bsProjectPeopleScoreVOList != null && !bsProjectPeopleScoreVOList.isEmpty()){
bsProjectVOList1.add(bsProjectVO);
//根据角色获取项目列表
if (sysUserEntity.getRoleId()==1) {
//只保留自己相关的项目
for (BsProjectVO bsProjectVO : bsProjectVOList) {
BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO = new BsProjectPeopleScoreDTO();
bsProjectPeopleScoreDTO.setProjectId(bsProjectVO.getId());
bsProjectPeopleScoreDTO.setProjectPeople(userId);
List<BsProjectPeopleScoreVO> bsProjectPeopleScoreVOList = bsProjectPeopleScoreService.qyeryProjectPeopleScoreList(bsProjectPeopleScoreDTO);
if (bsProjectPeopleScoreVOList != null && !bsProjectPeopleScoreVOList.isEmpty()) {
bsProjectVOList1.add(bsProjectVO);
}
}
}else if (sysUserEntity.getRoleId()==2) {
//部门负责人
//查询部门下成员
List<SysUserEntity> sysUserEntities = sysUserService.list(new QueryWrapper<SysUserEntity>().eq("dept_id", sysUserEntity.getDeptId()));
sysUserEntities.add(sysUserEntity);
//可查自己部门成员和自己相关的项目
for (BsProjectVO bsProjectVO : bsProjectVOList) {
//查看自己部门成员和自己是否在项目中
for (SysUserEntity sysUserEntity1 : sysUserEntities) {
BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO = new BsProjectPeopleScoreDTO();
bsProjectPeopleScoreDTO.setProjectId(bsProjectVO.getId());
bsProjectPeopleScoreDTO.setProjectPeople(sysUserEntity1.getId());
List<BsProjectPeopleScoreVO> bsProjectPeopleScoreVOList = bsProjectPeopleScoreService.qyeryProjectPeopleScoreList(bsProjectPeopleScoreDTO);
if (bsProjectPeopleScoreVOList != null && !bsProjectPeopleScoreVOList.isEmpty()) {
bsProjectVOList1.add(bsProjectVO);
}
}
}
}else {
//超级管理员
//查看全部项目
bsProjectVOList1 = bsProjectVOList;
}
// 使用Comparator进行排序,处理null值
bsProjectVOList1.sort(Comparator.comparing(
BsProjectVO::getStartTime,
Comparator.nullsLast(LocalDate::compareTo)
));
for (BsProjectVO bsProjectVO : bsProjectVOList1){
// 添加空值检查
......@@ -148,12 +188,23 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject
bsProjectDTO.setCreateTime(LocalDate.now());
//添加项目并获取id
BsProjectEntity bsProjectEntity = DozerUtils.convertBean(bsProjectDTO,BsProjectEntity.class);
bsProjectEntity.setProjectPeopleNum(bsProjectDTO.getBsProjectPeopleScoreDTOList().size());
bsProjectEntity = addAndGetId(bsProjectEntity);
for (BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO : bsProjectDTO.getBsProjectPeopleScoreDTOList()){
bsProjectPeopleScoreDTO.setProjectId(bsProjectEntity.getId());
}
//默认当前创建人为项目经理
BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO = new BsProjectPeopleScoreDTO();
bsProjectPeopleScoreDTO.setProjectId(bsProjectEntity.getId());
bsProjectPeopleScoreDTO.setProjectRole("项目经理");
//查询用户列表,查出当前用户id
SysUserEntity sysUserEntity = sysUserService.getOne(new QueryWrapper<SysUserEntity>().eq("name",bsProjectDTO.getLoginUser()));
bsProjectPeopleScoreDTO.setProjectPeople(sysUserEntity.getId());
List<BsProjectPeopleScoreDTO> bsProjectPeopleScoreDTOList = bsProjectDTO.getBsProjectPeopleScoreDTOList();
//添加项目经理
bsProjectPeopleScoreDTOList.add(bsProjectPeopleScoreDTO);
//添加项目成员和得分
return bsProjectPeopleScoreService.saveOrUpdateBatch(DozerUtils.convertList(bsProjectDTO.getBsProjectPeopleScoreDTOList(), BsProjectPeopleScoreEntity.class));
return bsProjectPeopleScoreService.saveOrUpdateBatch(DozerUtils.convertList(bsProjectPeopleScoreDTOList, BsProjectPeopleScoreEntity.class));
}
......@@ -165,16 +216,32 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject
}
// @Override
// public boolean updateProject(BsProjectDTO bsProjectDTO){
// //添加项目并获取id
// BsProjectEntity bsProjectEntity = DozerUtils.convertBean(bsProjectDTO,BsProjectEntity.class);
// updateById(bsProjectEntity);
//
// //更新项目成员和得分
// return bsProjectPeopleScoreService.saveOrUpdateBatch(DozerUtils.convertList(bsProjectDTO.getBsProjectPeopleScoreDTOList(), BsProjectPeopleScoreEntity.class));
//
// }
@Override
public boolean updateProject(BsProjectDTO bsProjectDTO){
//复制对象
BsProjectEntity bsProjectEntity = DozerUtils.convertBean(bsProjectDTO,BsProjectEntity.class);
//更新项目成员
if (bsProjectDTO.getBsProjectPeopleScoreDTOList() != null){
for (BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO : bsProjectDTO.getBsProjectPeopleScoreDTOList()){
//删除旧项目成员信息
bsProjectPeopleScoreService.remove(new QueryWrapper<BsProjectPeopleScoreEntity>().eq("project_id",bsProjectEntity.getId())
.eq("project_people",bsProjectPeopleScoreDTO.getProjectPeople()));
//删除就项目成员得分详情
bsProjectPeopleScoreDetailService.remove(new QueryWrapper<BsProjectPeopleScoreDetailEntity>().eq("project_id",bsProjectEntity.getId())
.eq("project_people",bsProjectPeopleScoreDTO.getProjectPeople()));
//将最新的项目成员添加进去
bsProjectPeopleScoreService.addProjectPeopleScore(bsProjectPeopleScoreDTO);
}
}
BsProjectPeopleScoreDTO scoreDTO = new BsProjectPeopleScoreDTO();
scoreDTO.setProjectId(bsProjectEntity.getId());
List<BsProjectPeopleScoreVO> bsProjectPeopleScoreVOList = bsProjectPeopleScoreService.qyeryProjectPeopleScoreList(scoreDTO);
bsProjectEntity.setProjectPeopleNum(bsProjectPeopleScoreVOList.size());
return updateById(bsProjectEntity);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment