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 187d3807..23a3ee5d 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -776,24 +776,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); @@ -828,7 +829,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; diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 910a4b25..56386009 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -884,13 +884,18 @@ public class ResultRecordServiceImpl extends ServiceImpl flowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(approvalDto.getResultRecordId(), 2); + Long commentId = 0l; if (CollectionUtils.isNotEmpty(flowRecords)) { FlowRecord preFlowRecord = flowRecords.get(0); // 评论内容 FlowChart flowChart = flowService.selectFlowChartByChartId(preFlowRecord.getFlowId()); - comment(approvalDto, flowChart); + commentId = comment(approvalDto, flowChart); } + R r = apply(approvalDto); + return r.put("commentId",commentId); + } + public R apply( ApprovalDto approvalDto){ switch (approvalDto.getStatus()) { case 1: //1 提交审批,审批通过 return newSubmit(approvalDto, null); @@ -920,7 +925,7 @@ public class ResultRecordServiceImpl extends ServiceImpl