1.4 lrj

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

@@ -29,6 +29,7 @@ public class ReportDocumentController {
         return reportDocumentService.exportReport(reportId,templeId);
     }
 
+
     @RequestMapping(value = "/getExportList", method = RequestMethod.POST)
     @Operation(summary = "获得导出记录")
     public  String getExportList(@RequestBody ReportDocument reportDocument) throws IOException {

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

@@ -98,8 +98,9 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
         Report report = reportService.getById(reportId);
         // 根据拆分人（报告的创建人）Id和报告ID获得所有特征
         LambdaQueryWrapper<Features> allFeaturesWrapper = new LambdaQueryWrapper<>();
-        allFeaturesWrapper.eq(Features::getPartnerId, report.getPersonId())
-                .eq(Features::getReportId, report.getId());
+        allFeaturesWrapper.eq(Features::getReportId, report.getId());
+        allFeaturesWrapper.and(wrapper->wrapper.eq(Features::getPartnerId, report.getPersonId()).or().eq(Features::getPartnerId, report.getCreatePersonId()));
+
         List<Features> allFeatures = featureService.list(allFeaturesWrapper);
         //根据报告Id 查询出报告下所有的方案
         LambdaQueryWrapper<CompareScenarios> queryWrapper = new LambdaQueryWrapper<>();
@@ -212,7 +213,7 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
             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)) {
+            if (partFeatures.size()!=0&&partFeatures.get(0).getRightType().equals(1)) {
                 temMap.put("rightName", "独立" + partFeatures.get(0).getRightName());
             } else {
                 temMap.put("rightName", "附属" + partFeatures.get(0).getRightName());
@@ -246,7 +247,7 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
                 //获取对比专利号
                 map.put("compareContent", compareContent);
                 map.put("figure",fileUtils.getSystemPath()+record.getFilePath());
-                map.put("position",record.getPosition());
+                map.put("position",record.getFields()+"["+record.getPosition()+"]");
                 maps.add(map);
             });
             //方案内容
@@ -377,6 +378,19 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
         return Response.success(url);
     }
 
-    }
+
+/*    *//**
+     * @autor
+     * @return
+     * @description 装载稳定和无效模板信息
+     *//*
+    private Map<String, Object> getstabilityMaps(){
+
+
+
+
+    }*/
+
+}