增加非制定目标节点时,判断是否变更原有目标,权重,指标名称功能
This commit is contained in:
parent
b2806dc028
commit
5c6f82c82e
@ -754,7 +754,33 @@ public class ResultRecordController extends AbstractController {
|
|||||||
BeanUtils.copyProperties(detailDto, resultDetail);
|
BeanUtils.copyProperties(detailDto, resultDetail);
|
||||||
if(!isSetKeyResult && resultDetail.getId() != null && mapDetails.containsKey(resultDetail.getId())){
|
if(!isSetKeyResult && resultDetail.getId() != null && mapDetails.containsKey(resultDetail.getId())){
|
||||||
//这里判断是否有更新,或者删除
|
//这里判断是否有更新,或者删除
|
||||||
|
ResultDetail resultDetail1 = mapDetails.get(resultDetail.getId());
|
||||||
|
boolean isUp = false;
|
||||||
|
if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){
|
||||||
|
//打上标识
|
||||||
|
isUp = true;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!resultDetail.getCheckResult().equals(resultDetail1.getCheckResult())){
|
||||||
|
//打上标识
|
||||||
|
isUp = true;
|
||||||
|
resultDetail1.setCheckResult("<s>" + resultDetail1.getCheckResult() + "</s>");
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){
|
||||||
|
//打上标识
|
||||||
|
isUp = true;
|
||||||
|
|
||||||
|
//resultDetail1.setTarget("<s>" + resultDetail1.getTarget() + "</s>");
|
||||||
|
}
|
||||||
|
if(isUp){
|
||||||
|
resultDetail1.setId(null);
|
||||||
|
resultDetail1.setIsBack(1);
|
||||||
|
resultDetail1.setTarget("<s>" + resultDetail1.getTarget() + "</s>");
|
||||||
|
resultDetail1.setBackId(resultDetail.getId());
|
||||||
|
inserts.add(resultDetail);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
resultDetail.setPriority(index);
|
resultDetail.setPriority(index);
|
||||||
|
|
||||||
|
|||||||
@ -43,6 +43,10 @@ public class ResultScoreDto {
|
|||||||
//评分说明
|
//评分说明
|
||||||
@ApiModelProperty(value = "评分说明", name = "scoreComment")
|
@ApiModelProperty(value = "评分说明", name = "scoreComment")
|
||||||
private String scoreComment;
|
private String scoreComment;
|
||||||
|
|
||||||
|
//根据权重计算除的实际得分
|
||||||
|
@ApiModelProperty(value = "根据权重计算除的实际得分", name = "score")
|
||||||
|
private BigDecimal score;
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user