From 606c57a3083311c0055428e807b477a2b1607438 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 25 Jun 2021 16:44:31 +0800
Subject: [PATCH 1/2] ..

---
 .../commons/tools/constant/StrConstant.java   |  4 ++--
 .../service/impl/PointRuleServiceImpl.java    | 20 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java
index deab895df4..ffc18f704e 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java
@@ -90,10 +90,10 @@ public interface StrConstant {
     /**
      * 单位积分,积分上限，积分说明，积分事件
      */
-    String POINT_CHANGE = "将%s由%s调整为%s";
+    String POINT_CHANGE = "将%s调整为%s,";
 
     /**
      * 积分规则修改的头
      */
-    String POINT_CHANGE_HEAD = "修改了%s规则，";
+    String POINT_CHANGE_HEAD = "修改了%s规则,";
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
index 2b02e992c5..a9d6944d68 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
@@ -219,20 +219,20 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 		Boolean appendStatus = false;
 		// 单位积分
 		if (!e.getPoint().equals(f.getPoint())){
-			String s = String.format(StrConstant.POINT_CHANGE, "单位积分", e.getPoint(), f.getPoint());
-			sb.append(s).append(",");
+			String s = String.format(StrConstant.POINT_CHANGE, "单位积分", f.getPoint());
+			sb.append(s);
 			appendStatus = true;
 		}
 		// 积分上限
 		if (!e.getUpLimit().equals(f.getUpLimit())){
-			String s = String.format(StrConstant.POINT_CHANGE, "积分上限", e.getUpLimit(), f.getUpLimit());
-			sb.append(s).append(",");
+			String s = String.format(StrConstant.POINT_CHANGE, "积分上限", f.getUpLimit());
+			sb.append(s);
 			appendStatus = true;
 		}
 		// 积分说明
 		if (!e.getRuleDesc().equals(f.getRuleDesc())){
-			String s = String.format(StrConstant.POINT_CHANGE, "积分说明", e.getRuleDesc(), f.getRuleDesc());
-			sb.append(s).append(",");
+			String s = String.format(StrConstant.POINT_CHANGE, "积分说明", f.getRuleDesc());
+			sb.append(s);
 			appendStatus = true;
 		}
 		// 规则启用
@@ -243,14 +243,14 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 			status = true;
 		}
 		if(!status.toString().equals(f.getEnabledFlag())){
-			String s = String.format(StrConstant.POINT_CHANGE, "规则启用", status, f.getEnabledFlag());
-			sb.append(s).append(",");
+			String s = String.format(StrConstant.POINT_CHANGE, "规则启用", f.getEnabledFlag());
+			sb.append(s);
 			appendStatus = true;
 		}
 		// 积分事件
 		if (!e.getRuleName().equals(f.getRuleName())){
-			String s = String.format(StrConstant.POINT_CHANGE, "积分事件", e.getRuleName(), f.getRuleName());
-			sb.append(s).append(",");
+			String s = String.format(StrConstant.POINT_CHANGE, "积分事件", f.getRuleName());
+			sb.append(s);
 			appendStatus = true;
 		}
 		if (!appendStatus){

From 5160a0b7e05ed1d5a5caa8e71b90de1546103a1f Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 25 Jun 2021 16:47:37 +0800
Subject: [PATCH 2/2] ,,

---
 .../com/epmet/commons/tools/constant/StrConstant.java  |  4 ++--
 .../com/epmet/service/impl/PointRuleServiceImpl.java   | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java
index ffc18f704e..c601d2fd71 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java
@@ -90,10 +90,10 @@ public interface StrConstant {
     /**
      * 单位积分,积分上限，积分说明，积分事件
      */
-    String POINT_CHANGE = "将%s调整为%s,";
+    String POINT_CHANGE = "将%s调整为%s";
 
     /**
      * 积分规则修改的头
      */
-    String POINT_CHANGE_HEAD = "修改了%s规则,";
+    String POINT_CHANGE_HEAD = "修改了%s规则，";
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
index a9d6944d68..26612a3cfe 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
@@ -220,19 +220,19 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 		// 单位积分
 		if (!e.getPoint().equals(f.getPoint())){
 			String s = String.format(StrConstant.POINT_CHANGE, "单位积分", f.getPoint());
-			sb.append(s);
+			sb.append(s).append("，");
 			appendStatus = true;
 		}
 		// 积分上限
 		if (!e.getUpLimit().equals(f.getUpLimit())){
 			String s = String.format(StrConstant.POINT_CHANGE, "积分上限", f.getUpLimit());
-			sb.append(s);
+			sb.append(s).append("，");
 			appendStatus = true;
 		}
 		// 积分说明
 		if (!e.getRuleDesc().equals(f.getRuleDesc())){
 			String s = String.format(StrConstant.POINT_CHANGE, "积分说明", f.getRuleDesc());
-			sb.append(s);
+			sb.append(s).append("，");
 			appendStatus = true;
 		}
 		// 规则启用
@@ -244,13 +244,13 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 		}
 		if(!status.toString().equals(f.getEnabledFlag())){
 			String s = String.format(StrConstant.POINT_CHANGE, "规则启用", f.getEnabledFlag());
-			sb.append(s);
+			sb.append(s).append("，");
 			appendStatus = true;
 		}
 		// 积分事件
 		if (!e.getRuleName().equals(f.getRuleName())){
 			String s = String.format(StrConstant.POINT_CHANGE, "积分事件", f.getRuleName());
-			sb.append(s);
+			sb.append(s).append("，");
 			appendStatus = true;
 		}
 		if (!appendStatus){