|
|
@ -13,13 +13,8 @@ import com.ccsens.tall.bean.dto.InputDocDto; |
|
|
|
|
|
|
|
import com.ccsens.tall.bean.dto.LwbsDto; |
|
|
|
import com.ccsens.tall.bean.po.*; |
|
|
|
import com.ccsens.tall.bean.vo.FileVo; |
|
|
|
import com.ccsens.tall.bean.vo.InputDocVo; |
|
|
|
import com.ccsens.tall.bean.vo.LwbsVo; |
|
|
|
import com.ccsens.tall.bean.vo.TaskVo; |
|
|
|
import com.ccsens.tall.persist.dao.IInputDocDao; |
|
|
|
import com.ccsens.tall.persist.dao.TaskDetailDao; |
|
|
|
import com.ccsens.tall.persist.dao.TaskSubTimeDao; |
|
|
|
import com.ccsens.tall.bean.vo.*; |
|
|
|
import com.ccsens.tall.persist.dao.*; |
|
|
|
import com.ccsens.tall.persist.mapper.*; |
|
|
|
|
|
|
|
import com.ccsens.tall.util.TaskUtil; |
|
|
@ -29,6 +24,9 @@ import com.ccsens.util.JsonResponse; |
|
|
|
import com.ccsens.util.PropUtil; |
|
|
|
import com.ccsens.util.RestTemplateUtil; |
|
|
|
import com.ccsens.util.exception.BaseException; |
|
|
|
import com.github.pagehelper.Page; |
|
|
|
import com.github.pagehelper.PageHelper; |
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Propagation; |
|
|
@ -61,6 +59,10 @@ public class InputDocService implements IInputDocService { |
|
|
|
private RobotService robotService; |
|
|
|
@Resource |
|
|
|
private ProTaskDetailMapper proTaskDetailMapper; |
|
|
|
@Resource |
|
|
|
private SysOperationDao sysOperationDao; |
|
|
|
@Resource |
|
|
|
private SysOperationMessageDao sysOperationMessageDao; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -259,7 +261,7 @@ public class InputDocService implements IInputDocService { |
|
|
|
} |
|
|
|
|
|
|
|
//如果备注信息不为空
|
|
|
|
if (!StrUtil.isBlank(param.getRemark())){ |
|
|
|
if (!StrUtil.isBlank(param.getRemark()) && ArrayUtil.isEmpty(param.getFileIds())){ |
|
|
|
ProTaskInputRecord proTaskInputRecord = new ProTaskInputRecord(); |
|
|
|
proTaskInputRecord.setInputDocId(param.getDocId()); |
|
|
|
proTaskInputRecord.setStatus((byte)1); |
|
|
@ -393,6 +395,12 @@ public class InputDocService implements IInputDocService { |
|
|
|
public void delDocOfFile(InputDocDto.DeleteDocOfFile param,Long userId) throws Exception{ |
|
|
|
//查看该输入文档下是否还有正在使用的文件
|
|
|
|
ProTaskInputRecord proTaskInputRecord = proTaskInputRecordMapper.selectByPrimaryKey(param.getRecordId()); |
|
|
|
if (ObjectUtil.isNull(proTaskInputRecord)){ |
|
|
|
throw new BaseException(CodeEnum.FILE_NOT_FOUND); |
|
|
|
} |
|
|
|
//查出文档信息找到任务信息
|
|
|
|
ProTaskInputDoc doc = proTaskInputDocMapper.selectByPrimaryKey(proTaskInputRecord.getInputDocId()); |
|
|
|
|
|
|
|
|
|
|
|
//删除输入文档中的文件
|
|
|
|
ProTaskInputRecord record = new ProTaskInputRecord(); |
|
|
@ -401,7 +409,7 @@ public class InputDocService implements IInputDocService { |
|
|
|
proTaskInputRecordMapper.updateByPrimaryKeySelective(record); |
|
|
|
|
|
|
|
ProTaskInputRecordExample proTaskInputRecordExample = new ProTaskInputRecordExample(); |
|
|
|
proTaskInputRecordExample.createCriteria().andRecStatusEqualTo((byte)1) |
|
|
|
proTaskInputRecordExample.createCriteria().andRecStatusEqualTo((byte)0) |
|
|
|
.andInputDocIdEqualTo(proTaskInputRecord.getInputDocId()); |
|
|
|
List<ProTaskInputRecord> proTaskInputRecords = proTaskInputRecordMapper.selectByExample(proTaskInputRecordExample); |
|
|
|
//如果没有将输入文档状态改为未上传
|
|
|
@ -413,7 +421,6 @@ public class InputDocService implements IInputDocService { |
|
|
|
} |
|
|
|
|
|
|
|
//TODO 发送消息
|
|
|
|
ProTaskInputDoc doc = proTaskInputDocMapper.selectByPrimaryKey(record.getInputDocId()); |
|
|
|
ProTaskDetail taskDetail = proTaskDetailMapper.selectByPrimaryKey(doc.getTaskDetailId()); |
|
|
|
if (ObjectUtil.isNotNull(taskDetail)){ |
|
|
|
robotService.delDocRobotSend(userId,taskDetail,doc.getName()); |
|
|
@ -435,11 +442,33 @@ public class InputDocService implements IInputDocService { |
|
|
|
proTaskInputRecordMapper.updateByPrimaryKeySelective(record); |
|
|
|
|
|
|
|
//TODO 发送消息
|
|
|
|
ProTaskInputDoc doc = proTaskInputDocMapper.selectByPrimaryKey(record.getInputDocId()); |
|
|
|
ProTaskInputRecord inputRecord = proTaskInputRecordMapper.selectByPrimaryKey(record.getId()); |
|
|
|
if (ObjectUtil.isNull(inputRecord)){ |
|
|
|
throw new BaseException(CodeEnum.FILE_NOT_FOUND); |
|
|
|
} |
|
|
|
ProTaskInputDoc doc = proTaskInputDocMapper.selectByPrimaryKey(inputRecord.getInputDocId()); |
|
|
|
ProTaskDetail taskDetail = proTaskDetailMapper.selectByPrimaryKey(doc.getTaskDetailId()); |
|
|
|
if (ObjectUtil.isNotNull(taskDetail)){ |
|
|
|
robotService.updateRemarkRobotSend(userId,taskDetail,doc.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 查询历史记录(根据任务id) |
|
|
|
* @param param |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public PageInfo<InputDocVo.DocRecordOfTask> findDocRecordByTask(InputDocDto.FindDocRecordByTask param) { |
|
|
|
PageHelper.startPage(param.getPageNum(),param.getPageSize()); |
|
|
|
|
|
|
|
List<InputDocVo.DocRecordOfTask> sysOperations = sysOperationDao.findMessageByOperate(param.getTaskId()); |
|
|
|
sysOperations.forEach(sysOperation -> { |
|
|
|
List<MessageVo.Message> sysOperationMessages = sysOperationMessageDao.selectContentByOpId(sysOperation.getOperationId()); |
|
|
|
sysOperation.setMessages(sysOperationMessages); |
|
|
|
}); |
|
|
|
|
|
|
|
return new PageInfo<>(sysOperations); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|