wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加个人计算总分的公司

Browse Source
This commit is contained in:
wulin 2020-12-17 11:22:27 +08:00
parent 003642096d
commit caa3c109d8
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
View File

@ -456,9 +456,9 @@ public class ResultRecordController extends AbstractController {
ResultRecordDetailDto resultRecordDetailDto = new ResultRecordDetailDto();
BeanUtils.copyProperties(resultRecord, resultRecordDetailDto);
List<ResultModel> resultModels = resultModelService.selectResultModelByGroupId(resultRecord.getEvaluationId());
//获取计算公式
//获取单个人评分总分计算公式
List<CalculateModel> calculateModels1 = getCalculate(3l);
//获取计算公式
//获取每行的计算公式
List<CalculateModel> calculateModels = getCalculate(resultModels.get(0).getCalculateId());
@ -568,7 +568,7 @@ public class ResultRecordController extends AbstractController {
for (ResultDetailDto dto:detailDtos
) {
//下面设置计算公式
dto.setCalculate(setCalculateValue(calculateModels1, dto)) ;
//dto.setCalculate(setCalculateValue(calculateModels1, dto)) ;
List<ResultTaskDto> resultTaskDtos = resultTaskService.selectResultTaskDtosByDetailId(dto.getId());
dto.setTaskDtos(resultTaskDtos);
weight = weight.add(dto.getCheckWeight());
@ -598,6 +598,9 @@ public class ResultRecordController extends AbstractController {
scoreDto1.setCalculate(scoreDto1.getCalculate() + setCalculateValue(calculateModels, dto)) ;
scoreDto1.setCalculate(scoreDto1.getCalculate() + setCalculateValue(calculateModels, scoreDto1)) ;
scoreDtos1.add(scoreDto1);
//设置个人评分总分的计算方式， add
scoreDto1.setAllCalculate(setCalculateValue(calculateModels1, dto)) ;
scores.remove(score);
isAdd = true;
break;

4
src/main/java/com/lz/modules/flow/model/ResultDetailDto.java
View File

@ -32,9 +32,7 @@ public class ResultDetailDto {
@ApiModelProperty(value = "关键结果", name = "keyResult")
private String keyResult;
//评分说明
@ApiModelProperty(value = "计算公式", name = "calculate")
private String calculate;
//考核权重
@ApiModelProperty(value = "考核权重", name = "checkWeight")

5
src/main/java/com/lz/modules/flow/model/ResultScoreDto.java
View File

@ -37,9 +37,12 @@ public class ResultScoreDto {
private BigDecimal weight;
//评分说明
@ApiModelProperty(value = "计算公式", name = "calculate")
@ApiModelProperty(value = "单个计算公式", name = "calculate")
private String calculate;
@ApiModelProperty(value = "个人总分计算公式，不剩于多人评分中个人所占的比重", name = "allCalculate")
private String allCalculate;
//评分说明
@ApiModelProperty(value = "评分说明", name = "scoreComment")
private String scoreComment;