From 9f3c7bfac686bba4da7718edb3a1fe107df726ce Mon Sep 17 00:00:00 2001
From: ma <1062634917@qq.com>
Date: Wed, 21 Apr 2021 11:12:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=B6=88=E6=81=AF=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ccsens/tall/service/InputDocService.java     | 8 +++++---
 .../main/java/com/ccsens/tall/service/ProjectService.java | 6 ++++--
 .../main/java/com/ccsens/tall/service/RobotService.java   | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java
index cce62ad0..9568188d 100644
--- a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java
@@ -626,7 +626,7 @@ public class InputDocService implements IInputDocService {
             example2.createCriteria().andInputDocIdEqualTo(param.getDocId());
             ProTaskInputRecord proTaskInputRecord = new ProTaskInputRecord();
             proTaskInputRecord.setRecStatus((byte)2);
-            proTaskInputRecordMapper.updateByExampleSelective(proTaskInputRecord,example2);
+
 
             //文档 改回未上传状态
             ProTaskInputDoc doc = new ProTaskInputDoc();
@@ -636,7 +636,8 @@ public class InputDocService implements IInputDocService {
 
             //将操作保存到历史信息记录表
             //查找项目id
-            ProTaskDetail taskDetail = proTaskDetailMapper.selectByPrimaryKey(doc.getTaskDetailId());
+            ProTaskInputDoc inputDoc = proTaskInputDocMapper.selectByPrimaryKey(doc.getId());
+            ProTaskDetail taskDetail = proTaskDetailMapper.selectByPrimaryKey(inputDoc.getTaskDetailId());
 
             ProMember proMember = iProMemberService.selectByUserId(userId, taskDetail.getProjectId());
             //将操作记录添加到历史记录表中
@@ -650,8 +651,9 @@ public class InputDocService implements IInputDocService {
 
             //发送消息
             if (ObjectUtil.isNotNull(taskDetail)){
-                robotService.delDocRobotSend(userId,taskDetail,doc.getName());
+                robotService.delDocRobotSend(userId,taskDetail,inputDoc.getName());
             }
+            proTaskInputRecordMapper.updateByExampleSelective(proTaskInputRecord,example2);
         }
 
     }
diff --git a/tall/src/main/java/com/ccsens/tall/service/ProjectService.java b/tall/src/main/java/com/ccsens/tall/service/ProjectService.java
index a4dd3910..3542749a 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ProjectService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ProjectService.java
@@ -578,12 +578,14 @@ public class ProjectService implements IProjectService {
                         proRoleDao.updateByPrimaryKeySelective(role);
                     });
                 }
+
+                //发送消息
+                robotService.delProjectRobotSend(currentUserId,projectId);
+
                 //修改项目状态
                 project.setRecStatus(WebConstant.REC_STATUS.Deleted.value);
                 sysProjectDao.updateByPrimaryKeySelective(project);
 
-                //发送消息
-                robotService.delProjectRobotSend(currentUserId,projectId);
             } else {
                 throw new BaseException(CodeEnum.NOT_POWER);
             }
diff --git a/tall/src/main/java/com/ccsens/tall/service/RobotService.java b/tall/src/main/java/com/ccsens/tall/service/RobotService.java
index c00b53e1..8b13ab1e 100644
--- a/tall/src/main/java/com/ccsens/tall/service/RobotService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/RobotService.java
@@ -60,7 +60,7 @@ public class RobotService implements IRobotService{
     public void robotMessage(OperateType operateType,RobotUtil.Message message){
         //获取机器人信息
         SysProjectRobotExample sysProjectRobotExample = new SysProjectRobotExample();
-        sysProjectRobotExample.createCriteria().andProjectIdEqualTo( message.getProjectId());
+        sysProjectRobotExample.createCriteria().andProjectIdEqualTo(message.getProjectId());
         List<SysProjectRobot> sysProjectRobotList = sysProjectRobotDao.selectByExample(sysProjectRobotExample);
         if(CollectionUtil.isNotEmpty(sysProjectRobotList)){
             sysProjectRobotList.forEach(sysProjectRobot -> {