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

优化内容

parent e6feddf2
...@@ -37,8 +37,9 @@ public class BsProjectController extends BaseController { ...@@ -37,8 +37,9 @@ public class BsProjectController extends BaseController {
@ApiOperation(value = "项目详情") @ApiOperation(value = "项目详情")
@GetMapping("/{id}") @GetMapping("/{id}")
public Result<BsProjectVO> detail(@PathVariable Integer id){ public Result<BsProjectVO> detail(@PathVariable Integer id,@RequestHeader("Authorization") String token){
return Result.data(bsProjectService.geDetail(id)); String name = jwtUtil.getUserNameFromToken(token);
return Result.data(bsProjectService.geDetail(id,name));
} }
...@@ -56,4 +57,13 @@ public class BsProjectController extends BaseController { ...@@ -56,4 +57,13 @@ public class BsProjectController extends BaseController {
return Result.data(bsProjectService.updateProject(bsProjectDTO)); return Result.data(bsProjectService.updateProject(bsProjectDTO));
} }
@ApiOperation(value = "删除")
@DeleteMapping("/delete")
public Result<Boolean> delete(@RequestParam Integer id){
return Result.data(bsProjectService.removeProject(id));
}
} }
...@@ -45,12 +45,16 @@ public class BsProjectRoleAssessmentController extends BaseController { ...@@ -45,12 +45,16 @@ public class BsProjectRoleAssessmentController extends BaseController {
@ApiOperation(value = "项目考核提交") @ApiOperation(value = "项目考核提交")
@PostMapping("/commit") @PostMapping("/commit")
public Result<Boolean> commit(@RequestBody List<BsProjectRoleAssessmentDTO> assessmentDTOS){ public Result<Boolean> commit(@RequestBody List<BsProjectRoleAssessmentDTO> assessmentDTOS){
return Result.data(bsProjectRoleAssessmentService.commitAssessment(assessmentDTOS)); if (bsProjectRoleAssessmentService.commitAssessment(assessmentDTOS)){
return Result.success("提交成功");
}else {
return Result.fail("考核占比综合必须为100%,请检查");
}
} }
@ApiOperation(value = "项目考核标准删除") @ApiOperation(value = "项目考核标准删除")
@DeleteMapping("/delete") @DeleteMapping("/delete")
public Result<Boolean> delete(@RequestBody List<BsProjectRoleAssessmentDTO> assessmentDTOS){ public Result<Boolean> delete(@RequestParam Integer id){
return Result.data(bsProjectRoleAssessmentService.removeBatchByIds(assessmentDTOS)); return Result.data(bsProjectRoleAssessmentService.removeById(id));
} }
} }
...@@ -19,4 +19,10 @@ public class BsProjectVO extends BsProjectEntity { ...@@ -19,4 +19,10 @@ public class BsProjectVO extends BsProjectEntity {
@ApiModelProperty("项目成员得分") @ApiModelProperty("项目成员得分")
private List<BsProjectPeopleScoreVO> bsProjectPeopleScoreVOList; private List<BsProjectPeopleScoreVO> bsProjectPeopleScoreVOList;
@ApiModelProperty("当前登陆人的项目角色")
private String projectRole;
@ApiModelProperty("系统角色")
private String systemRole;
} }
...@@ -11,10 +11,12 @@ import java.util.List; ...@@ -11,10 +11,12 @@ import java.util.List;
public interface BsProjectService extends IService<BsProjectEntity> { public interface BsProjectService extends IService<BsProjectEntity> {
List<BsProjectVO> queryProjectList(BsProjectDTO bsProjectDTO); List<BsProjectVO> queryProjectList(BsProjectDTO bsProjectDTO);
BsProjectVO geDetail(Integer projectId); BsProjectVO geDetail(Integer projectId,String name);
@Transactional @Transactional
boolean addProject(BsProjectDTO bsProjectDTO); boolean addProject(BsProjectDTO bsProjectDTO);
boolean updateProject(BsProjectDTO bsProjectDTO); boolean updateProject(BsProjectDTO bsProjectDTO);
boolean removeProject(Integer id);
} }
...@@ -216,7 +216,7 @@ public class BsProjectPeopleScoreDetailServiceImpl extends ServiceImpl<BsProject ...@@ -216,7 +216,7 @@ public class BsProjectPeopleScoreDetailServiceImpl extends ServiceImpl<BsProject
// 计算父节点的新分数:所有子节点的(分数 × 子节点percentage)之和 // 计算父节点的新分数:所有子节点的(分数 × 子节点percentage)之和
double calculatedScore = children.stream() double calculatedScore = children.stream()
.mapToDouble(child -> child.getScore() * child.getPercentage()) .mapToDouble(child -> child.getScore() * child.getPercentage()*0.01)
.sum(); .sum();
// 更新父节点分数(保留两位小数) // 更新父节点分数(保留两位小数)
......
...@@ -137,7 +137,17 @@ public class BsProjectRoleAssessmentServiceImpl extends ServiceImpl<BsProjectRol ...@@ -137,7 +137,17 @@ public class BsProjectRoleAssessmentServiceImpl extends ServiceImpl<BsProjectRol
@Override @Override
public boolean updateBatchAssessment(List<BsProjectRoleAssessmentDTO> assessmentList){ public boolean updateBatchAssessment(List<BsProjectRoleAssessmentDTO> assessmentList){
// 批量更新项目角色对应考核项模板 // 批量更新项目角色对应考核项模板
updateBatchById(DozerUtils.convertList(assessmentList, BsProjectRoleAssessmentEntity.class)); for (BsProjectRoleAssessmentDTO assessmentDTO : assessmentList){
//更新一级节点
BsProjectRoleAssessmentEntity entity = DozerUtils.convertBean(assessmentDTO, BsProjectRoleAssessmentEntity.class);
saveOrUpdate(entity);
//更新子节点
for (BsProjectRoleAssessmentDTO childrenDTO : assessmentDTO.getChildren()){
BsProjectRoleAssessmentEntity childrenEntity = DozerUtils.convertBean(childrenDTO, BsProjectRoleAssessmentEntity.class);
childrenEntity.setParentId(assessmentDTO.getId());
saveOrUpdate(childrenEntity);
}
}
//更新实际人员对应考核项 //更新实际人员对应考核项
updateAssessmentTree(assessmentList); updateAssessmentTree(assessmentList);
return true; return true;
...@@ -203,8 +213,8 @@ public class BsProjectRoleAssessmentServiceImpl extends ServiceImpl<BsProjectRol ...@@ -203,8 +213,8 @@ public class BsProjectRoleAssessmentServiceImpl extends ServiceImpl<BsProjectRol
assessmentDTO.setPercentage(percentage); assessmentDTO.setPercentage(percentage);
sum += percentage; sum += percentage;
} }
if (sum != 100.0){ if (sum != 100){
throw new BusinessException("考核项占比之和必须为100%"); return false;
}else { }else {
return updateBatchAssessment(assessmentList); return updateBatchAssessment(assessmentList);
} }
......
...@@ -6,6 +6,7 @@ import com.platform.projectBusiness.mapper.BsProjectMapper; ...@@ -6,6 +6,7 @@ import com.platform.projectBusiness.mapper.BsProjectMapper;
import com.platform.projectBusiness.model.dto.BsProjectDTO; import com.platform.projectBusiness.model.dto.BsProjectDTO;
import com.platform.projectBusiness.model.dto.BsProjectPeopleScoreDTO; import com.platform.projectBusiness.model.dto.BsProjectPeopleScoreDTO;
import com.platform.projectBusiness.model.dto.BsProjectPeopleScoreDetailDTO; import com.platform.projectBusiness.model.dto.BsProjectPeopleScoreDetailDTO;
import com.platform.projectBusiness.model.dto.SysUserDTO;
import com.platform.projectBusiness.model.entity.BsProjectEntity; import com.platform.projectBusiness.model.entity.BsProjectEntity;
import com.platform.projectBusiness.model.entity.BsProjectPeopleScoreDetailEntity; import com.platform.projectBusiness.model.entity.BsProjectPeopleScoreDetailEntity;
import com.platform.projectBusiness.model.entity.BsProjectPeopleScoreEntity; import com.platform.projectBusiness.model.entity.BsProjectPeopleScoreEntity;
...@@ -13,6 +14,7 @@ import com.platform.projectBusiness.model.entity.SysUserEntity; ...@@ -13,6 +14,7 @@ import com.platform.projectBusiness.model.entity.SysUserEntity;
import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreDetailVO; import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreDetailVO;
import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreVO; import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreVO;
import com.platform.projectBusiness.model.vo.BsProjectVO; import com.platform.projectBusiness.model.vo.BsProjectVO;
import com.platform.projectBusiness.model.vo.SysUserVO;
import com.platform.projectBusiness.service.BsProjectPeopleScoreDetailService; import com.platform.projectBusiness.service.BsProjectPeopleScoreDetailService;
import com.platform.projectBusiness.service.BsProjectPeopleScoreService; import com.platform.projectBusiness.service.BsProjectPeopleScoreService;
import com.platform.projectBusiness.service.BsProjectService; import com.platform.projectBusiness.service.BsProjectService;
...@@ -143,7 +145,10 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject ...@@ -143,7 +145,10 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject
@Override @Override
public BsProjectVO geDetail(Integer projectId){ public BsProjectVO geDetail(Integer projectId,String name){
//获取当前登陆人的项目角色
String projectRole = "";
SysUserEntity sysUserEntity = sysUserService.getOne(new QueryWrapper<SysUserEntity>().eq("name",name));
BsProjectEntity bsProjectEntity = getById(projectId); BsProjectEntity bsProjectEntity = getById(projectId);
BsProjectVO bsProjectVO = DozerUtils.convertBean(bsProjectEntity,BsProjectVO.class); BsProjectVO bsProjectVO = DozerUtils.convertBean(bsProjectEntity,BsProjectVO.class);
//获取项目成员得分 //获取项目成员得分
...@@ -164,6 +169,10 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject ...@@ -164,6 +169,10 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject
if ("已完成".equals(bsProjectPeopleScoreVO.getStatus())){ if ("已完成".equals(bsProjectPeopleScoreVO.getStatus())){
completeNum++; completeNum++;
} }
//找出当前登录人的项目角色
if (sysUserEntity.getId().equals(bsProjectPeopleScoreVO.getProjectPeople())){
projectRole = bsProjectPeopleScoreVO.getProjectRole();
}
//统计各个成员完成率 //统计各个成员完成率
int completeNum1 = 0; int completeNum1 = 0;
BsProjectPeopleScoreDetailDTO bsProjectPeopleScoreDetailDTO = new BsProjectPeopleScoreDetailDTO(); BsProjectPeopleScoreDetailDTO bsProjectPeopleScoreDetailDTO = new BsProjectPeopleScoreDetailDTO();
...@@ -179,6 +188,7 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject ...@@ -179,6 +188,7 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject
bsProjectPeopleScoreVO.setCompleteRate(String.format("%.2f",completeNum1 * 100.0 / bsProjectPeopleScoreDetailDTOList.size())); bsProjectPeopleScoreVO.setCompleteRate(String.format("%.2f",completeNum1 * 100.0 / bsProjectPeopleScoreDetailDTOList.size()));
} }
bsProjectVO.setCheckCompleteRate(String.format("%.2f",completeNum * 100.0 / bsProjectPeopleScoreVOList.size())); bsProjectVO.setCheckCompleteRate(String.format("%.2f",completeNum * 100.0 / bsProjectPeopleScoreVOList.size()));
bsProjectVO.setProjectRole(projectRole);
return bsProjectVO; return bsProjectVO;
} }
...@@ -245,4 +255,14 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject ...@@ -245,4 +255,14 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject
@Override
public boolean removeProject(Integer id){
//删除项目成员
bsProjectPeopleScoreService.remove(new QueryWrapper<BsProjectPeopleScoreEntity>().eq("project_id",id));
bsProjectPeopleScoreDetailService.remove(new QueryWrapper<BsProjectPeopleScoreDetailEntity>().eq("project_id",id));
return removeById(id);
}
} }
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
delivery_date, delivery_date,
description, description,
status, status,
start_time start_time,
project_people_num
from from
bs_project bs_project
<where> <where>
......
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