12.20 陈宇

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

@@ -94,4 +94,6 @@ public class SyneryVO extends BaseVO {
     @Schema(description = "筛选条件")
     private PatentVO patentVO;
 
+    @Schema (description = "是否是全部专利 0，否 1，是")
+    private Integer isAll;
 }

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

@@ -3,6 +3,7 @@ package cn.cslg.report.service;
 import cn.cslg.report.common.model.dto.ProductDTO;
 import cn.cslg.report.common.model.dto.ProductIncludeFilesDTO;
 import cn.cslg.report.common.model.vo.ProductIncludeFilesVO;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -46,7 +47,6 @@ public interface IProductService {
      *
      * @param reportId 报告id
      */
-    @Transactional
     void deleteProduct(Integer reportId);
 
 }

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

@@ -97,22 +97,14 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
     }
 
     public Boolean updateCompareMessage(List<CompareMessage> compareMessageList) {
-        List<Integer> ids =compareMessageList.stream().map(CompareMessage::getId).collect(Collectors.toList());
+        List<Integer> ids =compareMessageList.stream().map(CompareMessage::getFeatureId).collect(Collectors.toList());
         if(ids.size()!=0){
             LambdaQueryWrapper<CompareMessage> queryWrapper =new LambdaQueryWrapper<CompareMessage>();
-            queryWrapper.in(CompareMessage::getId,ids);
-            List<CompareMessage> compareMessages =this.list(queryWrapper);
-            compareMessages.forEach(item->{
-                compareMessageList.forEach(tem->{
-                    if(item.getId().equals(tem.getId())){
-                        item.setCompareResult(tem.getCompareResult());
-                        item.setCompareDescription(tem.getCompareDescription());
-                        item.setTargetDescription(tem.getTargetDescription());
-                    }
-                });
-            });
+            queryWrapper.in(CompareMessage::getFeatureId,ids).isNull(CompareMessage::getTaskType);
+  this.remove(queryWrapper);
 
-           return this.saveOrUpdateBatch(compareMessages);
+
+           return this.saveOrUpdateBatch(compareMessageList);
         }
         return true;
     }
@@ -151,7 +143,8 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
         else {
             queryWrapper1.isNull(CompareMessage::getTaskType);
         }
-            compareMessages = this.list(queryWrapper1);}
+            compareMessages = this.list(queryWrapper1);
+        }
 
         List<CompareMessageVO> compareMessageVOS = new ArrayList<>();
         for (Features item: features){
@@ -172,7 +165,6 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
         }
         //将拆解的权要和特征装载到对象PatentRightVo
         for (int i = 0; i < patentRights.size(); i++) {
-
             List<CompareMessageVO> featuresList = new ArrayList<>();
             //对需要拆解的权要进行拆解
             if (compareMessageVOS != null && compareMessageVOS.size() != 0) {

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

@@ -222,8 +222,9 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
             //特征序号
             Integer order = 1;
             List<Features> featuresList = new ArrayList<>();
-            String name = "权要" + patentRights.get(i).getSort();
-            int rightId = patentRights.get(i).getSort()+1;
+
+            int rightId = patentRights.get(i).getSort();
+            String name = "权要" + (patentRights.get(i).getSort()+1);
             //对需要拆解的权要进行拆解
             if (featureFromDb != null && featureFromDb.size() != 0) {
                 featuresList = featureFromDb.stream().filter(item -> item.getRightId().equals(rightId) && item.getSplitBy().equals(a) && item.getPartnerId().equals(personnelVO.getId()) && item.getSplitType().equals(b)).collect(Collectors.toList());
@@ -330,7 +331,7 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
             }
             //装载到对象PatentRightVo
             PatentRightVo patentRightVo = new PatentRightVo();
-            String name = "权要" + (i + 1);
+            String name = "权要" + (patentRights.get(i).getSort()+1);
             patentRightVo.setPatentId(patentRights.get(i).getPatentId());
             patentRightVo.setFeatures(featuresList);
             patentRightVo.setContent(patentRights.get(i).getContent());
@@ -430,7 +431,7 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
                     List<Features> tem = patentRightVo.getFeatures();
                     for (int t = 0; t < tem.size(); t++) {
                         tem.get(t).setFeaturesOrder(order);
-                        tem.get(t).setPartnerId(personnelVO.getId());
+                        tem.get(t).setPartnerId(feature.getPartnerId());
                         tem.get(t).setSplitBy(feature.getSplitBy());
                         tem.get(t).setSplitType(feature.getSplitType());
                         tem.get(t).setId(null);

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

@@ -275,8 +275,8 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         //陈宇 ↓ 删除和报告有关的产品表数据、删除和产品有关的产品文件关联表数据、删除和产品有关的报告系统文件表数据
         productService.deleteProduct(id);
 
-        int dele = reportMapper.dele(id);
-        if (dele > 0) {
+        Boolean dele =this.removeById(id);
+        if (dele ==true) {
             return Response.success();
         }
         return Response.error("没有数据");

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

@@ -730,21 +730,43 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
 
         QueryCMVO queryCMVO = new QueryCMVO();
         queryCMVO.setReportId(syneryVO.getReportId());
-        queryCMVO.setPatentNo(syneryVO.getPatentNo());
         queryCMVO.setCompareResult(syneryVO.getCompareResult());
-        List<String> AllpatentNos = compareMessageService.getBaseMapper().getComparedMessageAll(queryCMVO);
-        //无查询条件
-        if ((patentVO == null || patentVO.getFiledOptions() == null || patentVO.getFiledOptions().size() == 0)&&syneryVO.getPatentNo()!=null) {
-            patentVO.setPatentNos(AllpatentNos);
+        List<String> patentNos = new ArrayList<>();
+        //无查询条件,单个专利
+        if( syneryVO.getPatentNo()!=null){
+          patentNos =Arrays.asList(syneryVO.getPatentNo());
+        }
+        //无查询条件并且是对比过的专利
+      else  if ((patentVO == null || patentVO.getFiledOptions() == null || patentVO.getFiledOptions().size() == 0)&&syneryVO.getIsAll()==0) {
+            List<String> AllpatentNos = compareMessageService.getBaseMapper().getComparedMessageAll(queryCMVO);
+            patentNos=AllpatentNos;
+        }
+        //无查询条件并且是全部的专利
+      else if((patentVO == null || patentVO.getFiledOptions() == null || patentVO.getFiledOptions().size() == 0)&&syneryVO.getIsAll()==1){
+            LambdaQueryWrapper<CompareFiles> queryWrapper1 = new LambdaQueryWrapper<>();
+            queryWrapper1.eq(CompareFiles::getReportId, syneryVO.getReportId());
+            List<CompareFiles> compareFiles = compareFilesService.list(queryWrapper1);
+            List<String>  AllpatentNos = compareFiles.stream().map(CompareFiles::getPatentNo).collect(Collectors.toList());
+            patentNos=AllpatentNos;
+        }
+        //有查询条件并且是对比过的专利
+        else if(patentVO != null && patentVO.getFiledOptions() != null && patentVO.getFiledOptions().size() != 0&&syneryVO.getIsAll()==0){
+            List<String> AllpatentNos = compareMessageService.getBaseMapper().getComparedMessageAll(queryCMVO);
+            List<String> temPatentNos = reportFieldService.getPatentNo1(patentVO.getFiledOptions(), syneryVO.getReportId(), task.getId(), patentVO.getTaskStatus());
+            List<String> strings1 = new ArrayList<>(CollectionUtils.intersection(temPatentNos, AllpatentNos));
+            patentVO.setPatentNos(temPatentNos);
         }
-        //有查询条件时，自定义字段的专利号和任务的专利号取交集
-        else {
-            List<String> temPatentNos = reportFieldService.getPatentNo1(patentVO.getFiledOptions(), patentVO.getReportId(), patentVO.getTaskId(), patentVO.getTaskStatus());
+        //有查询条件并且是全部的专利
+        else if(patentVO != null && patentVO.getFiledOptions() != null && patentVO.getFiledOptions().size() != 0&&syneryVO.getIsAll()==1){
+            LambdaQueryWrapper<CompareFiles> queryWrapper1 = new LambdaQueryWrapper<>();
+            queryWrapper1.eq(CompareFiles::getReportId, syneryVO.getReportId());
+            List<CompareFiles> compareFiles = compareFilesService.list(queryWrapper1);
+            List<String>  AllpatentNos = compareFiles.stream().map(CompareFiles::getPatentNo).collect(Collectors.toList());
+            List<String> temPatentNos = reportFieldService.getPatentNo1(patentVO.getFiledOptions(), syneryVO.getReportId(), task.getId(), patentVO.getTaskStatus());
             List<String> strings1 = new ArrayList<>(CollectionUtils.intersection(temPatentNos, AllpatentNos));
             patentVO.setPatentNos(temPatentNos);
         }
-        List<String> patentNos = new ArrayList<>();
-        if (patentVO.getPatentNos().size() != 0) {
+        if (patentVO!=null&&patentVO.getPatentNos()!=null&&patentVO.getPatentNos().size() != 0) {
             String res = outInterfaceService.getConPantentNos(patentVO, 1);
             JSONObject jsonObject1 = JSONObject.parseObject(res);
             patentNos = JSONArray.parseArray(jsonObject1.get("data").toString(), String.class);

RMS/src/main/resources/mapper/CompareMessageMapper.xml

@@ -23,6 +23,7 @@
         select DISTINCT f.SIGN_PATENT_NO from RMS_TEST.FEATURES f left join RMS_TEST.COMPARE_MESSAGE cm on f.ID =cm.FEATURE_ID
         <where>
             and f.REPORT_ID=#{params.reportId}
+            and cm.ID is not null
             <if test="params.patentNo !=null">
                 and f.SIGN_PATENT_NO=#{params.patentNo}
             </if>

RMS/target/classes/mapper/CompareMessageMapper.xml

@@ -23,6 +23,7 @@
         select DISTINCT f.SIGN_PATENT_NO from RMS_TEST.FEATURES f left join RMS_TEST.COMPARE_MESSAGE cm on f.ID =cm.FEATURE_ID
         <where>
             and f.REPORT_ID=#{params.reportId}
+            and cm.ID is not null
             <if test="params.patentNo !=null">
                 and f.SIGN_PATENT_NO=#{params.patentNo}
             </if>