|
@@ -34,6 +34,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
+import org.springframework.transaction.annotation.Propagation;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
@@ -807,7 +808,10 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
|
|
/**
|
|
/**
|
|
* 添加侵权分析协同任务
|
|
* 添加侵权分析协同任务
|
|
*/
|
|
*/
|
|
- public Integer addTortTask(TortTaskDTO tortTaskDTO) {
|
|
|
|
|
|
+ @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Throwable.class)
|
|
|
|
+ public Integer addTortTask(TortTaskDTO tortTaskDTO) throws Exception {
|
|
|
|
+ Integer projectId = tortTaskDTO.getProjectId();
|
|
|
|
+ List<String> patentNos = tortTaskDTO.getPatentNos();
|
|
//1.保存任务信息 project_task表
|
|
//1.保存任务信息 project_task表
|
|
if (tortTaskDTO == null) {
|
|
if (tortTaskDTO == null) {
|
|
throw new XiaoShiException("入参不能为空!");
|
|
throw new XiaoShiException("入参不能为空!");
|
|
@@ -850,7 +854,8 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
|
|
//3.从侵权分析中获得对比结果,并复制保存
|
|
//3.从侵权分析中获得对比结果,并复制保存
|
|
tortCompareRecordService.copyTortCompareRecords(tortTaskDTO.getProjectId(), taskId, personnelVO.getId());
|
|
tortCompareRecordService.copyTortCompareRecords(tortTaskDTO.getProjectId(), taskId, personnelVO.getId());
|
|
//4.发送邮件通知协同人和抄送人
|
|
//4.发送邮件通知协同人和抄送人
|
|
- //TODO
|
|
|
|
|
|
+ //保存es
|
|
|
|
+ this.addCompareLiteratureByNosToEs(patentNos, taskId, projectId);
|
|
return projectTask.getId();
|
|
return projectTask.getId();
|
|
}
|
|
}
|
|
|
|
|