From 728d5c8d25c268744bdc8ebe3dbd6fad0f09f57e Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Mon, 5 Dec 2022 15:34:35 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EsRevisePlanLogServiceImpl.java          | 4 +---
 .../service/impl/EsRevisePlanServiceImpl.java             | 8 --------
 2 files changed, 1 insertion(+), 11 deletions(-)

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 43eaf36e..b86869dd 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,9 +70,7 @@ public class EsRevisePlanLogServiceImpl extends ServiceImpl<EsRevisePlanLogDao,
                 case "4":
                     //更名
                     String renameEs = (String) qbfsForm.get("renameEs");
-                    //if(!esName.equals(renameEs)) {
-                        msg = msg + "修改了《" + esName + "》 , “企标名称”由“" + esName + "”改为“" + 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 c6734ac9..79bc10ed 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
@@ -86,14 +86,6 @@ 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 {