From 77d30f9d0bc69928c4dc16b14b52a8208e95d28c Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Thu, 1 Dec 2022 14:19:19 +0800
Subject: [PATCH] =?UTF-8?q?=20=E6=9B=B4=E5=90=8D=E6=B5=81=E7=A8=8B-?=
 =?UTF-8?q?=E5=B0=86=E6=9B=B4=E5=90=8D=E6=B5=81=E7=A8=8B=E8=B5=B0=E5=AE=8C?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92=E7=9A=84?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=B9=B6=E6=B2=A1=E6=9C=89=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=20BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EsRevisePlanLogServiceImpl.java |  4 +++-
 .../service/impl/EsRevisePlanServiceImpl.java    | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanLogServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanLogServiceImpl.java
index b86869dd..16b82934 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanLogServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanLogServiceImpl.java
@@ -70,7 +70,9 @@ public class EsRevisePlanLogServiceImpl extends ServiceImpl<EsRevisePlanLogDao,
                 case "4":
                     //更名
                     String renameEs = (String) qbfsForm.get("renameEs");
-                    msg = msg + "修改了《" + esName + "》 , “企标名称”由“" + esName + "”改为“" + renameEs + "”;";
+                    if(!esName.equals(renameEs)) {
+                        msg = msg + "修改了《" + esName + "》 , “企标名称”由“" + esName + "”改为“" + renameEs + "”;";
+                    }
                     break;
             }
             if (ObjectUtils.isNotEmpty(esId)&&ObjectUtils.isEmpty(esId1)&&ObjectUtils.isEmpty(esId2)) {
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
index a7b22344..f93b09e5 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
@@ -9,6 +9,7 @@ import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanLogDao;
 import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
 import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao;
 import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlanLog;
+import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanLogService;
 import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
 import com.adc.da.slrs.esStandRelation.entity.EsStandRelation;
 import com.adc.da.slrs.esStandRelation.service.IEsStandRelationService;
@@ -16,8 +17,11 @@ import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
 import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
 import com.adc.da.sys.entity.UserEO;
 import com.adc.da.util.UUIDUtils;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.gson.JsonObject;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -50,6 +54,10 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
     @Autowired
     private EsRevisePlanLogDao esRevisePlanLogDao;
 
+    @Autowired
+    private IEsRevisePlanLogService esRevisePlanLogService;
+
+
     @Override
     public List<EsRevisePlan> getAllPlans(EsRevisePlan esRevisePlan) {
         Integer count = esRevisePlanDao.getTotal();
@@ -78,6 +86,14 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
     @Override
     public String modPlan(EsRevisePlan esRevisePlan) {
         List<EsRevisePlan> esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan);
+        //添加日志信息 日志数据进行组合 对象数据转换为json 仅支持修改企业名称
+        EsRevisePlan selectById = esRevisePlanDao.selectById(esRevisePlan.getId());
+        HashMap<String, String> mapJson = new HashMap<>();
+        mapJson.put("type","4");
+        mapJson.put("esId",esRevisePlan.getId());
+        mapJson.put("esName",selectById.getEsName());
+        mapJson.put("renameEs",esRevisePlan.getEsName());
+        esRevisePlanLogService.addLog(JSON.parseObject(JSON.toJSONString(mapJson)));
         if (esRevisePlans.size()>0){
             return "企标名称不能重复,请更换新的企标名称。";
         }else {