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

项目和考核

parent aacb89ea
...@@ -16,7 +16,7 @@ import java.util.List; ...@@ -16,7 +16,7 @@ import java.util.List;
@Api(tags = "项目人员管理") @Api(tags = "项目人员管理")
@RestController @RestController
@RequestMapping("/project") @RequestMapping("/people")
public class BsProjectPeopleScoreController extends BaseController { public class BsProjectPeopleScoreController extends BaseController {
@Resource @Resource
...@@ -37,4 +37,10 @@ public class BsProjectPeopleScoreController extends BaseController { ...@@ -37,4 +37,10 @@ public class BsProjectPeopleScoreController extends BaseController {
return Result.data(bsProjectPeopleScoreService.addProjectPeopleScore(bsProjectPeopleScoreDTO)); return Result.data(bsProjectPeopleScoreService.addProjectPeopleScore(bsProjectPeopleScoreDTO));
} }
@ApiOperation(value = "查看得分详情")
@PostMapping("/detail")
public Result<BsProjectPeopleScoreVO> detail(BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO){
return Result.data(bsProjectPeopleScoreService.getDetail(bsProjectPeopleScoreDTO));
}
} }
package com.platform.projectBusiness.controller;
import com.platform.controller.BaseController;
import com.platform.model.resp.Result;
import com.platform.projectBusiness.model.dto.BsProjectPeopleScoreDTO;
import com.platform.projectBusiness.model.dto.BsProjectPeopleScoreDetailDTO;
import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreDetailVO;
import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreVO;
import com.platform.projectBusiness.service.BsProjectPeopleScoreDetailService;
import com.platform.projectBusiness.service.BsProjectPeopleScoreService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
@Api(tags = "项目人员得分详情管理")
@RestController
@RequestMapping("/score")
public class BsProjectPeopleScoreDetailController extends BaseController {
@Resource
private BsProjectPeopleScoreDetailService bsProjectPeopleScoreDetailService;
@ApiOperation(value = "考核打分")
@PostMapping("/mark")
public Result<Boolean> list(List<BsProjectPeopleScoreDetailDTO> bsProjectPeopleScoreDetailDTOS){
return Result.data(bsProjectPeopleScoreDetailService.updateScoresForForest(bsProjectPeopleScoreDetailDTOS));
}
}
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@Data @Data
...@@ -23,5 +24,11 @@ public class BsProjectPeopleScoreDetailEntity { ...@@ -23,5 +24,11 @@ public class BsProjectPeopleScoreDetailEntity {
private Integer parentId; private Integer parentId;
@TableField(value = "score") @TableField(value = "score")
private Double score; private Double score;
@ApiModelProperty("占比")
@TableField("percentage")
private Double percentage;
@ApiModelProperty("层级")
@TableField("level")
private Integer level;
} }
...@@ -24,4 +24,7 @@ public class BsProjectPeopleScoreEntity { ...@@ -24,4 +24,7 @@ public class BsProjectPeopleScoreEntity {
@ApiModelProperty(value = "项目人员得分") @ApiModelProperty(value = "项目人员得分")
@TableField(value = "score") @TableField(value = "score")
private Double score; private Double score;
@TableField(value = "状态")
@ApiModelProperty(value = "状态")
private String status;
} }
...@@ -26,4 +26,10 @@ public class BsProjectRoleAssessmentEntity { ...@@ -26,4 +26,10 @@ public class BsProjectRoleAssessmentEntity {
@ApiModelProperty("父级节点id") @ApiModelProperty("父级节点id")
@TableField("parent_id") @TableField("parent_id")
private Integer parentId; private Integer parentId;
@ApiModelProperty("占比")
@TableField("percentage")
private Double percentage;
@ApiModelProperty("层级")
@TableField("level")
private Integer level;
} }
package com.platform.projectBusiness.model.vo; package com.platform.projectBusiness.model.vo;
import com.platform.projectBusiness.model.entity.BsProjectPeopleScoreEntity; import com.platform.projectBusiness.model.entity.BsProjectPeopleScoreEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.List;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class BsProjectPeopleScoreVO extends BsProjectPeopleScoreEntity { public class BsProjectPeopleScoreVO extends BsProjectPeopleScoreEntity {
@ApiModelProperty(value = "项目人员得分详情树形结构列表")
private List<BsProjectPeopleScoreDetailVO> bsProjectPeopleScoreDetailVOList;
} }
package com.platform.projectBusiness.model.vo; package com.platform.projectBusiness.model.vo;
import com.platform.projectBusiness.model.entity.BsProjectEntity; import com.platform.projectBusiness.model.entity.BsProjectEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class BsProjectVO extends BsProjectEntity { public class BsProjectVO extends BsProjectEntity {
@ApiModelProperty("项目人数")
private Integer projectPeopleNum;
@ApiModelProperty("考核完成率")
private String checkCompleteRate;
} }
...@@ -13,4 +13,6 @@ public interface BsProjectPeopleScoreDetailService extends IService<BsProjectPeo ...@@ -13,4 +13,6 @@ public interface BsProjectPeopleScoreDetailService extends IService<BsProjectPeo
BsProjectPeopleScoreDetailEntity addAndGetId(BsProjectPeopleScoreDetailEntity bsProjectPeopleScoreDetailEntity); BsProjectPeopleScoreDetailEntity addAndGetId(BsProjectPeopleScoreDetailEntity bsProjectPeopleScoreDetailEntity);
boolean addProjectPeopleScoreDetail(BsProjectPeopleScoreDetailDTO bsProjectPeopleScoreDetailDTO); boolean addProjectPeopleScoreDetail(BsProjectPeopleScoreDetailDTO bsProjectPeopleScoreDetailDTO);
Boolean updateScoresForForest(List<BsProjectPeopleScoreDetailDTO> allNodes);
} }
...@@ -11,4 +11,6 @@ public interface BsProjectPeopleScoreService extends IService<BsProjectPeopleSco ...@@ -11,4 +11,6 @@ public interface BsProjectPeopleScoreService extends IService<BsProjectPeopleSco
List<BsProjectPeopleScoreVO> qyeryProjectPeopleScoreList(BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO); List<BsProjectPeopleScoreVO> qyeryProjectPeopleScoreList(BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO);
boolean addProjectPeopleScore(BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO); boolean addProjectPeopleScore(BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO);
BsProjectPeopleScoreVO getDetail(BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO);
} }
...@@ -9,11 +9,14 @@ import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreDetailVO; ...@@ -9,11 +9,14 @@ import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreDetailVO;
import com.platform.projectBusiness.model.vo.BsProjectRoleAssessmentVO; import com.platform.projectBusiness.model.vo.BsProjectRoleAssessmentVO;
import com.platform.projectBusiness.service.BsProjectPeopleScoreDetailService; import com.platform.projectBusiness.service.BsProjectPeopleScoreDetailService;
import com.platform.projectBusiness.service.BsProjectRoleAssessmentService; import com.platform.projectBusiness.service.BsProjectRoleAssessmentService;
import com.platform.utils.DozerUtils;
import com.platform.utils.StringUtils; import com.platform.utils.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
@Service @Service
public class BsProjectPeopleScoreDetailServiceImpl extends ServiceImpl<BsProjectPeopleScoreDetailMapper, BsProjectPeopleScoreDetailEntity> implements BsProjectPeopleScoreDetailService { public class BsProjectPeopleScoreDetailServiceImpl extends ServiceImpl<BsProjectPeopleScoreDetailMapper, BsProjectPeopleScoreDetailEntity> implements BsProjectPeopleScoreDetailService {
...@@ -23,44 +26,12 @@ public class BsProjectPeopleScoreDetailServiceImpl extends ServiceImpl<BsProject ...@@ -23,44 +26,12 @@ public class BsProjectPeopleScoreDetailServiceImpl extends ServiceImpl<BsProject
@Override @Override
public List<BsProjectPeopleScoreDetailVO> queryProjectPeopleScoreDetailList(BsProjectPeopleScoreDetailDTO bsProjectPeopleScoreDetailDTO){ public List<BsProjectPeopleScoreDetailVO> queryProjectPeopleScoreDetailList(BsProjectPeopleScoreDetailDTO bsProjectPeopleScoreDetailDTO){
// 1. 查询成员得分详情数据 // 1. 查询成员得分详情数据
List<BsProjectPeopleScoreDetailVO> bsProjectPeopleScoreDetailVOS = baseMapper.queryProjectPeopleScoreDetailList(bsProjectPeopleScoreDetailDTO);
// 2. 构建树形结构 return baseMapper.queryProjectPeopleScoreDetailList(bsProjectPeopleScoreDetailDTO);
return buildPositionTree(bsProjectPeopleScoreDetailVOS);
} }
/**
* 从成员得分详情中构建树形结构
*/
private List<BsProjectPeopleScoreDetailVO> buildPositionTree(List<BsProjectPeopleScoreDetailVO> sysDeptVOS) {
// 1. 创建ID到岗位的映射
Map<Integer, BsProjectPeopleScoreDetailVO> bsProjectPeopleScoreDetailVOHashMap = new HashMap<>();
for (BsProjectPeopleScoreDetailVO bsProjectPeopleScoreDetailVO : sysDeptVOS) {
bsProjectPeopleScoreDetailVOHashMap.put(bsProjectPeopleScoreDetailVO.getId(), bsProjectPeopleScoreDetailVO);
}
// 2. 构建树形结构
List<BsProjectPeopleScoreDetailVO> result = new ArrayList<>();
for (BsProjectPeopleScoreDetailVO bsProjectPeopleScoreDetailVO : sysDeptVOS) {
if (StringUtils.isEmpty(Collections.singleton(bsProjectPeopleScoreDetailVO.getParentId()))) {//修改
// 顶级节点
result.add(bsProjectPeopleScoreDetailVO);
} else {
// 子节点,添加到父节点的children中
BsProjectPeopleScoreDetailVO parent = bsProjectPeopleScoreDetailVOHashMap.get(bsProjectPeopleScoreDetailVO.getParentId());
if (parent != null) {
if (parent.getChildren() == null) {
parent.setChildren(new ArrayList<>());
}
parent.getChildren().add(bsProjectPeopleScoreDetailVO);
}
}
}
return result;
}
/** /**
* 添加成员得分详情并返回ID * 添加成员得分详情并返回ID
...@@ -108,6 +79,7 @@ public class BsProjectPeopleScoreDetailServiceImpl extends ServiceImpl<BsProject ...@@ -108,6 +79,7 @@ public class BsProjectPeopleScoreDetailServiceImpl extends ServiceImpl<BsProject
entity.setProjectPeople(projectPeople); entity.setProjectPeople(projectPeople);
entity.setAssessmentDescription(currentNode.getAssessmentDescription()); entity.setAssessmentDescription(currentNode.getAssessmentDescription());
entity.setAssessmentStandard(currentNode.getAssessmentStandard()); entity.setAssessmentStandard(currentNode.getAssessmentStandard());
entity.setPercentage(currentNode.getPercentage());
entity.setParentId(parentId); entity.setParentId(parentId);
// 保存当前节点并获取ID // 保存当前节点并获取ID
...@@ -138,4 +110,121 @@ public class BsProjectPeopleScoreDetailServiceImpl extends ServiceImpl<BsProject ...@@ -138,4 +110,121 @@ public class BsProjectPeopleScoreDetailServiceImpl extends ServiceImpl<BsProject
} }
} }
/**
* 分数更新
*/
@Override
@Transactional
public Boolean updateScoresForForest(List<BsProjectPeopleScoreDetailDTO> allNodes) {
if (allNodes == null || allNodes.isEmpty()) {
return false;
}
// 构建完整的节点映射和父子关系
Map<Integer, BsProjectPeopleScoreDetailDTO> nodeMap = allNodes.stream()
.collect(Collectors.toMap(BsProjectPeopleScoreDetailDTO::getId, node -> node));
Map<Integer, List<BsProjectPeopleScoreDetailDTO>> childrenMap = buildCompleteChildrenMap(allNodes);
// 找到所有叶子节点并更新
List<BsProjectPeopleScoreDetailDTO> leafNodes = findLeafNodes(nodeMap, childrenMap);
// 更新每个叶子节点路径上的所有父节点
for (BsProjectPeopleScoreDetailDTO leaf : leafNodes) {
updateAncestorScores(leaf, nodeMap, childrenMap);
}
return updateBatchById(DozerUtils.convertList(allNodes, BsProjectPeopleScoreDetailEntity.class));
}
/**
* 构建完整的父子关系映射
*/
private Map<Integer, List<BsProjectPeopleScoreDetailDTO>> buildCompleteChildrenMap(List<BsProjectPeopleScoreDetailDTO> nodes) {
Map<Integer, List<BsProjectPeopleScoreDetailDTO>> map = new HashMap<>();
for (BsProjectPeopleScoreDetailDTO node : nodes) {
Integer parentId = node.getParentId();
if (!map.containsKey(parentId)) {
map.put(parentId, new ArrayList<>());
}
map.get(parentId).add(node);
}
return map;
}
/**
* 使用节点映射查找叶子节点
*/
private List<BsProjectPeopleScoreDetailDTO> findLeafNodes(Map<Integer, BsProjectPeopleScoreDetailDTO> nodeMap,
Map<Integer, List<BsProjectPeopleScoreDetailDTO>> childrenMap) {
return nodeMap.values().stream()
.filter(node -> isLeafNode(node.getId(), childrenMap))
.collect(Collectors.toList());
}
/**
* 判断是否为叶子节点
*/
private boolean isLeafNode(Integer nodeId, Map<Integer, List<BsProjectPeopleScoreDetailDTO>> childrenMap) {
List<BsProjectPeopleScoreDetailDTO> children = childrenMap.get(nodeId);
return children == null || children.isEmpty();
}
/**
* 更新祖先节点分数
*/
private void updateAncestorScores(BsProjectPeopleScoreDetailDTO node,
Map<Integer, BsProjectPeopleScoreDetailDTO> nodeMap,
Map<Integer, List<BsProjectPeopleScoreDetailDTO>> childrenMap) {
Integer currentParentId = node.getParentId();
if (currentParentId == null) {
return; // 到达虚拟根节点
}
BsProjectPeopleScoreDetailDTO parent = nodeMap.get(currentParentId);
if (parent == null) {
return;
}
// 更新当前父节点的分数
updateSingleParentScore(parent, childrenMap.get(parent.getId()), nodeMap);
// 继续向上更新
updateAncestorScores(parent, nodeMap, childrenMap);
}
/**
* 更新单个父节点的分数
* - 层级3: percentage=0.1, score=20 → 贡献值 = 20 × 0.1 = 2
* - 另一个层级3: percentage=0.1, score=20 → 贡献值 = 2
* - 层级2: percentage=0.2, score=4 (由两个层级3节点贡献: 2+2=4)
*/
private void updateSingleParentScore(BsProjectPeopleScoreDetailDTO parent,
List<BsProjectPeopleScoreDetailDTO> children,
Map<Integer, BsProjectPeopleScoreDetailDTO> nodeMap) {
if (children == null || children.isEmpty()) {
return;
}
// 计算父节点的新分数:所有子节点的(分数 × 子节点percentage)之和
double calculatedScore = children.stream()
.mapToDouble(child -> child.getScore() * child.getPercentage())
.sum();
// 更新父节点分数(保留两位小数)
parent.setScore(Math.round(calculatedScore * 100.0) / 100.0);
}
} }
...@@ -5,13 +5,16 @@ import com.platform.projectBusiness.mapper.BsProjectPeopleScoreMapper; ...@@ -5,13 +5,16 @@ import com.platform.projectBusiness.mapper.BsProjectPeopleScoreMapper;
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.entity.BsProjectPeopleScoreEntity; import com.platform.projectBusiness.model.entity.BsProjectPeopleScoreEntity;
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.service.BsProjectPeopleScoreDetailService; import com.platform.projectBusiness.service.BsProjectPeopleScoreDetailService;
import com.platform.projectBusiness.service.BsProjectPeopleScoreService; import com.platform.projectBusiness.service.BsProjectPeopleScoreService;
import com.platform.utils.DozerUtils;
import com.platform.utils.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.*;
@Service @Service
public class BsProjectPeopleScoreServiceImpl extends ServiceImpl<BsProjectPeopleScoreMapper, BsProjectPeopleScoreEntity> implements BsProjectPeopleScoreService { public class BsProjectPeopleScoreServiceImpl extends ServiceImpl<BsProjectPeopleScoreMapper, BsProjectPeopleScoreEntity> implements BsProjectPeopleScoreService {
...@@ -43,4 +46,65 @@ public class BsProjectPeopleScoreServiceImpl extends ServiceImpl<BsProjectPeople ...@@ -43,4 +46,65 @@ public class BsProjectPeopleScoreServiceImpl extends ServiceImpl<BsProjectPeople
} }
/**
* 从成员得分详情中构建树形结构
*/
private List<BsProjectPeopleScoreDetailVO> buildTree(List<BsProjectPeopleScoreDetailVO> sysDeptVOS) {
// 1. 创建ID到岗位的映射
Map<Integer, BsProjectPeopleScoreDetailVO> bsProjectPeopleScoreDetailVOHashMap = new HashMap<>();
for (BsProjectPeopleScoreDetailVO bsProjectPeopleScoreDetailVO : sysDeptVOS) {
bsProjectPeopleScoreDetailVOHashMap.put(bsProjectPeopleScoreDetailVO.getId(), bsProjectPeopleScoreDetailVO);
}
// 2. 构建树形结构
List<BsProjectPeopleScoreDetailVO> result = new ArrayList<>();
for (BsProjectPeopleScoreDetailVO bsProjectPeopleScoreDetailVO : sysDeptVOS) {
if (StringUtils.isEmpty(Collections.singleton(bsProjectPeopleScoreDetailVO.getParentId()))) {//修改
// 顶级节点
result.add(bsProjectPeopleScoreDetailVO);
} else {
// 子节点,添加到父节点的children中
BsProjectPeopleScoreDetailVO parent = bsProjectPeopleScoreDetailVOHashMap.get(bsProjectPeopleScoreDetailVO.getParentId());
if (parent != null) {
if (parent.getChildren() == null) {
parent.setChildren(new ArrayList<>());
}
parent.getChildren().add(bsProjectPeopleScoreDetailVO);
}
}
}
return result;
}
@Override
public BsProjectPeopleScoreVO getDetail(BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO) {
// 查询项目人员得分详情
BsProjectPeopleScoreDetailDTO bsProjectPeopleScoreDetailDTO = new BsProjectPeopleScoreDetailDTO();
bsProjectPeopleScoreDetailDTO.setProjectId(bsProjectPeopleScoreDTO.getProjectId());
bsProjectPeopleScoreDetailDTO.setProjectPeople(bsProjectPeopleScoreDTO.getProjectPeople());
List<BsProjectPeopleScoreDetailVO> bsProjectPeopleScoreDetailVOS = bsProjectPeopleScoreDetailService.queryProjectPeopleScoreDetailList(bsProjectPeopleScoreDetailDTO);
// 查询项目人员得分
BsProjectPeopleScoreEntity bsProjectPeopleScoreEntity = getById(bsProjectPeopleScoreDTO.getId());
BsProjectPeopleScoreVO bsProjectPeopleScoreVO = DozerUtils.convertBean(bsProjectPeopleScoreEntity,BsProjectPeopleScoreVO.class);
// 构建树形结构并赋值
bsProjectPeopleScoreVO.setBsProjectPeopleScoreDetailVOList(buildTree(bsProjectPeopleScoreDetailVOS));
//求出总得分
Double totalScore = 0.0;
for (BsProjectPeopleScoreDetailVO bsProjectPeopleScoreDetailVO : bsProjectPeopleScoreDetailVOS){
if (bsProjectPeopleScoreDetailVO.getParentId() == null){
totalScore += bsProjectPeopleScoreDetailVO.getScore();
}
}
bsProjectPeopleScoreVO.setScore(totalScore);
//更新回数据库
updateById(bsProjectPeopleScoreVO);
return bsProjectPeopleScoreVO;
}
} }
...@@ -22,4 +22,6 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject ...@@ -22,4 +22,6 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject
public List<BsProjectVO> queryProjectList(BsProjectDTO bsProjectDTO){ public List<BsProjectVO> queryProjectList(BsProjectDTO bsProjectDTO){
return baseMapper.queryProjectList(bsProjectDTO); return baseMapper.queryProjectList(bsProjectDTO);
} }
} }
...@@ -9,8 +9,10 @@ ...@@ -9,8 +9,10 @@
project_people, project_people,
assessment_description, assessment_description,
assessment_standard, assessment_standard,
parent_id parent_id,
score score,
percentage,
level
from from
bs_project_people_score_detail bs_project_people_score_detail
<where> <where>
......
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
<if test="projectId != null and projectId != ''"> <if test="projectId != null and projectId != ''">
project_id = #{projectId} project_id = #{projectId}
</if> </if>
<if test="projectPeople != null and projectPeople != ''">
project_people = #{projectPeople}
</if>
</where> </where>
</select> </select>
......
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