导入 2022/12/9

RMS/src/main/java/cn/cslg/report/common/model/vo/AssignTaskVO.java

@@ -24,6 +24,9 @@ public class AssignTaskVO extends BaseVO {
     @Schema(description = "任务名")
     private String taskName;
 
+    @Schema(description = "任务类型")
+    private Integer taskType;
+
     @Schema(description = "报告Id")
     private Integer reportId;
     @Schema(description = "人员专利号对象")

RMS/src/main/java/cn/cslg/report/service/BaseService.java

@@ -258,7 +258,7 @@ public class BaseService {
         // excel类型
         if (fileName.endsWith(".xls")) {
             workbook = new HSSFWorkbook(fileInputStream);
-        } else if (fileName.endsWith(".xlsx")) {
+        } else if (fileName.endsWith(".xlsx")||fileName.endsWith(".XLSX")) {
             workbook = new XSSFWorkbook(fileInputStream);
         }
         Sheet sheet1 = workbook.getSheetAt(0); // excel文件的工作簿的名称
@@ -323,6 +323,8 @@ public class BaseService {
                                 .setUrl("")
                                 .setTotal(total), ResponseEnum.PATENT_IMPORT_TASK_SUCCESS), taskParams.getUserId());
                     } catch (IOException | ParseException e) {
+                        importTask.setState(3);
+                        importTask.updateById();
                         e.printStackTrace();
                     }
                 }

RMS/src/main/java/cn/cslg/report/service/business/AssoTaskPersonelService.java

@@ -45,7 +45,6 @@ public class AssoTaskPersonelService extends ServiceImpl<AssoTaskPersonelMapper,
     private String PASUrl;
     public  void test(){}
     public String deleAssoTaskPersonel(Integer reportId) throws IOException{
-        AssoTaskPersonel assoTaskPersonel =new AssoTaskPersonel();
         LambdaQueryWrapper<AssoTaskPersonel> wrappers =new LambdaQueryWrapper();
         wrappers.eq(AssoTaskPersonel::getReportId,reportId);
          this.remove(wrappers);
@@ -68,9 +67,4 @@ public class AssoTaskPersonelService extends ServiceImpl<AssoTaskPersonelMapper,
 
     }
 
-
-
-
-
-
 }

RMS/src/main/java/cn/cslg/report/service/business/ReportDocumentService.java

@@ -88,19 +88,28 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
         List<CompareScenarios> compareScenarios = compareScenariosService.list(queryWrapper);
         List<Integer> scenarioIds = compareScenarios.stream().map(CompareScenarios::getId).collect(Collectors.toList());
         //根据对比方案Id 从关联表里获得对比记录特征关联ID
-        LambdaQueryWrapper<AssoScenarIOS> queryRecordsByIDs = new LambdaQueryWrapper<>();
-        queryRecordsByIDs.in(AssoScenarIOS::getScenariosID, scenarioIds);
-        List<AssoScenarIOS> scenariosRecords = scenariosRecordsService.list(queryRecordsByIDs);
+        List<AssoScenarIOS> scenariosRecords =new ArrayList<>();
+        if(scenarioIds!=null&&scenarioIds.size()!=0) {
+            LambdaQueryWrapper<AssoScenarIOS> queryRecordsByIDs = new LambdaQueryWrapper<>();
+            queryRecordsByIDs.in(AssoScenarIOS::getScenariosID, scenarioIds);
+            scenariosRecords = scenariosRecordsService.list(queryRecordsByIDs);
+        }
+
         List<Integer> recordfeatureRecordIds = scenariosRecords.stream().map(AssoScenarIOS::getFeatureRecordID).collect(Collectors.toList());
         //根据关联ID查出报告Id和特征Id
+        List<AssoRecordsFeature>  assoRecordsFeatures =new ArrayList<>();
+        if(recordfeatureRecordIds!=null&&recordfeatureRecordIds.size()!=0){
         LambdaQueryWrapper<AssoRecordsFeature> wrapper =new LambdaQueryWrapper<>();
         wrapper.in(AssoRecordsFeature::getId,recordfeatureRecordIds);
-        List<AssoRecordsFeature> assoRecordsFeatures =assoRecordsFeatureService.list(wrapper);
+        assoRecordsFeatures =assoRecordsFeatureService.list(wrapper);}
+        List<AssoRecordsFeature> finalAsso =assoRecordsFeatures;
         List<Integer> recordIds =assoRecordsFeatures.stream().map(AssoRecordsFeature::getRecordsId).collect(Collectors.toList());
         //根据对比记录ID查询对比记录
+        List<CompareRecords> compareRecords =new ArrayList<>();
+        if(recordIds!=null&&recordIds.size()!=0){
         LambdaQueryWrapper<CompareRecords> queryPatentByIDs = new LambdaQueryWrapper<>();
-        queryPatentByIDs.in(CompareRecords::getId, recordIds);
-        List<CompareRecords> compareRecords = compareRecordsService.list(queryPatentByIDs);
+        queryPatentByIDs.in(CompareRecords::getId,recordIds);
+         compareRecords = compareRecordsService.list(queryPatentByIDs);}
         //根据对比记录ID获得专利号
         List<String> PatentNos = compareRecords.stream().map(CompareRecords::getPatentNo).collect(Collectors.toList());
         PatentVO patentVO = new PatentVO();
@@ -153,6 +162,8 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
             //获得单个对比方案的权要的所有特征
             List<Features> partFeatures = allFeatures.stream().filter(item -> partFetIds.contains(item.getId())).collect(Collectors.toList());
             List<CompareRecords> records = compareRecords.stream().filter(item -> partRecordIds.contains(item.getId())).collect(Collectors.toList());
+            //获得单条权要所有的特征
+            List<Features> allRightFeatures =allFeatures.stream().filter(item ->item.getRightId().equals(item1.getRightId())).collect(Collectors.toList());
             //存放单条对比结果的map
             Map<String, Object> temMap = new HashMap<>();
             if (partFeatures.get(0).getRightType().equals(1)) {
@@ -171,10 +182,22 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
             partFeatures.forEach(tem -> {
                 Map<String, Object> map = new HashMap<>();
                 map.put("featureContent", tem.getContent());
-                AssoRecordsFeature assoRecordsFeature = assoRecordsFeatures.stream().filter(item -> item.getFeatureId().equals(tem.getId())).findFirst().orElse(new AssoRecordsFeature());
+                AssoRecordsFeature assoRecordsFeature = finalAsso.stream().filter(item -> item.getFeatureId().equals(tem.getId())).findFirst().orElse(new AssoRecordsFeature());
                 map.put("compareResult", assoRecordsFeature.getComResult()!=null?assoRecordsFeature.getComResult():"");
                 CompareRecords record = records.stream().filter(item -> item.getId().equals(assoRecordsFeature.getRecordsId())).findFirst().orElse(new CompareRecords());
-                map.put("compareContent", record.getContent()!=null?record.getContent():"");
+                String  compareContent ="";
+                //获取对比内容
+             String content =  record.getContent()!=null?record.getContent():"";
+               //获得对比专利号
+                String patentNo =record.getPatentNo()!=null?record.getPatentNo():"";
+                if (OtherName.containsKey(patentNo)) {
+                    patentNo = OtherName.get(patentNo).toString();
+                }
+                //获得解析过程
+                String paresingProcess =record.getParesingProcess()!=null?record.getParesingProcess():"";
+             compareContent =patentNo+":"+content+"("+paresingProcess+")";
+                //获取对比专利号
+                map.put("compareContent", compareContent);
                 maps.add(map);
             });
             //方案内容
@@ -193,12 +216,12 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
             patentNOs.forEach(
                     item -> {
                         List<Integer> temRecordIds = records.stream().filter(tm -> tm.getPatentNo().equals(item)).map(CompareRecords::getId).collect(Collectors.toList());
-                        List<Integer> temFIds = assoRecordsFeatures.stream().filter(tm -> temRecordIds.contains(tm.getRecordsId())).map(AssoRecordsFeature::getFeatureId).collect(Collectors.toList());
+                        List<Integer> temFIds = finalAsso.stream().filter(tm -> temRecordIds.contains(tm.getRecordsId())).map(AssoRecordsFeature::getFeatureId).collect(Collectors.toList());
                         String tmName = item;
                         if (OtherName.containsKey(item)) {
                             tmName = OtherName.get(item).toString();
                         }
-                        if (temFIds.size() == partFeatures.size()) {
+                        if (temFIds.size() == allRightFeatures.size()) {
                             noveltyFiles.add(tmName);
                         }
                     }
@@ -304,7 +327,7 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
         reportDocument.setTemplateName(reportTemplate.getTemplateName());
         reportDocument.setPersonName(personnelVO.getName());
         reportDocument.insert();
-        return Response.success();
+        return Response.success(url);
     }
 
     }

RMS/src/main/java/cn/cslg/report/service/business/TaskService.java

@@ -184,9 +184,14 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
     @Transactional(rollbackFor = Exception.class)
     public String addAssTask(AssignTaskVO assignTaskVO) throws ParseException, IOException {
         LambdaQueryWrapper<Report> wrapper1 = new LambdaQueryWrapper<>();
-        wrapper1.select(Report::getSignPatentNo);
         wrapper1.eq(Report::getId, assignTaskVO.getReportId());
-        String signPatentNO = reportService.list(wrapper1).get(0).getSignPatentNo();
+        Report report =reportService.list(wrapper1).get(0);
+        //添加分配任务时将报告的状态置为创建中
+        if(report.getStatus()!=2){
+            report.setStatus(2);
+            report.updateById();
+        }
+        String signPatentNO = report.getSignPatentNo();
         //遍历assignTaskVO的分配人员信息assigns，在任务表里插入分配任务
         List<String> selectedNos = new ArrayList<>();
         //记录所有人的id
@@ -230,7 +235,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
             Task task = new Task();
             task.setTaskName(assignTaskVO.getTaskName());
             task.setReportId(assignTaskVO.getReportId());
-            task.setType(2);
+            task.setType(assignTaskVO.getTaskType());
             task.setTaskStatus(0);
             task.setProgress(0.0);
             task.setEndTime(assignTaskVO.getEndTime());