From caa3c109d8fb0d49fede4c04d3f0ac27d7496f32 Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 17 Dec 2020 11:22:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=AA=E4=BA=BA=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E6=80=BB=E5=88=86=E7=9A=84=E5=85=AC=E5=8F=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/app/controller/ResultRecordController.java | 9 ++++++--- .../java/com/lz/modules/flow/model/ResultDetailDto.java | 4 +--- .../java/com/lz/modules/flow/model/ResultScoreDto.java | 5 ++++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 0a57c291..11e98203 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -456,9 +456,9 @@ public class ResultRecordController extends AbstractController { ResultRecordDetailDto resultRecordDetailDto = new ResultRecordDetailDto(); BeanUtils.copyProperties(resultRecord, resultRecordDetailDto); List resultModels = resultModelService.selectResultModelByGroupId(resultRecord.getEvaluationId()); - //获取计算公式 + //获取单个人评分总分计算公式 List calculateModels1 = getCalculate(3l); - //获取计算公式 + //获取每行的计算公式 List 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 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; diff --git a/src/main/java/com/lz/modules/flow/model/ResultDetailDto.java b/src/main/java/com/lz/modules/flow/model/ResultDetailDto.java index 0e71f3ed..be8b305d 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultDetailDto.java +++ b/src/main/java/com/lz/modules/flow/model/ResultDetailDto.java @@ -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") diff --git a/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java b/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java index 157816c3..83e075b1 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java +++ b/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java @@ -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;