Merge remote-tracking branch 'origin/master'

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

@@ -28,6 +28,9 @@ public class CompareFileVO {
     private List<Integer> ReportFieldIDlist;
     @Schema(description = "自定义字段类型")
     private int type;
+    @Schema(description = "自定义字段的id")
+    private int ReportFieldID;
+
 //    private List obj;
 //    @Schema(description = "栏位数组")
 //    private List<String> str;

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

@@ -0,0 +1,14 @@
+package cn.cslg.report.common.model.vo;
+
+import cn.cslg.report.common.model.dto.LabelDTO;
+import lombok.Data;
+
+import java.util.List;
+@Data
+public class PatentIndexSettingVO {
+    private String patentNo;
+    private Integer fieldId;
+    private Integer reportId;
+    private Integer type;
+    private List<LabelDTO> selected;
+}

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

@@ -2,6 +2,8 @@ package cn.cslg.report.controller;
 
 import cn.cslg.report.common.core.base.Constants;
 import cn.cslg.report.common.model.vo.CompareFileVO;
+import cn.cslg.report.common.model.vo.PatentIndexSettingVO;
+import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.CompareFiles;
 import cn.cslg.report.service.business.CompareFilesService;
 
@@ -21,33 +23,19 @@ import java.util.List;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class CompareFilesController {
     private final CompareFilesService compareFilesService;
-   @PostMapping("/add")
-    @Operation(summary = "增加")
-    public String add(@RequestBody CompareFileVO CompareFileVO)throws IOException{
-       return compareFilesService.add(CompareFileVO);
-   }
-    @GetMapping("/delete")
-    @Operation(summary = "删除")
-    public  String delete(Integer id)throws IOException{
-       return compareFilesService.dele(id);
 
+    @GetMapping("/index/setting/all")
+    @Operation(summary ="获取当前所有的,传过来报告（int）id，和（String）专利号")
+    public String settingAll(Integer reportId, String patentNos)throws IOException{
+         return Response.success(compareFilesService.setAll(reportId,patentNos));
     }
-    @PostMapping("/update")
-    @Operation(summary = "修改")
-    public String update(@RequestBody CompareFileVO CompareFileVO) throws IOException{
-       return compareFilesService.update(CompareFileVO);
+    @PostMapping("/index/setting")
+    @Operation(summary = "获取专利标引情况")
+    public String getPatentIndexSetting(@RequestBody PatentIndexSettingVO params) throws IOException {
+        compareFilesService.getPatentIndexSetting(params);
+        return Response.success(true);
     }
-    @PostMapping("/settingAll")
-    @Operation(summary = "初选所有")
-    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/entity/ReportField.java

@@ -75,7 +75,7 @@ public class ReportField extends BaseEntity<ReportField> {
      * 报告Id
      */
     @TableField("REPORT_ID")
-    @Schema(description ="专题库")
+    @Schema(description ="报告id")
     private Integer reportId;
 
     @TableField("REPORT_TYPE")

RMS/src/main/java/cn/cslg/report/entity/ReportFieldPatentLink.java

@@ -37,7 +37,7 @@ public class ReportFieldPatentLink extends BaseEntity<ReportFieldPatentLink> {
     private Integer type;
 
     /**
-     * 专利id
+     * 专利号
      */
     @TableField("PATENT_NO")
     private String patentNo;

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

@@ -1,7 +1,10 @@
 package cn.cslg.report.service.business;
 
+import cn.cslg.report.common.model.dto.CustomFieldLabelDTO;
+import cn.cslg.report.common.model.dto.LabelDTO;
 import cn.cslg.report.common.model.vo.CompareFileVO;
 import cn.cslg.report.common.model.vo.CompareFilesVO;
+import cn.cslg.report.common.model.vo.PatentIndexSettingVO;
 import cn.cslg.report.common.model.vo.PatentVO;
 
 import cn.cslg.report.common.utils.JsonUtils;
@@ -9,7 +12,6 @@ import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.*;
 import cn.cslg.report.mapper.CompareFilesMapper;
 import cn.cslg.report.service.OutInterfaceService;
-import cn.hutool.core.lang.tree.Tree;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -39,6 +41,7 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
     private final ReportFieldTreeService reportFieldTreeService;
     private final ReportFieldOptionService reportFieldOptionService;
     private final AssoComapareFielService assoComapareFielService;
+    private final ReportFieldPatentLinkService reportFieldPatentLinkService;
 
     @Transactional(rollbackFor = Exception.class)
     public String addCompareFile(CompareFilesVO compareFilesVO) throws IOException {
@@ -172,127 +175,47 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         }
         return Response.success();
     }
-    public String add(CompareFileVO compareFileVO)throws IOException{
-        CompareFiles compareFiles=new CompareFiles();
-        compareFiles.setRemark(compareFileVO.getRemark())
-                .setReportId(compareFileVO.getReportId())
-                .setState(compareFileVO.getState())
-                .setPatentNo(compareFileVO.getPatentNo());
-        compareFiles.insert();
-        List<Integer> reportFieldIDlist = compareFileVO.getReportFieldIDlist();
-       if(reportFieldIDlist.size()!=0){
-           for( Integer a: reportFieldIDlist){
-               AssoComapareFiel assoComapareFiel = new AssoComapareFiel();
-               assoComapareFiel.setFieldID(a);
-               assoComapareFiel.setCompareFileID(compareFiles.getId());
-               assoComapareFielService.add(assoComapareFiel);
-           }
-       }
 
-
-        return Response.success();
-
-    }
     public String dele(int id)throws IOException{
         CompareFiles compareFiles = new CompareFiles();
         compareFiles.deleteById(id);
         return Response.success();
     }
-    @Transactional
-    public String update(CompareFileVO compareFileVO)throws IOException{
 
-        LambdaQueryWrapper<CompareFiles> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(CompareFiles::getReportId,compareFileVO.getReportId())
-                .eq(CompareFiles::getPatentNo,compareFileVO.getPatentNo())
-                .eq(CompareFiles::getRemark,compareFileVO.getRemark())
-                .eq(CompareFiles::getState,compareFileVO.getState());
-        CompareFiles compareFiles = this.list(lambdaQueryWrapper).get(0);
-        compareFiles.updateById();
-        List<AssoComapareFiel> select = assoComapareFielService.select(compareFiles.getId());
-        List<Integer> reportFieldIDlist = compareFileVO.getReportFieldIDlist();
-        if(select.size()==reportFieldIDlist.size()){
-            for(int i=0;i<select.size();i++){
-                AssoComapareFiel assoComapareFiel = select.get(i);
-                assoComapareFiel.setFieldID(reportFieldIDlist.get(i));
-                assoComapareFielService.updateAssoComapareFiel(assoComapareFiel);
+    public List<CustomFieldLabelDTO> setAll(Integer reportId, String patentNos) throws IOException{
+        List<CustomFieldLabelDTO> dataList = new ArrayList<>();
+        List<ReportFieldPatentLink> reportFieldPatentLinks = reportFieldPatentLinkService.get(reportId);
+        List<ReportField> reportFields = new ArrayList<>();
+        for(ReportFieldPatentLink a :reportFieldPatentLinks){
+            ReportField reportField = reportFieldService.get(a.getFieldId());
+            reportFields.add(reportField);
 
-
-            }
         }
-
-
-
-
-        return Response.success();
-    }
-    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(ReportField reportField:reportFields) {
+            PatentIndexSettingVO params = new PatentIndexSettingVO();
+            CustomFieldLabelDTO data = new CustomFieldLabelDTO();
+            params.setPatentNo(patentNos);
+            params.setType(reportField.getType());
+            params.setFieldId(reportField.getId());
+            params.setReportId(reportField.getReportId());
+            data.setName(reportField.getName());
+            data.setId(reportField.getId());
+            data.setType(reportField.getType());
+            data.setSelected(reportFieldPatentLinkService.getPatentIndexSetting(params));
+            dataList.add(data);
 
         }
+        return dataList;
 
 
-
-        return Response.success(compareFileVO);
-
     }
-    public String set(int reportId, int patentFiledID, String patentNo, Integer type, List<String> list)throws IOException{
-        List<CompareFiles> compareFiles = compareFilesMapper.selectCompareFiles(reportId, patentFiledID, patentNo, list);
-        List<CompareFileVO> voList=new ArrayList<>();
-        if(type==6) {
-            for (CompareFiles c : compareFiles) {
-                CompareFileVO compareFileVO = new CompareFileVO();
-                compareFileVO.setReportId(c.getReportId())
-                        .setState(c.getState())
-                        .setPatentNo(c.getPatentNo())
-                        .setRemark(c.getRemark());
-//                List<Tree<Integer>> reportFieldTreeNodeByFieldId = reportFieldTreeService.getReportFieldTreeNodeByFieldId(c.getPatentFiledID());
-//                compareFileVO.setObj(reportFieldTreeNodeByFieldId);
-                voList.add(compareFileVO);
-
-            }
-
-        }else {
-            for (CompareFiles c : compareFiles){
-                CompareFileVO compareFileVO = new CompareFileVO();
-                compareFileVO.setReportId(c.getReportId())
-                        .setState(c.getState())
-                        .setPatentNo(c.getPatentNo())
-                        .setRemark(c.getRemark());
-//                List<ReportFieldOption> listByFieldId = reportFieldOptionService.getListByFieldId(c.getPatentFiledID());
-//                compareFileVO.setObj(listByFieldId);
-                voList.add(compareFileVO);
-            }
-
-        }
-
-        return Response.success(voList);
-
+    @Transactional(rollbackFor = Exception.class)
+    public void getPatentIndexSetting(PatentIndexSettingVO params)throws IOException {
+        reportFieldPatentLinkService.updatePatentIndexSetting(params);
     }
 
 
 
 
+
 }

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

@@ -47,7 +47,7 @@ public class ReportFieldOptionService extends ServiceImpl<ReportFieldOptionMappe
         return this.list(queryWrapper);
     }
 
-    public List<ReportFieldOption> getFieldOptionListByIds(List<Integer> ids) {
+    public  List<ReportFieldOption> getFieldOptionListByIds(List<Integer> ids) {
         if (ids == null || ids.size() == 0) {
             return new ArrayList<>();
         }

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

@@ -1,11 +1,10 @@
 package cn.cslg.report.service.business;
 
 import cn.cslg.report.common.model.dto.LabelDTO;
+import cn.cslg.report.common.model.vo.PatentIndexSettingVO;
 import cn.cslg.report.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.report.common.utils.StringUtils;
-import cn.cslg.report.entity.ReportField;
-import cn.cslg.report.entity.ReportFieldPatentLink;
-import cn.cslg.report.entity.ReportFieldText;
+import cn.cslg.report.entity.*;
 import cn.cslg.report.mapper.ReportFieldPatentLinkMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -15,6 +14,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -36,6 +36,8 @@ public class ReportFieldPatentLinkService extends ServiceImpl<ReportFieldPatentL
     private final ReportFieldTreeService projectFieldTreeService;
     private final ReportFieldService reportFieldService;
     private final LoginUtils loginUtils;
+    private final ReportFieldOptionService reportFieldOptionService;
+    private final ReportFieldTreeService reportFieldTreeService;
 
     public List<ReportFieldPatentLink> getProjectPatentLinkByPatentAndProId(String patentNo, Integer projectId) {
         LambdaQueryWrapper<ReportFieldPatentLink> queryWrapper = new LambdaQueryWrapper<>();
@@ -92,32 +94,7 @@ public class ReportFieldPatentLinkService extends ServiceImpl<ReportFieldPatentL
         return this.list(queryWrapper);
     }
 
-//    public void updatereportFieldPatentLink(ProjectImportPatentVO params, Integer patentId) {
-//        if (params.getFieldList() != null && params.getFieldList().size() != 0) {
-//            List<ReportFieldPatentLink> tempList = this.getProjectPatentLinkByPatentAndProId(patentId, params.getProjectId());
-//            List<ReportFieldPatentLink> dataList = new ArrayList<>();
-//            params.getFieldList().forEach(item -> {
-//                ReportFieldPatentLink reportFieldPatentLink = new ReportFieldPatentLink();
-//                reportFieldPatentLink.setPatentId(patentId);
-//                reportFieldPatentLink.setProjectId(params.getProjectId());
-//                reportFieldPatentLink.setType(item.getType());
-//                reportFieldPatentLink.setFieldId(item.getFieldId());
-//                reportFieldPatentLink.setCreateBy(0);
-//                if (item.getType() == 0 || item.getType() == 1 || item.getType() == 2) {
-//                    reportFieldPatentLink.setOptionId(reportFieldTextService.add(item.getFieldId(), item.getText()));
-//                } else {
-//                    reportFieldPatentLink.setOptionId(item.getOptionId());
-//                }
-//                long count = tempList.stream().filter(temp -> temp.getPatentId().equals(patentId) && temp.getFieldId().equals(ReportFieldPatentLink.getFieldId()) && temp.getOptionId().equals(reportFieldPatentLink.getOptionId())).count();
-//                if (count == 0) {
-//                    dataList.add(reportFieldPatentLink);
-//                }
-//            });
-//            if (dataList.size() != 0) {
-//                this.saveOrUpdateBatch(dataList);
-//            }
-//        }
-//    }
+
 
     public void deleteByFieldId(Integer fieldId) {
         this.remove(Wrappers.<ReportFieldPatentLink>lambdaQuery().eq(ReportFieldPatentLink::getFieldId, fieldId));
@@ -133,9 +110,6 @@ public class ReportFieldPatentLinkService extends ServiceImpl<ReportFieldPatentL
         }
     }
 
-//    public void deleteByPatentIdAndProjectIdAndFieldId(Integer patentId, Integer projectId, Integer fieldId) {
-//        this.remove(Wrappers.<ReportFieldPatentLink>lambdaQuery().eq(ReportFieldPatentLink::getFieldId, fieldId).eq(ReportFieldPatentLink::getReportId, projectId).eq(ReportFieldPatentLink::getPatentId, patentId));
-//    }
 
     public void deleteByPatentIdsAndProjectIdAndFieldId(List<Integer> patentNos, Integer projectId, Integer fieldId) {
         LambdaQueryWrapper<ReportFieldPatentLink> queryWrapper = new LambdaQueryWrapper<>();
@@ -144,191 +118,117 @@ public class ReportFieldPatentLinkService extends ServiceImpl<ReportFieldPatentL
         queryWrapper.eq(ReportFieldPatentLink::getFieldId, fieldId);
         this.remove(queryWrapper);
     }
+    public void delete(Integer patentId, String patentNo, Integer fieldId) {
+        LambdaQueryWrapper<ReportFieldPatentLink> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ReportFieldPatentLink::getPatentNo, patentNo)
+                .eq(ReportFieldPatentLink::getReportId, patentId)
+                .eq(ReportFieldPatentLink::getFieldId, fieldId);
+        this.remove(queryWrapper);
+
+
+
+    }
+    public List<LabelDTO> getPatentIndexSetting(PatentIndexSettingVO params) throws IOException {
+        List<ReportFieldPatentLink> projectFieldPatentLinkList = this.getProjectPatentLinkByPatentAndProjectIdAndFieldId(params.getPatentNo(), params.getReportId(), params.getFieldId());
+        List<Integer> optionIds = projectFieldPatentLinkList.stream().map(ReportFieldPatentLink::getOptionId).collect(Collectors.toList());
+        List<LabelDTO> mapList = new ArrayList<>();
+        switch (params.getType()) {
+            case 0:
+            case 1:
+            case 2:
+                List<ReportFieldText> projectFieldTextList = reportFieldTextService.getProjectFieldTextByIds(optionIds);
+                for (ReportFieldText projectFieldText : projectFieldTextList) {
+                    LabelDTO map = new LabelDTO();
+                    map.setValue(projectFieldText.getId());
+                    map.setLabel(projectFieldText.getText());
+                    mapList.add(map);
+                }
+                break;
+            case 3:
+            case 4:
+            case 5:
+                List<ReportFieldOption> projectFieldOptionList = reportFieldOptionService.getFieldOptionListByIds(optionIds);
+                for (ReportFieldOption projectFieldOption : projectFieldOptionList) {
+                    LabelDTO map = new LabelDTO();
+                    map.setValue(projectFieldOption.getId());
+                    map.setLabel(projectFieldOption.getName());
+                    mapList.add(map);
+                }
+                break;
+            case 6:
+                List<ReportFieldTree> projectFieldTreeList = reportFieldTreeService.getProjectFieldTreeOptionByIds(optionIds);
+                for (ReportFieldTree projectFieldTree : projectFieldTreeList) {
+                    LabelDTO map = new LabelDTO();
+                    map.setValue(projectFieldTree.getId());
+                    map.setLabel(projectFieldTree.getName());
+                    mapList.add(map);
+                }
+                break;
+        }
+        return mapList;
+    }
+    @Transactional(rollbackFor = Exception.class)
+    public void updatePatentIndexSetting(PatentIndexSettingVO params) {
+        this.delete(params.getReportId(), params.getPatentNo(), params.getFieldId());
+        List<Integer> optionIds = params.getSelected().stream().map(LabelDTO::getValue).distinct().collect(Collectors.toList());
+        List<String> texts = params.getSelected().stream().map(LabelDTO::getLabel).distinct().collect(Collectors.toList());
+        List<ReportFieldPatentLink> projectFieldPatentLinkList = new ArrayList<>();
+        switch (params.getType()) {
+            case 0:
+            case 1:
+            case 2:
+                List<ReportFieldText> tempList = reportFieldTextService.getProjectFieldTextByFieldId(params.getFieldId());
+                for (String text : texts) {
+                    if (StringUtils.isEmpty(text)) {
+                        continue;
+                    }
+                    ReportFieldText reportFieldText = tempList.stream().filter(item -> item.getText().equals(text)).findFirst().orElse(null);
+                    if (reportFieldText == null) {
+                        reportFieldText = new ReportFieldText();
+                        reportFieldText.setFieldId(params.getFieldId());
+                        reportFieldText.setText(text);
+                        reportFieldText.insert();
+                    }
+                    ReportFieldPatentLink projectFieldPatentLink = new ReportFieldPatentLink();
+                    projectFieldPatentLink.setPatentNo(params.getPatentNo());
+                    projectFieldPatentLink.setReportId(params.getReportId());
+                    projectFieldPatentLink.setType(params.getType());
+                    projectFieldPatentLink.setFieldId(params.getFieldId());
+                    projectFieldPatentLink.setCreateBy(loginUtils.getId());
+                    projectFieldPatentLink.setOptionId(reportFieldText.getId());
+                    projectFieldPatentLinkList.add(projectFieldPatentLink);
+                }
+                break;
+            case 3:
+            case 4:
+            case 5:
+            case 6:
+                for (Integer optionId : optionIds) {
+                    ReportFieldPatentLink projectFieldPatentLink = new ReportFieldPatentLink();
+                    projectFieldPatentLink.setPatentNo(params.getPatentNo());
+                    projectFieldPatentLink.setReportId(params.getReportId());
+                    projectFieldPatentLink.setType(params.getType());
+                    projectFieldPatentLink.setFieldId(params.getFieldId());
+                    projectFieldPatentLink.setCreateBy(loginUtils.getId());
+                    projectFieldPatentLink.setOptionId(optionId);
+                    projectFieldPatentLinkList.add(projectFieldPatentLink);
+                }
+                break;
+        }
+        if (projectFieldPatentLinkList.size() != 0) {
+            this.saveOrUpdateBatch(projectFieldPatentLinkList);
+        }
+
+    }
+    public List<ReportFieldPatentLink> get(int id) throws IOException{
+        LambdaQueryWrapper<ReportFieldPatentLink> linkLambdaQueryWrapper=new LambdaQueryWrapper<>();
+        linkLambdaQueryWrapper.eq(ReportFieldPatentLink::getReportId,id);
+        return this.list(linkLambdaQueryWrapper);
+    }
+
 
-//    @Transactional
-//    public void patentBatchIndex(PatentBatchIndexVO params) {
-//        List<ReportFieldPatentLink> tempList;
-//        List<ReportField> fieldList = params.getFieldList().stream().filter(ReportField::getEnabled).collect(Collectors.toList());
-//        List<ReportFieldPatentLink> reportFieldPatentLinkList = new ArrayList<>();
-//        for (ReportField field : fieldList) {
-//            switch (field.getType()) {
-//                case 0:
-//                case 1:
-//                case 2:
-//                    this.deleteByPatentIdsAndProjectIdAndFieldId(params.getPatentIds(), params.getProjectId(), field.getId());
-//                    tempList = this.getProjectPatentLinkByPatentIdsAndProjectId(params.getPatentIds(), params.getProjectId());
-//                    tempList = tempList.stream().filter(item -> fieldList.stream().map(ReportField::getId).collect(Collectors.toList()).contains(item.getFieldId())).collect(Collectors.toList());
-//                    ReportFieldText projectFieldText = reportFieldTextService.getReportFieldTextByNameAndFieldId(field.getText(), field.getId());
-//                    if (projectFieldText == null) {
-//                        projectFieldText = new ReportFieldText();
-//                        projectFieldText.setText(field.getText());
-//                        projectFieldText.setFieldId(field.getId());
-//                        projectFieldText.insert();
-//                    }
-//                    reportFieldPatentLinkList.addAll(this.setPatentBatchIndexDataList(tempList, params.getPatentIds(), field, projectFieldText.getId(), params.getProjectId()));
-//                    break;
-//                case 3:
-//                case 4:
-//                    this.deleteByPatentIdsAndProjectIdAndFieldId(params.getPatentIds(), params.getProjectId(), field.getId());
-//                case 5:
-//                case 6:
-//                    tempList = this.getProjectPatentLinkByPatentIdsAndProjectId(params.getPatentIds(), params.getProjectId());
-//                    tempList = tempList.stream().filter(item -> fieldList.stream().map(ReportField::getId).collect(Collectors.toList()).contains(item.getFieldId())).collect(Collectors.toList());
-//                    for (Integer optionId : field.getSelected()) {
-//                        reportFieldPatentLinkList.addAll(this.setPatentBatchIndexDataList(tempList, params.getPatentIds(), field, optionId, params.getProjectId()));
-//                    }
-//                    break;
-//            }
-//        }
-//        if (reportFieldPatentLinkList.size() != 0) {
-//            this.saveOrUpdateBatch(reportFieldPatentLinkList);
-//        }
-//    }
-//    private List<ReportFieldPatentLink> setPatentBatchIndexDataList(List<ReportFieldPatentLink> tempList, List<String> patentNos, ReportField field, Integer optionId, Integer projectId) {
-//        List<ReportFieldPatentLink> dataList = new ArrayList<>();
-//        for (Integer patentId : patentIds) {
-//            ReportFieldPatentLink temp = tempList.stream().filter(item -> item.getFieldId().equals(field.getId()) && item.getOptionId().equals(optionId) && item.getPatentNo().equals(patentId)).findFirst().orElse(null);
-//            if (temp == null) {
-//                ReportFieldPatentLink reportFieldPatentLink = new ReportFieldPatentLink();
-//                reportFieldPatentLink.setFieldId(field.getId());
-//                reportFieldPatentLink.setReportId(projectId);
-//                reportFieldPatentLink.setType(field.getType());
-//                reportFieldPatentLink.setCreateBy(loginUtils.getId());
-//                reportFieldPatentLink.setOptionId(optionId);
-//                reportFieldPatentLink.setPatentNo(patentNos);
-//                dataList.add(reportFieldPatentLink);
-//            }
-//        }
-//        return dataList;
-//    }
 
-//    public List<CustomFieldLabelDTO> getPatentIndexSetting2(Integer patentId, Integer projectId) {
-//        List<CustomFieldLabelDTO> dataList = new ArrayList<>();
-//        List<ReportField> projectFieldList = projectFieldService.getReportFieldByProjectId(projectId);
-//        for (ReportField projectField : projectFieldList) {
-//            PatentIndexSettingVO params = new PatentIndexSettingVO();
-//            CustomFieldLabelDTO data = new CustomFieldLabelDTO();
-//            params.setId(patentId);
-//            params.setType(projectField.getType());
-//            params.setFieldId(projectField.getId());
-//            params.setProjectId(projectId);
-//            data.setName(projectField.getName());
-//            data.setId(projectField.getId());
-//            data.setType(projectField.getType());
-//            data.setSelected(this.getPatentIndexSetting(params));
-//            dataList.add(data);
-//        }
-//        return dataList;
-//    }
 
-//    public List<LabelDTO> getPatentIndexSetting(PatentIndexSettingVO params) {
-//        List<ReportFieldPatentLink> reportFieldPatentLinkList = this.getProjectPatentLinkByPatentAndProjectIdAndFieldId(params.getId(), params.getProjectId(), params.getFieldId());
-//        List<Integer> optionIds = reportFieldPatentLinkList.stream().map(ReportFieldPatentLink::getOptionId).collect(Collectors.toList());
-//        List<LabelDTO> mapList = new ArrayList<>();
-//        switch (params.getType()) {
-//            case 0:
-//            case 1:
-//            case 2:
-//                List<ReportFieldText> projectFieldTextList = reportFieldTextService.getReportFieldTextByIds(optionIds);
-//                for (ReportFieldText projectFieldText : projectFieldTextList) {
-//                    LabelDTO map = new LabelDTO();
-//                    map.setValue(projectFieldText.getId());
-//                    map.setLabel(projectFieldText.getText());
-//                    mapList.add(map);
-//                }
-//                break;
-//            case 3:
-//            case 4:
-//            case 5:
-//                List<ReportFieldOption> projectFieldOptionList = projectFieldOptionService.getFieldOptionListByIds(optionIds);
-//                for (ReportFieldOption projectFieldOption : projectFieldOptionList) {
-//                    LabelDTO map = new LabelDTO();
-//                    map.setValue(projectFieldOption.getId());
-//                    map.setLabel(projectFieldOption.getName());
-//                    mapList.add(map);
-//                }
-//                break;
-//            case 6:
-//                List<ReportFieldTree> projectFieldTreeList = projectFieldTreeService.getReportFieldTreeOptionByIds(optionIds);
-//                for (ReportFieldTree projectFieldTree : projectFieldTreeList) {
-//                    LabelDTO map = new LabelDTO();
-//                    map.setValue(projectFieldTree.getId());
-//                    map.setLabel(projectFieldTree.getName());
-//                    mapList.add(map);
-//                }
-//                break;
-//        }
-//        return mapList;
-//    }
 
-//    @Transactional
-//    public void updatePatentIndexSetting(PatentIndexSettingVO params) {
-//        this.deleteByPatentIdAndProjectIdAndFieldId(params.getId(), params.getProjectId(), params.getFieldId());
-//        List<Integer> optionIds = params.getSelected().stream().map(LabelDTO::getValue).distinct().collect(Collectors.toList());
-//        List<String> texts = params.getSelected().stream().map(LabelDTO::getLabel).distinct().collect(Collectors.toList());
-//        List<ReportFieldPatentLink> reportFieldPatentLinkList = new ArrayList<>();
-//        switch (params.getType()) {
-//            case 0:
-//            case 1:
-//            case 2:
-//                List<ReportFieldText> tempList = reportFieldTextService.getReportFieldTextByFieldId(params.getFieldId());
-//                for (String text : texts) {
-//                    if (StringUtils.isEmpty(text)) {
-//                        continue;
-//                    }
-//                    ReportFieldText projectFieldText = tempList.stream().filter(item -> item.getText().equals(text)).findFirst().orElse(null);
-//                    if (projectFieldText == null) {
-//                        projectFieldText = new ReportFieldText();
-//                        projectFieldText.setFieldId(params.getFieldId());
-//                        projectFieldText.setText(text);
-//                        projectFieldText.insert();
-//                    }
-//                    ReportFieldPatentLink reportFieldPatentLink = new ReportFieldPatentLink();
-//                    reportFieldPatentLink.setProjectId(params.getProjectId());
-//                    reportFieldPatentLink.setPatentId(params.getId());
-//                    reportFieldPatentLink.setType(params.getType());
-//                    reportFieldPatentLink.setFieldId(params.getFieldId());
-//                    reportFieldPatentLink.setCreateBy(loginUtils.getId());
-//                    reportFieldPatentLink.setOptionId(projectFieldText.getId());
-//                    reportFieldPatentLinkList.add(reportFieldPatentLink);
-//                }
-//                break;
-//            case 3:
-//            case 4:
-//            case 5:
-//            case 6:
-//                for (Integer optionId : optionIds) {
-//                    ReportFieldPatentLink reportFieldPatentLink = new ReportFieldPatentLink();
-//                    reportFieldPatentLink.setProjectId(params.getProjectId());
-//                    reportFieldPatentLink.setPatentId(params.getId());
-//                    reportFieldPatentLink.setType(params.getType());
-//                    reportFieldPatentLink.setFieldId(params.getFieldId());
-//                    reportFieldPatentLink.setCreateBy(loginUtils.getId());
-//                    reportFieldPatentLink.setOptionId(optionId);
-//                    reportFieldPatentLinkList.add(reportFieldPatentLink);
-//                }
-//                break;
-//        }
-//        if (reportFieldPatentLinkList.size() != 0) {
-//            this.saveOrUpdateBatch(reportFieldPatentLinkList);
-//        }
-//    }
 
-//    public void importreportFieldPatentLink(List<Patent> importPatentList, List<Patent> localPatentList, List<ReportFieldPatentLink> importProjectPatentLinkList, Integer projectId, Integer userId, Integer importReportFieldId, Integer importReportFieldOptionId, Integer localReportFieldId, Integer localReportFieldOptionId) {
-//        List<ReportFieldPatentLink> importreportFieldPatentLinkList = importProjectPatentLinkList.stream().filter(item -> item.getFieldId().equals(importReportFieldId) && item.getOptionId().equals(importReportFieldOptionId)).collect(Collectors.toList());
-//        for (ReportFieldPatentLink reportFieldPatentLink : importreportFieldPatentLinkList) {
-//            Patent importPatent = importPatentList.stream().filter(item -> item.getId().equals(reportFieldPatentLink.getPatentId())).findFirst().orElse(new Patent());
-//            Patent localPatent = localPatentList.stream().filter(item -> item.getPatentNo().equals(importPatent.getPatentNo())).findFirst().orElse(null);
-//            if (localPatent == null) {
-//                continue;
-//            }
-//            reportFieldPatentLink.setId(null);
-//            reportFieldPatentLink.setCreateBy(userId);
-//            reportFieldPatentLink.setProjectId(projectId);
-//            reportFieldPatentLink.setPatentId(localPatent.getId());
-//            reportFieldPatentLink.setFieldId(localReportFieldId);
-//            reportFieldPatentLink.setOptionId(localReportFieldOptionId);
-//        }
-//        this.saveOrUpdateBatch(importreportFieldPatentLinkList);
-//    }
 }

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

@@ -171,6 +171,12 @@ public class ReportFieldService extends ServiceImpl<ReportFieldMapper, ReportFie
         List<ReportField> reportFields = reportFieldMapper.find(reportId,id);
         return Response.success(reportFields);
     }
+    public ReportField get(int id){
+        LambdaQueryWrapper<ReportField> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ReportField::getId,id);
+        return  this.list(queryWrapper).get(0);
+    }
+
 
     public String updateReportId(ReportField reportField){
         reportFieldMapper.updateReportId(reportField);
@@ -178,9 +184,9 @@ public class ReportFieldService extends ServiceImpl<ReportFieldMapper, ReportFie
     }
     public List<ReportField> selectAll(int id)throws IOException{
         LambdaQueryWrapper<ReportField> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(ReportField::getId,id);
-        List<ReportField> list = this.list(queryWrapper);
-        return list;
+        queryWrapper.eq(ReportField::getReportId,id);
+       return this.list(queryWrapper);
+
 
     }
 

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

@@ -42,7 +42,7 @@ public class ReportFieldTextService extends ServiceImpl<ReportFieldTextMapper, R
         return this.list(queryWrapper);
     }
 
-    public List<ReportFieldText> getProjectFieldTextByIds(List<Integer> ids) {
+    public  List<ReportFieldText> getProjectFieldTextByIds(List<Integer> ids) {
         if (ids == null || ids.size() == 0) {
             return new ArrayList<>();
         }

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

@@ -40,6 +40,17 @@ public class ReportFieldTreeService extends ServiceImpl<ReportFieldTreeMapper, R
     private final ReportFieldPatentLinkService reportFieldPatentLinkService;
     private final ReportFieldService reportFieldService;
 
+    public  List<ReportFieldTree> getProjectFieldTreeOptionByIds(List<Integer> ids) {
+        if (ids == null || ids.size() == 0) {
+            return new ArrayList<>();
+        }
+        LambdaQueryWrapper<ReportFieldTree> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(ReportFieldTree::getId, ids);
+        queryWrapper.orderByAsc(ReportFieldTree::getOrder);
+        return this.list(queryWrapper);
+
+    }
+
     public Integer getTreeNodeIdByPathNameAndUpdateTreeData(List<String> pathName, ReportField projectField) {
         List<Integer> treeNode = new ArrayList<>();
         for (int i = 0; i < pathName.size(); i++) {