|
@@ -136,6 +136,9 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
|
|
} else {
|
|
} else {
|
|
compareLiteratureVO.setApplicant(patent.getApplicant());
|
|
compareLiteratureVO.setApplicant(patent.getApplicant());
|
|
}
|
|
}
|
|
|
|
+ if (patent.getTitle() != null && patent.getTitle().size() > 0) {
|
|
|
|
+ compareLiteratureVO.setName(patent.getTitle().get(0).getTextContent());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
compareLiteratureVOS.add(compareLiteratureVO);
|
|
compareLiteratureVOS.add(compareLiteratureVO);
|
|
}
|
|
}
|
|
@@ -184,9 +187,8 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
|
|
literature.setId(null);
|
|
literature.setId(null);
|
|
literature.setCompareLitertureId(compareLitertureId);
|
|
literature.setCompareLitertureId(compareLitertureId);
|
|
literature.insert();
|
|
literature.insert();
|
|
- }
|
|
|
|
- else {
|
|
|
|
- if(literature.getRetrieveRecordId()==null){
|
|
|
|
|
|
+ } else {
|
|
|
|
+ if (literature.getRetrieveRecordId() == null) {
|
|
literature.setRetrieveRecordId(vo.getRetrieveRecordId());
|
|
literature.setRetrieveRecordId(vo.getRetrieveRecordId());
|
|
literature.updateById();
|
|
literature.updateById();
|
|
}
|
|
}
|
|
@@ -249,7 +251,7 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
|
|
String literatureNo = compareLiterature.getLiteratureNo();
|
|
String literatureNo = compareLiterature.getLiteratureNo();
|
|
//将该对比文件的标注projectId修改为0
|
|
//将该对比文件的标注projectId修改为0
|
|
if (StringUtils.isNotEmpty(literatureNo)) {
|
|
if (StringUtils.isNotEmpty(literatureNo)) {
|
|
- List<NoveltyCompareRecordVO> markingList = esScratchWordsService.queryMarkingByNo(compareLiterature.getProjectId(), Arrays.asList(literatureNo),1);
|
|
|
|
|
|
+ List<NoveltyCompareRecordVO> markingList = esScratchWordsService.queryMarkingByNo(compareLiterature.getProjectId(), Arrays.asList(literatureNo), 1);
|
|
if (!CollectionUtils.isEmpty(markingList)) {
|
|
if (!CollectionUtils.isEmpty(markingList)) {
|
|
for (NoveltyCompareRecordVO recordVO : markingList) {
|
|
for (NoveltyCompareRecordVO recordVO : markingList) {
|
|
Marking marking = esScratchWordsService.getById(recordVO.getId());
|
|
Marking marking = esScratchWordsService.getById(recordVO.getId());
|
|
@@ -264,12 +266,12 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
|
|
}
|
|
}
|
|
//将该专利的对比记录projectId修改为0
|
|
//将该专利的对比记录projectId修改为0
|
|
if (StringUtils.isNotEmpty(literatureNo)) {
|
|
if (StringUtils.isNotEmpty(literatureNo)) {
|
|
- List<NoveltyCompareRecordVO> markingList = esScratchWordsService.queryMarkingByNo(compareLiterature.getProjectId(), Arrays.asList(literatureNo),2);
|
|
|
|
|
|
+ List<NoveltyCompareRecordVO> markingList = esScratchWordsService.queryMarkingByNo(compareLiterature.getProjectId(), Arrays.asList(literatureNo), 2);
|
|
if (!CollectionUtils.isEmpty(markingList)) {
|
|
if (!CollectionUtils.isEmpty(markingList)) {
|
|
for (NoveltyCompareRecordVO recordVO : markingList) {
|
|
for (NoveltyCompareRecordVO recordVO : markingList) {
|
|
Marking marking = esScratchWordsService.getById(recordVO.getId());
|
|
Marking marking = esScratchWordsService.getById(recordVO.getId());
|
|
marking.setProjectId(0);
|
|
marking.setProjectId(0);
|
|
- Integer count = esScratchWordsService.updateToEs(marking, recordVO.getId());
|
|
|
|
|
|
+ Integer count = esScratchWordsService.updateToEs(marking, recordVO.getId());
|
|
if (count < 1) {
|
|
if (count < 1) {
|
|
throw new XiaoShiException("删除对比记录失败");
|
|
throw new XiaoShiException("删除对比记录失败");
|
|
}
|
|
}
|
|
@@ -327,7 +329,7 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
|
|
List<QueryCompareFileVO> queryCompareFileVOSTo = this.getBaseMapper().queryCompareFile(queryCompareFileDTOTo);
|
|
List<QueryCompareFileVO> queryCompareFileVOSTo = this.getBaseMapper().queryCompareFile(queryCompareFileDTOTo);
|
|
|
|
|
|
for (QueryCompareFileVO queryCompareFileVO : queryCompareFileVOSFrom) {
|
|
for (QueryCompareFileVO queryCompareFileVO : queryCompareFileVOSFrom) {
|
|
- importSinglePatentService.addPatentToProject(queryCompareFileVO.getLiteratureNo(),toProjectId);
|
|
|
|
|
|
+ importSinglePatentService.addPatentToProject(queryCompareFileVO.getLiteratureNo(), toProjectId);
|
|
QueryCompareFileVO queryCompareFileVOTo = queryCompareFileVOSTo.stream().filter(item -> item.getLiteratureNo().equals(queryCompareFileVO.getLiteratureNo())).findFirst().orElse(null);
|
|
QueryCompareFileVO queryCompareFileVOTo = queryCompareFileVOSTo.stream().filter(item -> item.getLiteratureNo().equals(queryCompareFileVO.getLiteratureNo())).findFirst().orElse(null);
|
|
if (queryCompareFileVOTo == null) {
|
|
if (queryCompareFileVOTo == null) {
|
|
CompareLiterature compareLiterature = new CompareLiterature();
|
|
CompareLiterature compareLiterature = new CompareLiterature();
|