Merge remote-tracking branch 'origin/master'

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

@@ -166,29 +166,33 @@ public class AvoidDesignWholeService extends ServiceImpl<AvoidDesignWholeMapper,
         LambdaQueryWrapper<AvoidDesign> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(AvoidDesign::getProjectId, projectId);
         List<AvoidDesign> avoidDesignList = avoidDesignService.list(queryWrapper);
-        for (Feature feature : features) {
-            //新建特征与回避设计方向VO
-            AvoidDesignVO avoidDesignVO = new AvoidDesignVO();
-            //装载特征部分的信息
-            avoidDesignVO.setFeatureId(feature.getId());
-            avoidDesignVO.setContent(feature.getContent());
-            avoidDesignVO.setPatentNo(feature.getPatentNo());
-            avoidDesignVO.setRightSort(feature.getRightSort());
-            avoidDesignVO.setRightType(feature.getRightType());
-            avoidDesignVO.setExplainText(feature.getExplainText());
-            avoidDesignVO.setFormId(feature.getFromId());
-            avoidDesignVO.setSysOrder(feature.getSysOrder());
-            //装载回避设计部分（可能为空）
-            if (!avoidDesignList.isEmpty()) {
-                AvoidDesign avoidDesign = avoidDesignList.stream().filter(item -> item.getFeatureId() != null && item.getFeatureId().equals(feature.getId())).findFirst().orElse(null);
-                if (avoidDesign != null) {
-                    avoidDesignVO.setId(avoidDesign.getId());
-                    avoidDesignVO.setDirection(avoidDesign.getDirection());
-                    avoidDesignVO.setCreateId(avoidDesign.getCreateId());
-                    avoidDesignVO.setCreateTime(avoidDesign.getCreateTime());
+        if (!features.isEmpty()) {
+            for (Feature feature : features) {
+                //新建特征与回避设计方向VO
+                AvoidDesignVO avoidDesignVO = new AvoidDesignVO();
+                //装载特征部分的信息
+                avoidDesignVO.setFeatureId(feature.getId());
+                avoidDesignVO.setContent(feature.getContent());
+                avoidDesignVO.setPatentNo(feature.getPatentNo());
+                avoidDesignVO.setRightSort(feature.getRightSort());
+                avoidDesignVO.setRightType(feature.getRightType());
+                avoidDesignVO.setExplainText(feature.getExplainText());
+                avoidDesignVO.setFormId(feature.getFromId());
+                avoidDesignVO.setSysOrder(feature.getSysOrder());
+                //装载回避设计部分（可能为空）
+                if (!avoidDesignList.isEmpty()) {
+                    AvoidDesign avoidDesign = avoidDesignList.stream().filter(item -> item.getFeatureId() != null && item.getFeatureId().equals(feature.getId())).findFirst().orElse(null);
+                    if (avoidDesign != null) {
+                        avoidDesignVO.setId(avoidDesign.getId());
+                        avoidDesignVO.setDirection(avoidDesign.getDirection());
+                        avoidDesignVO.setCreateId(avoidDesign.getCreateId());
+                        avoidDesignVO.setCreateTime(avoidDesign.getCreateTime());
+                    }
                 }
+                avoidDesignVOS.add(avoidDesignVO);
             }
-            avoidDesignVOS.add(avoidDesignVO);
+        } else {
+            throw new XiaoShiException("未查询到特征");
         }
         return avoidDesignVOS;
     }

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

@@ -408,6 +408,7 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
         if (importTaskConditionId != null) {
             ImportTask importTask = new ImportTask();
             importTask.setImportTaskConditionId(importTaskConditionId);
+            //设置任务的类型 6导出excel  7导出pdf首页
             importTask.setType(exportTaskDTO.getType());
             importTask.setAllNum(exportTaskDTO.getAllNum());
             importTask.setFinishTime(exportTaskDTO.getFinishTime());

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

@@ -65,6 +65,7 @@ public class PDFExportFirstPageService {
         List<String> patentNos = this.getPatentNo(EsVO);
         Integer total = patentNos.size();
         Integer defaultNum = 0;
+
         PDFMergerUtility merger = new PDFMergerUtility();
         PDDocument resultDocument = new PDDocument();
         for (int i = 0; i < patentNos.size(); i++) {

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

@@ -870,14 +870,35 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
         if (taskId != null) {
             List<CCPerson> ccPeople = tortTaskDTO.getCcPeople();
             this.addTaskAndCCPeople(personnelVO.getId(), taskId, ccPeople);
+            //发送给抄送人
+            for (CCPerson item : ccPeople) {
+                mailSendService.sentToCCMail(item.getPersonId(), item.getIfInner(), personnelVO.getId());
+            }
         } else {
             throw new XiaoShiException("创建任务失败，未读取到任务id");
         }
         //3.从侵权分析中获得对比结果，并复制保存
         tortCompareRecordService.copyTortCompareRecords(tortTaskDTO.getProjectId(), taskId, personnelVO.getId());
-        //4.发送邮件通知协同人和抄送人
+
         //保存es
         this.addCompareLiteratureByNosToEs(patentNos, taskId, projectId);
+        //4.发送邮件通知协同人和抄送人
+        String code = taskCodeService.addTaskCode(taskId);
+        Boolean ifInner = true;
+        if (tortTaskDTO.getHandlerType() == 0) {
+            ifInner = true;
+        } else {
+            ifInner = false;
+        }
+        LambdaQueryWrapper<ReportProject> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ReportProject::getProjectId, projectId);
+        ReportProject reportProject = reportProjectService.getOne(queryWrapper, false);
+        Integer reportType = null;
+        if (reportProject != null) {
+            reportType = reportProject.getReportType();
+        }
+        mailSendService.sendSynery(projectTask.getHandler(), ifInner, projectId, taskId, reportType, code);
+
         return projectTask.getId();
     }
 

src/main/resources/jsons/importTask.json

@@ -28,7 +28,7 @@
     "ifAsCondition": "true"
   },
   {
-    "name": "导入方式",
+    "name": "导入/导出方式",
     "type": "Array",
     "value": "type",
     "field": "type",
@@ -42,7 +42,7 @@
     "ifAsCondition": "false"
   },
   {
-    "name": "导入方式",
+    "name": "导入/导出方式",
     "type": "String",
     "value": "type",
     "field": "type",