自定义字段 2022/11/25

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

@@ -45,9 +45,9 @@ public class PatentFiledController {
     @GetMapping("delete")
     @Operation(summary = "删除自定义字段")
     public String delete(Integer id,Integer reportId) {
-        if(reportId!=null){
-            return reportFieldService.deleteReportId(reportId,id);
-        }
+//        if(reportId!=null){
+//            return reportFieldService.deleteReportId(reportId,id);
+//        }
         return reportFieldService.delete(id);
     }
 
@@ -60,20 +60,12 @@ public class PatentFiledController {
     @GetMapping("option/list")
     @Operation(summary = "选项列表")
     public String getList(Integer fieldId,Integer type ,Integer reportId)throws IOException {
-        if(reportId!=null){
-            if(type == 6){
-               return Response.success(reportFieldTreeService.get(fieldId,reportId));
-            }else {
-                return Response.success(reportFieldService.getReportField(reportId, fieldId));
-            }
-
-        }else {
             if (type == 6) {
                 return Response.success(reportFieldTreeService.getReportFieldTreeNodeByFieldId(fieldId));
             } else {
                 return Response.success(reportFieldOptionService.getListByFieldId(fieldId));
             }
-        }
+
     }
     @PostMapping("update")
     @Operation(summary = "更新选项")
@@ -84,11 +76,11 @@ public class PatentFiledController {
     @GetMapping("option/delete")
     @Operation(summary = "删除选项")
     public String delete(Integer type, Integer id,Integer reportId) {
-        if(reportId!=null){
-          return reportFieldService.deleteReportId(reportId,id);
-        }
+//        if(reportId!=null){
+//          return reportFieldService.deleteReportId(reportId,id);
+//        }
         if (type == 6) {
-            reportFieldService.delete(id);
+            reportFieldTreeService.delete(id);
         } else {
             reportFieldOptionService.delete(id);
         }

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

@@ -29,7 +29,7 @@ public class ReportFieldOption extends BaseEntity<ReportFieldOption> {
     /**
      * 多选选项名称
      */
-    @TableField("CID")
+    @TableField("NAME")
     private String name;
 
     /**
@@ -51,10 +51,10 @@ public class ReportFieldOption extends BaseEntity<ReportFieldOption> {
     private Integer parentId;
 
     /**
-     * 专题库ID
+     * 报告ID
      */
     @TableField(exist = false)
-    private Integer projectId;
+    private Integer reportId;
 
     /**
      * 类型

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

@@ -95,6 +95,7 @@ public class CompareRecordsService extends ServiceImpl<CompareRecordsMapper, Com
             List<Integer> featureId = assoRecordsFeatures1.stream().map(AssoRecordsFeature::getFeatureId).collect(Collectors.toList());
             records.setAssoRecordsFeatures(assoRecordsFeatures1);
             List<Features> featuresList = features.stream().filter(item -> featureId.contains(item.getId())).collect(Collectors.toList());
+            records.setFeaturesIdList(featureId);
             records.setFeatures(featuresList);
         }
         return Response.success(compareRecords);

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

@@ -121,7 +121,7 @@ public class ReportFieldTreeService extends ServiceImpl<ReportFieldTreeMapper, R
     }
     public List<ReportFieldTree> getReportFieldTree(Integer id,Integer reportID){
         LambdaQueryWrapper<ReportFieldTree> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(ReportFieldTree::getId,id)
+        queryWrapper.in(ReportFieldTree::getFieldId,id)
                 .in(ReportFieldTree::getReportId, reportID);
         queryWrapper.orderByAsc(ReportFieldTree::getOrder);
         return this.list(queryWrapper);
@@ -348,6 +348,7 @@ public class ReportFieldTreeService extends ServiceImpl<ReportFieldTreeMapper, R
         projectFieldTree.setOrder(projectFieldOption.getOrder());
         projectFieldTree.setParentId(projectFieldOption.getParentId());
         projectFieldTree.setName(projectFieldOption.getName());
+        projectFieldTree.setReportId(projectFieldOption.getReportId());
 //        projectFieldTree.setReportId();
         projectFieldTree.insertOrUpdate();
         this.edit(projectFieldTree);