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

保存绩效时增加commandId参数

Browse Source
This commit is contained in:
wulin 2020-12-04 16:49:31 +08:00
parent 5c6f82c82e
commit 9e49c4bb31
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -762,24 +762,25 @@ public class ResultRecordController extends AbstractController {
} }
if(!resultDetail.getCheckResult().equals(resultDetail1.getCheckResult())){ if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){
//打上标识 //打上标识
isUp = true; isUp = true;
resultDetail1.setCheckResult("<s>" + resultDetail1.getCheckResult() + "</s>"); resultDetail1.setKeyResult("<s>" + resultDetail1.getKeyResult() + "</s>");
}
if(resultDetail.getIsDelete().intValue() == 1){//被删除了
resultDetail.setIsDelete(0);
isUp = true;
} }
if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){ if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){
//打上标识 //打上标识
isUp = true; isUp = true;
//resultDetail1.setTarget("<s>" + resultDetail1.getTarget() + "</s>");
} }
if(isUp){ if(isUp){
resultDetail1.setId(null); resultDetail1.setId(null);
resultDetail1.setIsBack(1); resultDetail1.setIsBack(1);
resultDetail1.setTarget("<s>" + resultDetail1.getTarget() + "</s>"); resultDetail1.setTarget("<s>" + resultDetail1.getTarget() + "</s>");
resultDetail1.setBackId(resultDetail.getId()); resultDetail1.setBackId(resultDetail.getId());
inserts.add(resultDetail); inserts.add(resultDetail1);
} }
} }
resultDetail.setPriority(index); resultDetail.setPriority(index);
@ -814,7 +815,6 @@ public class ResultRecordController extends AbstractController {
} }
resultDetail.setAcquireScore(score); resultDetail.setAcquireScore(score);
weight = weight.add(resultDetail.getCheckWeight()); weight = weight.add(resultDetail.getCheckWeight());
} }
} }

2
src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java
View File

@ -33,6 +33,8 @@ public class ResultRecordDetailDto {
//备注 //备注
@ApiModelProperty(value = "备注", name = "remark") @ApiModelProperty(value = "备注", name = "remark")
private String remark; private String remark;
@ApiModelProperty(value = "业绩评论id", name = "commandId")
private Long commandId;
//员工id //员工id
@ApiModelProperty(value = "员工id", name = "staffId") @ApiModelProperty(value = "员工id", name = "staffId")
private Long staffId; private Long staffId;