From c0839a370bb379ebbc9b10bb22bb37583dd73d13 Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Mon, 5 Dec 2022 12:00:28 +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

---
 .../controller/WorkFlowController.java        | 40 +++++++++++++++++--
 .../impl/EsRevisePlanLogServiceImpl.java      |  4 +-
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
index ddef31c6..b810403f 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
@@ -13,6 +13,10 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.common.Page;
 import com.adc.da.login.util.JwtUtils;
+import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao;
+import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
+import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanLogService;
+import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
 import com.adc.da.slrs.sarUser.entity.TsUser;
 import com.adc.da.slrs.sarUser.service.ITsUserService;
 import com.adc.da.sys.common.EmailUtils;
@@ -70,6 +74,15 @@ public class WorkFlowController {
     @Autowired
     private ITsUserService userService;
 
+    @Autowired
+    private IEsRevisePlanService iEsRevisePlanService;
+
+    @Autowired
+    private EsRevisePlanDao esRevisePlanDao;
+
+    @Autowired
+    private IEsRevisePlanLogService esRevisePlanLogService;
+
 //    @Autowired
 //    private ExportExcelMapper exportExcelMapper;
 
@@ -522,9 +535,30 @@ public class WorkFlowController {
     @PostMapping("/completeTask")
     public  Wrapper<String> completeTaskByUserId( BusMes busMes){
         Wrapper<String> str = workFlowFeignClient.completeTaskByUserId(busMes);
-        if(str.getCode() == 500){
-            str.setSuccess(false);
-        }
+
+        EsRevisePlan EsRevisePlan = new EsRevisePlan();
+         String json = busMes.getJson();
+         Map map = JSON.parseObject(json, Map.class);
+         Object esId = map.get("esId");
+         if(esId!=null){
+             Object renameEs = map.get("renameEs");
+             EsRevisePlan.setId(esId.toString());
+             if(renameEs!=null){
+                 EsRevisePlan.setEsName(renameEs.toString());
+             }
+             //日志
+             EsRevisePlan selectById = esRevisePlanDao.selectById(esId.toString());
+             HashMap<String, String> mapJson = new HashMap<>();
+             mapJson.put("type","4");
+             mapJson.put("esId",esId.toString());
+             mapJson.put("esName",selectById.getEsName());
+             mapJson.put("renameEs",renameEs.toString());
+             esRevisePlanLogService.addLog(JSON.parseObject(JSON.toJSONString(mapJson)));
+             iEsRevisePlanService.updateById(EsRevisePlan);
+             if(str.getCode() == 500){
+                 str.setSuccess(false);
+             }
+         }
         return str;
     }
 
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..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,9 +70,9 @@ public class EsRevisePlanLogServiceImpl extends ServiceImpl<EsRevisePlanLogDao,
                 case "4":
                     //更名
                     String renameEs = (String) qbfsForm.get("renameEs");
-                    //if(!esName.equals(renameEs)) {
+                    if(!esName.equals(renameEs)) {
                         msg = msg + "修改了《" + esName + "》 , “企标名称”由“" + esName + "”改为“" + renameEs + "”;";
-                    //}
+                    }
                     break;
             }
             if (ObjectUtils.isNotEmpty(esId)&&ObjectUtils.isEmpty(esId1)&&ObjectUtils.isEmpty(esId2)) {