12/1

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

@@ -15,8 +15,7 @@ public class CompareFileVO {
 
     @Schema(description = "专利号ID")
     private String patentNo;
-    @Schema(description = "自定义字段id")
-    private int patentFiledID;
+
 
     @Schema(description = "标引")
     private String remark;

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

@@ -37,17 +37,17 @@ public class CompareFilesController {
     public String update(@RequestBody CompareFileVO CompareFileVO) throws IOException{
        return compareFilesService.update(CompareFileVO);
     }
-    @GetMapping("/settingAll")
+    @PostMapping("/settingAll")
     @Operation(summary = "初选所有")
-    public String settingAll(int reportId, List<Integer>  patentFiledID, String patentNo)throws IOException{
-       return compareFilesService.settingAll(reportId,patentFiledID,patentNo);
-    }
-    @PostMapping("/set")
-    @Operation(summary = "初选")
-    public String set(@RequestBody CompareFileVO compareFileVO)throws IOException{
-//       return compareFilesService.set(compareFileVO.getReportId(),compareFileVO.getPatentFiledID(),compareFileVO.getPatentNo(),compareFileVO.getType());
-        return null;
-
+    public String settingAll(@RequestBody CompareFileVO  compareFileVO )throws IOException{
+       return compareFilesService.settingAll(compareFileVO.getReportId(),compareFileVO.getReportFieldIDlist(),compareFileVO.getPatentNo());
     }
+//    @PostMapping("/set")
+//    @Operation(summary = "初选")
+//    public String set(@RequestBody CompareFileVO compareFileVO)throws IOException{
+////       return compareFilesService.set(compareFileVO.getReportId(),compareFileVO.getPatentFiledID(),compareFileVO.getPatentNo(),compareFileVO.getType());
+//        return null;
+//
+//    }
 
 }

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

@@ -45,9 +45,7 @@ public class PatentFiledController {
     @GetMapping("delete")
     @Operation(summary = "删除自定义字段")
     public String delete(Integer id,Integer reportId) {
-//        if(reportId!=null){
-//            return reportFieldService.deleteReportId(reportId,id);
-//        }
+
         return reportFieldService.delete(id);
     }
 

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

@@ -227,29 +227,35 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
     }
     public String settingAll(int reportId,List<Integer> patentFiledID,String patentNo) throws IOException {
         LambdaQueryWrapper<CompareFiles> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        CompareFileVO compareFileVO=new CompareFileVO();
         lambdaQueryWrapper.eq(CompareFiles::getReportId,reportId)
                 .eq(CompareFiles::getPatentNo,patentNo);
         List<CompareFiles> list = this.list(lambdaQueryWrapper);
+        List<ReportField> fieldList=new ArrayList<>();
         List<CompareFileVO> voList=new ArrayList<>();
+        if(list.size()!=0){
+            CompareFiles compareFiles = list.get(0);
+            compareFileVO.setReportId(compareFiles.getReportId())
+                    .setState(compareFiles.getState())
+                    .setRemark(compareFiles.getRemark())
+                    .setPatentNo(compareFiles.getPatentNo());
+            if(patentFiledID.size()!=0) {
+                for(Integer a :patentFiledID){
+                    List<ReportField> reportFields = reportFieldService.selectAll(a);
+                    if(reportFields.size()!=0){
+                        fieldList.add(reportFields.get(0));
+                    }
+
+
+                }
+                compareFileVO.setList(fieldList);
+            }
+
+        }
 
-//        for(CompareFiles compareFiles:list){
-//
-//
-//            CompareFileVO compareFileVO = new CompareFileVO();
-////            if(compareFiles.getPatentFiledID()!=null){
-////                List<ReportField> reportFields = reportFieldService.selectAll(compareFiles.getPatentFiledID());
-////                compareFileVO.setList(reportFields);
-////            }
-//            compareFileVO.setReportId(compareFiles.getReportId())
-//                    .setState(compareFiles.getState())
-//                    .setPatentNo(compareFiles.getPatentNo())
-//                    .setRemark(compareFiles.getRemark());
-//            voList.add(compareFileVO);
-//
-//        }
 
 
-        return Response.success();
+        return Response.success(compareFileVO);
 
     }
     public String set(int reportId, int patentFiledID, String patentNo, Integer type, List<String> list)throws IOException{

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

@@ -30,6 +30,7 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
     private final CompareRecordsService compareRecordsService;
     private final FeatureService featureService;
     public String add(CompareScenariosVO compareScenariosVO) throws IOException{
+        //对比方案信息入表
         CompareScenarios compareScenarios = new CompareScenarios();
         compareScenarios.setContrastResult(compareScenariosVO.getContrastResult());
         compareScenarios.setReportId(compareScenariosVO.getReportId());
@@ -44,6 +45,7 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
             CompareScenariosAndRecords compareScenariosAndRecords = new CompareScenariosAndRecords();
             compareScenariosAndRecords.setScenariosID(id);
             compareScenariosAndRecords.setFeaturesID(integer);
+            compareScenariosAndRecords.setRecordID(0);
             compareScenariosAndRecordsService.add(compareScenariosAndRecords);
         }
         List<Integer> recordIDList = compareScenariosVO.getRecordIDList();
@@ -51,6 +53,7 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
             CompareScenariosAndRecords compareScenariosAndRecords = new CompareScenariosAndRecords();
             compareScenariosAndRecords.setScenariosID(id);
             compareScenariosAndRecords.setRecordID(integer);
+            compareScenariosAndRecords.setFeaturesID(0);
             compareScenariosAndRecordsService.add(compareScenariosAndRecords);
         }
        return Response.success();
@@ -68,12 +71,15 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
             compareScenariosVO.setReportId(a.getReportId());
             compareScenariosVO.setSignPatentNo(  a.getSignPatentNo());
             compareScenariosVO.setRight(a.getRightName());
+            //根据对比方案ID获得s所有对比方案和对比记录关联信息
             List<AssoScenarIOS> select = assoScenarIOSService.select(a.getId());
-            List<Integer> recordIds = select.stream().map(AssoScenarIOS::getRecordID).collect(Collectors.toList());
+            //获得Id不为0的对比记录Id
+            List<Integer> recordIds = select.stream().filter(item->item.getRecordID()!=0).map(AssoScenarIOS::getRecordID).collect(Collectors.toList());
             LambdaQueryWrapper<CompareRecords> wrapper1 =new LambdaQueryWrapper<>();
+            wrapper1.in(CompareRecords::getId,recordIds);
             //获得方案的所有记录
             List<CompareRecords> compareRecords = compareRecordsService.list(wrapper1);
-           List<Integer> featuresIds =select.stream().filter(item->item.getFeaturesID().equals(0)).map(AssoScenarIOS::getFeaturesID).collect(Collectors.toList());
+           List<Integer> featuresIds =select.stream().filter(item->!item.getFeaturesID().equals(0)).map(AssoScenarIOS::getFeaturesID).collect(Collectors.toList());
             compareScenariosVO.setFeaturesIDList(featuresIds);
             compareScenariosVO.setCompareRecords(compareRecords);
             list.add(compareScenariosVO);

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

@@ -171,6 +171,7 @@ public class ReportFieldService extends ServiceImpl<ReportFieldMapper, ReportFie
         List<ReportField> reportFields = reportFieldMapper.find(reportId,id);
         return Response.success(reportFields);
     }
+
     public String updateReportId(ReportField reportField){
         reportFieldMapper.updateReportId(reportField);
         return Response.success();