From 5c6f82c82e2b71d217dde263e657ff52cc7ec786 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Thu, 3 Dec 2020 17:50:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9D=9E=E5=88=B6=E5=AE=9A?=
 =?UTF-8?q?=E7=9B=AE=E6=A0=87=E8=8A=82=E7=82=B9=E6=97=B6=EF=BC=8C=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E5=8F=98=E6=9B=B4=E5=8E=9F=E6=9C=89?=
 =?UTF-8?q?=E7=9B=AE=E6=A0=87=EF=BC=8C=E6=9D=83=E9=87=8D=EF=BC=8C=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E5=90=8D=E7=A7=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ResultRecordController.java    | 26 +++++++++++++++++++
 .../lz/modules/flow/model/ResultScoreDto.java |  4 +++
 2 files changed, 30 insertions(+)

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 a4853267..620608ca 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -754,7 +754,33 @@ public class ResultRecordController extends AbstractController {
                 BeanUtils.copyProperties(detailDto, resultDetail);
                 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);
 
diff --git a/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java b/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java
index 29bb213c..157816c3 100644
--- a/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java
+++ b/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java
@@ -43,6 +43,10 @@ public class ResultScoreDto {
     //评分说明
     @ApiModelProperty(value = "评分说明", name = "scoreComment")
     private String scoreComment;
+
+    //根据权重计算除的实际得分
+    @ApiModelProperty(value = "根据权重计算除的实际得分", name = "score")
+    private BigDecimal score;
     /**
      *  
      * @return