Merge remote-tracking branch 'origin/master'

# Conflicts:
#	RMS/src/main/java/cn/cslg/report/service/business/ReportFieldService.java

RMS/src/main/java/cn/cslg/report/controller/PatentFiledController.java

@@ -40,14 +40,12 @@ public class PatentFiledController {
         if (reportId != null) {
             return reportFieldService.updateReportId(reportField);
         }
-
         return reportFieldService.edit(reportField);
     }
 
     @GetMapping("delete")
     @Operation(summary = "删除自定义字段")
     public String delete(Integer id, Integer reportId) {
-
         return reportFieldService.delete(id);
     }
 
@@ -65,7 +63,6 @@ public class PatentFiledController {
         } else {
             return Response.success(reportFieldOptionService.getListByFieldId(fieldId));
         }
-
     }
 
     @PostMapping("update")

RMS/src/main/java/cn/cslg/report/controller/ReportController.java

@@ -54,9 +54,7 @@ public class ReportController {
         if (report != null) {
             //新建报告并返回报告Id
             Integer reportId = reportService.addReport(report,files);
-
             return Response.success("添加成功");
-
         } else {
             return Response.error("网络异常");
         }
@@ -110,7 +108,6 @@ public class ReportController {
     public String deleFile(int id)throws IOException{
         return reportReferencesService.delete(id);
     }
-
     @PostMapping(value = "updatefiles")
     @Operation(summary = "文件修改")
     @Transactional(rollbackFor = Exception.class)

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

@@ -52,7 +52,6 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         Report report = reportService.getById(compareFilesVO.getReportId());
         //根据标的专利号获得专利信息
         String res1 = outInterfaceService.getPatentFromPAS( report.getSignPatentNo());
-
         JSONObject res1Object = JSONObject.parseObject(res1);
         JSONObject patentNoJSON = JSONObject.parseObject(res1Object.get("data").toString());
             //获得引用专利号
@@ -125,7 +124,6 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
             patentVO.setPatentNos(patentNos);
             //详情见outInterfaceService.getPatentFromPAS
             res = outInterfaceService.getPatentFromPAS(patentVO, 1);
-
         } else {
             //根据标的专利号和报告id找到报告
             LambdaQueryWrapper<Report> wrapper1 = new LambdaQueryWrapper<>();
@@ -136,11 +134,9 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
                 return "";
             }
             String signPatentNO = reportService.list(wrapper1).get(0).getSignPatentNo();
-          patentNos.add(signPatentNO);
             patentVO.setNotInPatentNos(patentNos);
             //详情见outInterfaceService.getPatentFromPAS
             res = outInterfaceService.getPatentFromPAS(patentVO, 0);
-
         }
         JSONObject jsonObject = JSONObject.parseObject(res);
         JSONObject resData = JSONObject.parseObject(jsonObject.getString("data"));
@@ -151,7 +147,6 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
             if (patentNos.contains(list.get(i).get("patentNo").toString())) {
                 temNos.add(list.get(i).get("patentNo").toString());
             }
-
         }
         //根据报告id获取对比文件的数量
         int i = compareFilesMapper.selectedTotal(patentVO.getReportId());

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

@@ -160,7 +160,7 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
             if (partRightIds.contains(patentRights.get(i).getId())) {
 
                 if (featureFromDb != null && featureFromDb.size() != 0) {
-                    featuresList = featureFromDb.stream().filter(item -> item.getRightId() == rightId && item.getSplitBy() .equals(a)  &&item.getPartnerId()==personnelVO.getId()).collect(Collectors.toList());
+                    featuresList = featureFromDb.stream().filter(item -> item.getRightId() .equals(rightId)  && item.getSplitBy().equals(a)  &&item.getPartnerId().equals(personnelVO.getId())).collect(Collectors.toList());
                 }
                 //如果数据库里无拆解记录则手动插入一条
                 if (featuresList == null || featuresList.size() == 0 || flag == 1) {
@@ -351,6 +351,8 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
     public String addFeatures(List<PatentRightVo> patentRightVos) {
         PersonnelVO personnelVO = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
         LambdaQueryWrapper<Features> wrapper = new LambdaQueryWrapper<>();
+       Features feature = this.list(wrapper).get(0);
+
         if (patentRightVos.get(0).getReportId() != null && patentRightVos.get(0).getSignPatentNo() != null) {
             wrapper.eq(Features::getReportId, patentRightVos.get(0).getReportId())
                     .eq(Features::getSignPatentNo, patentRightVos.get(0).getSignPatentNo())
@@ -366,6 +368,9 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
                 for (int t = 0; t < tem.size(); t++) {
                     tem.get(t).setPartnerId(personnelVO.getId());
                     tem.get(t).setFeaturesOrder(order);
+                    tem.get(t).setPartnerId(feature.getPartnerId());
+                    tem.get(t).setRightName(feature.getRightName());
+                    tem.get(t).setRightType(feature.getRightType());
                     order+=1;
                     features.add(tem.get(t));
                 }

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

@@ -300,7 +300,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
             task.setSignPatentNo(signPatentNO);
             task.insert();
             //根据数量从分配的专利号列表中截取该数量的专利号，加上分配信息的专利号进行装配
-            List<String> partNos = patentNos.subList(flag, flag + personPatents.get(i).getAssignCount() - 1);
+            List<String> partNos = patentNos.subList(flag, flag + personPatents.get(i).getAssignCount());
             flag += personPatents.get(i).getAssignCount();
             partNos.addAll(personPatents.get(i).getPatentNos());
             for (int t = 0; t < partNos.size(); t++) {