20240929 添加查新对比记录

src/main/java/cn/cslg/pas/common/vo/business/ImportTaskVO.java

@@ -75,6 +75,8 @@ public class ImportTaskVO {
     private Integer projectId;
     private Integer productId;
     private Integer importToType;
+    private Integer projectType;
+    private Integer reportType;
     private String importToName;
     private Integer importToId;
     private SystemFile systemFile;

src/main/java/cn/cslg/pas/service/business/ImportTaskConditionService.java

@@ -8,6 +8,7 @@ import cn.cslg.pas.common.model.cronModel.PersonnelVO;
 import cn.cslg.pas.common.model.cronModel.Records;
 import cn.cslg.pas.common.utils.*;
 import cn.cslg.pas.domain.business.ImportTaskCondition;
+import cn.cslg.pas.domain.business.Project;
 import cn.cslg.pas.exception.ExceptionEnum;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.mapper.ImportTaskConditionMapper;
@@ -38,6 +39,8 @@ public class ImportTaskConditionService extends ServiceImpl<ImportTaskConditionM
     private final PatentProjectService patentProjectService;
     private final CacheUtils cacheUtils;
     private final LoginUtils loginUtils;
+    private final ProjectService projectService;
+
     /**
      * 添加定时周期
      *
@@ -47,9 +50,9 @@ public class ImportTaskConditionService extends ServiceImpl<ImportTaskConditionM
     public ImportTaskCondition addQuartzCondition(QuartzConditionDTO quartzConditionDTO) {
         PersonnelVO personnelVO = new PersonnelVO();
         personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        Integer projectId =quartzConditionDTO.getImportToId();
-        Boolean ifUpdate =quartzConditionDTO.getIfUpdate();
-        String updateCycle=quartzConditionDTO.getUpdateCycle();
+        Integer projectId = quartzConditionDTO.getImportToId();
+        Boolean ifUpdate = quartzConditionDTO.getIfUpdate();
+        String updateCycle = quartzConditionDTO.getUpdateCycle();
         ImportTaskCondition importTaskCondition = new ImportTaskCondition();
         importTaskCondition.setProjectType(0);
         importTaskCondition.setSearchCondition(quartzConditionDTO.getSearchCondition());
@@ -74,10 +77,10 @@ public class ImportTaskConditionService extends ServiceImpl<ImportTaskConditionM
         String crons = CronUtil.getCron(quartzConditionDTO.getUpdateCycle());
         importTaskCondition.setCrons(crons);
         importTaskCondition.insert();
-        if(ifUpdate!=null&&ifUpdate){
-            Boolean flag= patentProjectService.checkIfHaveQuartz(projectId);
-            if(flag==null||!flag){
-                ProjectQuartzSetDTO projectQuartzSetDTO =new ProjectQuartzSetDTO();
+        if (ifUpdate != null && ifUpdate) {
+            Boolean flag = patentProjectService.checkIfHaveQuartz(projectId);
+            if (flag == null || !flag) {
+                ProjectQuartzSetDTO projectQuartzSetDTO = new ProjectQuartzSetDTO();
                 projectQuartzSetDTO.setProjectId(projectId);
                 projectQuartzSetDTO.setIfUpdate(ifUpdate);
                 projectQuartzSetDTO.setUpdateCycle(updateCycle);
@@ -88,25 +91,22 @@ public class ImportTaskConditionService extends ServiceImpl<ImportTaskConditionM
     }
 
 
-    public ImportTaskCondition addQuartzCondition(ImportTaskDTO importTaskDTO){
+    public ImportTaskCondition addQuartzCondition(ImportTaskDTO importTaskDTO) {
 
         PersonnelVO personnelVO = new PersonnelVO();
         personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        Boolean ifUpdate =importTaskDTO.getIfUpdate();
+        Boolean ifUpdate = importTaskDTO.getIfUpdate();
+
+        Integer importId = importTaskDTO.getImportToId();
         ImportTaskCondition importTaskCondition = new ImportTaskCondition();
         if (importTaskDTO.getImportToId() != null) {
-            if (importTaskDTO.getImportToType().equals(0)) {
-                importTaskCondition.setProjectType(0);
-                importTaskCondition.setProjectId(importTaskDTO.getImportToId());
-            } else if (importTaskDTO.getImportToType().equals(1)) {
-                importTaskCondition.setProjectType(1);
-                importTaskCondition.setProjectId(importTaskDTO.getImportToId());
-            } else if (importTaskDTO.getImportToType().equals(2)) {
+
+            if (importTaskDTO.getImportToType().equals(2)) {
                 importTaskCondition.setProductId(importTaskDTO.getImportToId());
-            }
-             else if(importTaskDTO.getImportToType().equals(3)){
-                importTaskCondition.setProjectType(3);
-                importTaskCondition.setProjectId(importTaskDTO.getImportToId());
+            } else {
+                Project project = projectService.getById(importId);
+                importTaskCondition.setProjectId(importId);
+                importTaskCondition.setProjectType(project.getType());
             }
         }
         importTaskCondition.setImportContent(importTaskDTO.getImportContent());
@@ -119,7 +119,7 @@ public class ImportTaskConditionService extends ServiceImpl<ImportTaskConditionM
         importTaskCondition.setOrderBy(importTaskDTO.getOrderBy());
         importTaskCondition.setOrderByType(importTaskDTO.getOrderByType());
         importTaskCondition.setIfCycle(importTaskDTO.getIfUpdate());
-        if(ifUpdate!=null&&ifUpdate){
+        if (ifUpdate != null && ifUpdate) {
             importTaskCondition.setIfUpdate(true);
         }
         importTaskCondition.setCreateId(personnelVO.getId());
@@ -135,9 +135,10 @@ public class ImportTaskConditionService extends ServiceImpl<ImportTaskConditionM
             importTaskCondition.setCustomFields(fieldJson);
         }
         importTaskCondition.insert();
-return  importTaskCondition;
+        return importTaskCondition;
 
     }
+
     /**
      * 查询定时任务条件
      *
@@ -152,7 +153,7 @@ return  importTaskCondition;
         LambdaQueryWrapper<ImportTaskCondition> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ImportTaskCondition::getProjectId, projectId)
                 .eq(ImportTaskCondition::getIfDelete, false)
-                .eq(ImportTaskCondition::getIfCycle,true);
+                .eq(ImportTaskCondition::getIfCycle, true);
 
         Records records = new Records();
         records.setSize(size);
@@ -195,27 +196,25 @@ return  importTaskCondition;
             personnels = JSONObject.parseArray(jsonObject.getString("data"), Personnel.class);
         }
         for (ImportTaskCondition importTaskCondition : importTaskConditions) {
-            ImportTaskConditionVO importTaskConditionVO =new ImportTaskConditionVO();
-            BeanUtils.copyProperties(importTaskCondition,importTaskConditionVO);
+            ImportTaskConditionVO importTaskConditionVO = new ImportTaskConditionVO();
+            BeanUtils.copyProperties(importTaskCondition, importTaskConditionVO);
 
-            String customFields =importTaskCondition.getCustomFields();
-            if(customFields!=null&&!customFields.equals(""))
-            {
-                List<EsCustomFieldDTO> esCustomFieldDTOList = JSONArray.parseArray(customFields,EsCustomFieldDTO.class);
+            String customFields = importTaskCondition.getCustomFields();
+            if (customFields != null && !customFields.equals("")) {
+                List<EsCustomFieldDTO> esCustomFieldDTOList = JSONArray.parseArray(customFields, EsCustomFieldDTO.class);
                 importTaskConditionVO.setFieldDTOS(esCustomFieldDTOList);
             }
-         Personnel personnel =personnels.stream().filter(item->item.getId().equals(importTaskCondition.getCreateId())).findFirst().orElse(null);
-            if(personnel!=null){
+            Personnel personnel = personnels.stream().filter(item -> item.getId().equals(importTaskCondition.getCreateId())).findFirst().orElse(null);
+            if (personnel != null) {
                 importTaskConditionVO.setCreateName(personnel.getPersonnelName());
             }
-  importTaskConditionVOS.add(importTaskConditionVO);
+            importTaskConditionVOS.add(importTaskConditionVO);
 
         }
         return importTaskConditionVOS;
     }
 
 
-
     /**
      * 添加定时周期
      *
@@ -224,13 +223,13 @@ return  importTaskCondition;
      */
     @Transactional(rollbackFor = Exception.class)
     public ImportTaskCondition updateQuartzCondition(QuartzConditionUpdateDTO quartzConditionDTO) {
-         Integer id =quartzConditionDTO.getId();
-        ImportTaskCondition importTaskCondition =this.getById(id);
-        if(importTaskCondition==null){
-            throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR,"未查询到条件");
+        Integer id = quartzConditionDTO.getId();
+        ImportTaskCondition importTaskCondition = this.getById(id);
+        if (importTaskCondition == null) {
+            throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR, "未查询到条件");
         }
-        Boolean ifUpdate =quartzConditionDTO.getIfUpdate();
-        String updateCycle=quartzConditionDTO.getUpdateCycle();
+        Boolean ifUpdate = quartzConditionDTO.getIfUpdate();
+        String updateCycle = quartzConditionDTO.getUpdateCycle();
         importTaskCondition.setSearchCondition(quartzConditionDTO.getSearchCondition());
         importTaskCondition.setDbType(quartzConditionDTO.getDbType());
         importTaskCondition.setIfUpdate(ifUpdate);
@@ -249,17 +248,16 @@ return  importTaskCondition;
         importTaskCondition.setCrons(crons);
         importTaskCondition.updateById();
 
-                ProjectQuartzSetDTO projectQuartzSetDTO =new ProjectQuartzSetDTO();
-                projectQuartzSetDTO.setProjectId(importTaskCondition.getProjectId());
-                projectQuartzSetDTO.setIfUpdate(ifUpdate);
-                projectQuartzSetDTO.setUpdateCycle(updateCycle);
-                patentProjectService.setProjectQuartz(projectQuartzSetDTO);
+        ProjectQuartzSetDTO projectQuartzSetDTO = new ProjectQuartzSetDTO();
+        projectQuartzSetDTO.setProjectId(importTaskCondition.getProjectId());
+        projectQuartzSetDTO.setIfUpdate(ifUpdate);
+        projectQuartzSetDTO.setUpdateCycle(updateCycle);
+        patentProjectService.setProjectQuartz(projectQuartzSetDTO);
 
         return importTaskCondition;
     }
 
 
-
     /**
      * 删除定时周期条件
      *
@@ -268,11 +266,11 @@ return  importTaskCondition;
      */
     @Transactional(rollbackFor = Exception.class)
     public Boolean removeQuartzCondition(QuartzConditionRemoveDTO quartzConditionRemoveDTO) {
-        List<Integer> ids =quartzConditionRemoveDTO.getIds();
-        if(ids==null||ids.size()==0){
-            throw new XiaoShiException(ExceptionEnum.BUSINESS_CHECK,"请选择至少一个条件");
+        List<Integer> ids = quartzConditionRemoveDTO.getIds();
+        if (ids == null || ids.size() == 0) {
+            throw new XiaoShiException(ExceptionEnum.BUSINESS_CHECK, "请选择至少一个条件");
         }
         this.removeBatchByIds(ids);
-        return  true;
+        return true;
     }
 }

src/main/java/cn/cslg/pas/service/business/ImportTaskService.java

@@ -88,7 +88,7 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
     @Autowired
     private MailSendService mailSendService;
     @Autowired
-    private PatentProjectService patentProjectService;
+    private ReportProjectService reportProjectService;
     @Override
     public Object queryMessage(QueryRequest queryRequest) throws Exception {
         List<String> sqls = formatQueryService.reSqls(queryRequest, "importTask");
@@ -281,6 +281,7 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
         List<Personnel> personnels = new ArrayList<>();
         List<Product> products = new ArrayList<>();
         List<Project> projects = new ArrayList<>();
+        List<ReportProject> reportProjects =new ArrayList<>();
         List<SystemFile> systemFiles = new ArrayList<>();
 
         //查询创建人名称
@@ -295,6 +296,10 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
             LambdaQueryWrapper<Project> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.in(Project::getId, projectIds);
             projects = projectService.list(queryWrapper);
+
+            LambdaQueryWrapper<ReportProject> queryWrapper1 =new LambdaQueryWrapper<>();
+            queryWrapper1.in(ReportProject::getProjectId,projectIds);
+            reportProjects=reportProjectService.list(queryWrapper1);
         }
 
         //查询产品名称
@@ -350,7 +355,7 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
                 Project project = projects.stream().filter(item -> item.getId().equals(importTaskVO.getProjectId())).findFirst().orElse(null);
                 if (project != null) {
                     importTaskVO.setImportToId(project.getId());
-                    importTaskVO.setImportToType(project.getType() - 1);
+                    importTaskVO.setProjectType(project.getType());
                     if (project.getType().equals(1)) {
                         importTaskVO.setImportToName(project.getName() + "-专利数据库");
                     } else if (project.getType().equals(4)) {
@@ -359,7 +364,11 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
                         } else {
                             importTaskVO.setImportToName("查新检索" + "-报告");
                         }
-                    } else {
+                    } else if(project.getType().equals(2)){
+                        ReportProject reportProject =reportProjects.stream().filter(item -> item.getProjectId().equals(importTaskVO.getProjectId())).findFirst().orElse(null);
+                        if(reportProject!=null){
+                            importTaskVO.setReportType(reportProject.getReportType());
+                        }
                         importTaskVO.setImportToName(project.getName() + "-报告");
                     }
                 }
@@ -414,7 +423,7 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
             if (projects.size() != 0) {
                 toName = projects.get(0).getName();
             }
-        } else if (importTaskCondition.getProjectId() != null && importTaskCondition.getProjectType().equals(3)) {
+        } else if (importTaskCondition.getProjectId() != null && importTaskCondition.getProjectType().equals(4)) {
             to = "报告";
             LambdaQueryWrapper<Project> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.in(Project::getId, importTaskCondition.getProjectId());