完善消息相关

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);
         }
 
     }

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);
             }