|
@@ -40,6 +40,7 @@ import lombok.RequiredArgsConstructor;
|
|
|
import org.apache.poi.hslf.record.Record;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.context.annotation.Lazy;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.*;
|
|
@@ -51,7 +52,7 @@ import java.util.stream.Collectors;
|
|
|
* @createDate 2024-09-30 15:33:57
|
|
|
*/
|
|
|
@Service
|
|
|
-@RequiredArgsConstructor
|
|
|
+@RequiredArgsConstructor(onConstructor_={@Lazy})
|
|
|
public class NoveltyReportReferencesService extends ServiceImpl<NoveltyReportReferencesMapper, NoveltyReportReferences> {
|
|
|
private final NoveltyReportTemplateService noveltyReportTemplateService;
|
|
|
private final ReferencesService referencesService;
|
|
@@ -62,6 +63,7 @@ public class NoveltyReportReferencesService extends ServiceImpl<NoveltyReportRef
|
|
|
private final NoveltySearchRecordService noveltySearchRecordService;
|
|
|
private final EsPatentService esPatentService;
|
|
|
private final NoveltyTemplateFactory noveltyTemplateFactory;
|
|
|
+ private final NoveltyExportReportService noveltyExportReportService;
|
|
|
@Autowired
|
|
|
private CacheUtils cacheUtils;
|
|
|
|
|
@@ -187,7 +189,9 @@ public class NoveltyReportReferencesService extends ServiceImpl<NoveltyReportRef
|
|
|
Map<String, Object> map = getTemplateMapsImp.getMap(queryNoveltyProjectVOs, technicalCaseVO, compareLiteratureVOS, noveltyCompareRecordQueryVOS, retrieveRecordVOS);
|
|
|
String json = JsonUtils.objectToJson(map);
|
|
|
noveltyReportReferenceDTO.setDataSource(json);
|
|
|
- return this.addOrUpdate(noveltyReportReferenceDTO);
|
|
|
+ id = this.addOrUpdate(noveltyReportReferenceDTO);
|
|
|
+ noveltyExportReportService.exportReport(id);
|
|
|
+ return id;
|
|
|
}
|
|
|
|
|
|
public TechnicalCaseVO getTechnicalCaseVO(Integer projectId) {
|