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 620608ca..0f4a8b92 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -762,24 +762,25 @@ public class ResultRecordController extends AbstractController {
}
- if(!resultDetail.getCheckResult().equals(resultDetail1.getCheckResult())){
+ if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){
//打上标识
isUp = true;
- resultDetail1.setCheckResult("" + resultDetail1.getCheckResult() + "");
+ resultDetail1.setKeyResult("" + resultDetail1.getKeyResult() + "");
+ }
+ if(resultDetail.getIsDelete().intValue() == 1){//被删除了
+ resultDetail.setIsDelete(0);
+ isUp = true;
}
-
if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){
//打上标识
isUp = true;
-
- //resultDetail1.setTarget("" + resultDetail1.getTarget() + "");
}
if(isUp){
resultDetail1.setId(null);
resultDetail1.setIsBack(1);
resultDetail1.setTarget("" + resultDetail1.getTarget() + "");
resultDetail1.setBackId(resultDetail.getId());
- inserts.add(resultDetail);
+ inserts.add(resultDetail1);
}
}
resultDetail.setPriority(index);
@@ -814,7 +815,6 @@ public class ResultRecordController extends AbstractController {
}
resultDetail.setAcquireScore(score);
weight = weight.add(resultDetail.getCheckWeight());
-
}
}
diff --git a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java
index b2c906c0..19d1ad27 100644
--- a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java
+++ b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java
@@ -33,6 +33,8 @@ public class ResultRecordDetailDto {
//备注
@ApiModelProperty(value = "备注", name = "remark")
private String remark;
+ @ApiModelProperty(value = "业绩评论id", name = "commandId")
+ private Long commandId;
//员工id
@ApiModelProperty(value = "员工id", name = "staffId")
private Long staffId;