From 0f7efbc9968487d49eff22e66b725f3d40525bba Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 21 Jun 2021 14:35:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/tools/constant/StrConstant.java   |  7 ++++++-
 .../service/impl/PointRuleServiceImpl.java    | 20 ++++++++++++++-----
 2 files changed, 21 insertions(+), 6 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 175c439de9..deab895df4 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,5 +90,10 @@ public interface StrConstant {
     /**
      * 单位积分,积分上限，积分说明，积分事件
      */
-    String POINT_CHANGE = "修改了%s规则，将%s由%s调整为%s";
+    String POINT_CHANGE = "将%s由%s调整为%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 34b29fb534..2b02e992c5 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
@@ -215,20 +215,25 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 	 */
 	private String disposeLog(PointRuleFormDTO f,PointRuleEntity e){
 		StringBuffer sb = new StringBuffer();
+		sb.append(String.format(StrConstant.POINT_CHANGE_HEAD,e.getRuleName()));
+		Boolean appendStatus = false;
 		// 单位积分
 		if (!e.getPoint().equals(f.getPoint())){
-			String s = String.format(StrConstant.POINT_CHANGE, e.getRuleName(),"单位积分", e.getPoint(), f.getPoint());
+			String s = String.format(StrConstant.POINT_CHANGE, "单位积分", e.getPoint(), f.getPoint());
 			sb.append(s).append(",");
+			appendStatus = true;
 		}
 		// 积分上限
 		if (!e.getUpLimit().equals(f.getUpLimit())){
-			String s = String.format(StrConstant.POINT_CHANGE, e.getRuleName(),"积分上限", e.getUpLimit(), f.getUpLimit());
+			String s = String.format(StrConstant.POINT_CHANGE, "积分上限", e.getUpLimit(), f.getUpLimit());
 			sb.append(s).append(",");
+			appendStatus = true;
 		}
 		// 积分说明
 		if (!e.getRuleDesc().equals(f.getRuleDesc())){
-			String s = String.format(StrConstant.POINT_CHANGE, e.getRuleName(),"积分说明", e.getRuleDesc(), f.getRuleDesc());
+			String s = String.format(StrConstant.POINT_CHANGE, "积分说明", e.getRuleDesc(), f.getRuleDesc());
 			sb.append(s).append(",");
+			appendStatus = true;
 		}
 		// 规则启用
 		Boolean status;
@@ -238,13 +243,18 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 			status = true;
 		}
 		if(!status.toString().equals(f.getEnabledFlag())){
-			String s = String.format(StrConstant.POINT_CHANGE, e.getRuleName(),"规则启用", status, f.getEnabledFlag());
+			String s = String.format(StrConstant.POINT_CHANGE, "规则启用", status, f.getEnabledFlag());
 			sb.append(s).append(",");
+			appendStatus = true;
 		}
 		// 积分事件
 		if (!e.getRuleName().equals(f.getRuleName())){
-			String s = String.format(StrConstant.POINT_CHANGE, e.getRuleName(),"积分事件", e.getRuleName(), f.getRuleName());
+			String s = String.format(StrConstant.POINT_CHANGE, "积分事件", e.getRuleName(), f.getRuleName());
 			sb.append(s).append(",");
+			appendStatus = true;
+		}
+		if (!appendStatus){
+			return "";
 		}
 		return sb.substring(NumConstant.ZERO,sb.length() - NumConstant.ONE);
 	}