From c333fc78a424688e7c07d12568030b953d66fcc1 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Mon, 7 Dec 2020 16:13:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BF=AE=E6=94=B9=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/ResultRecordController.java     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 be2d2af8..4b8e4c13 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -894,11 +894,11 @@ public class ResultRecordController extends AbstractController {
                 ) {
                     log.info("修改的对象为{}", resultDetail1);
                     if(resultDetail1.getIsDelete().intValue() == 1){
-                        commandValue += (commandIndex + "：(删除) 指标" + resultDetail1.getTarget() + "\r\n");
+                        commandValue += (commandIndex + "：(删除) 指标" + resultDetail1.getTarget() + "\n");
                         commandIndex++;
                         resultDetail1.setIsBack(1);
                     }else if(resultDetail1.getIsBack().intValue() == 3){
-                        commandValue += (commandIndex + "：(新增) 指标" + resultDetail1.getTarget() + "\r\n");
+                        commandValue += (commandIndex + "：(新增) 指标" + resultDetail1.getTarget() + "\n");
                         commandIndex++;
                         resultDetail1.setIsBack(0);
                     }else{
@@ -912,24 +912,24 @@ public class ResultRecordController extends AbstractController {
                             if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){
                                 //打上标识
                                 value += ("(修改) 名称：" +
-                                        resultDetail1.getTarget()+ " 为：" + resultDetail.getTarget() + "\r\n");
+                                        resultDetail1.getTarget()+ " \n(为)：\n" + resultDetail.getTarget() + "\n");
                                 isUp = true;
 
                             }else{
-                                heard = "指标：" + resultDetail1.getTarget() + "\r\n";
+                                heard = "指标：" + resultDetail1.getTarget() + "\n";
                             }
                             if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){
                                 //打上标识
                                 value += ("(修改) 考核标准：" +
-                                        resultDetail1.getKeyResult() + " 为：" + resultDetail.getKeyResult() + "\r\n");
+                                        resultDetail1.getKeyResult() + "\n(为)：\n" + resultDetail.getKeyResult() + "\n");
                                 isUp = true;
                             }
                             if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){
                                 //打上标识
                                 value += ("(修改) 权重：" +
-                                        resultDetail1.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "% 为："
+                                        resultDetail1.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "%\n(为)：\n"
                                         + resultDetail.getCheckWeight().multiply(new BigDecimal(100)).intValue() +
-                                        "%\r\n");
+                                        "%\n");
                                 isUp = true;
                             }
                             if(isUp){