From 72ada786ad55a99e5c259d0de4b9115b86b87c71 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 15 Dec 2020 17:04:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=BB=A9=E6=95=88?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=8D=E6=9B=B4=E6=96=B0record=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cdac9256..71032008 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -978,7 +978,7 @@ public class ResultRecordController extends AbstractController { resultScoreService.updateBatchById(updateScores); } - resultRecordService.updateResultRecordById(resultRecord); + //resultRecordService.updateResultRecordById(resultRecord); if(dto.getCommentId() != null && dto.getCommentId().intValue() > 0){ //修改评论信息 From 9b0983f7c05647ecdb2bbb175898150cccb12a50 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 15 Dec 2020 17:16:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?record=E5=8F=AA=E6=9B=B4=E6=96=B0=E8=AF=84?= =?UTF-8?q?=E5=88=86=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/app/controller/ResultRecordController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 71032008..3a893607 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -798,8 +798,10 @@ public class ResultRecordController extends AbstractController { @ApiOperation("保存绩效详情-吴林") public R saveDetail(@RequestBody @ApiParam ResultRecordDetailDto dto) { Long userId = getUserId(); - ResultRecord resultRecord = new ResultRecord(); + //ResultRecord resultRecord = new ResultRecord(); + ResultRecord resultRecord = resultRecordService.selectResultRecordById(dto.getId()); BeanUtils.copyProperties(dto, resultRecord); + //resultRecord. resultRecord.setAllScore(resultRecord.getLastScore()); List inserts = new ArrayList<>(); List updates = new ArrayList<>(); @@ -978,7 +980,7 @@ public class ResultRecordController extends AbstractController { resultScoreService.updateBatchById(updateScores); } - //resultRecordService.updateResultRecordById(resultRecord); + resultRecordService.updateResultRecordById(resultRecord); if(dto.getCommentId() != null && dto.getCommentId().intValue() > 0){ //修改评论信息 From 3c43aef7cc456971be2d8f77c89558d6a0f5f5d5 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 15 Dec 2020 17:22:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 3a893607..b63c678b 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -800,8 +800,7 @@ public class ResultRecordController extends AbstractController { Long userId = getUserId(); //ResultRecord resultRecord = new ResultRecord(); ResultRecord resultRecord = resultRecordService.selectResultRecordById(dto.getId()); - BeanUtils.copyProperties(dto, resultRecord); - //resultRecord. + resultRecord.setAllScore(resultRecord.getLastScore()); List inserts = new ArrayList<>(); List updates = new ArrayList<>();