筛选 2022/12/8

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

@@ -1,32 +1,21 @@
 package cn.cslg.report.controller;
 
 import cn.cslg.report.common.core.base.Constants;
-import cn.cslg.report.common.model.dto.PatentQueryFieldSourceDTO;
-import cn.cslg.report.common.model.vo.PatentIndexSettingVO;
+
 import cn.cslg.report.common.model.vo.PatentQueryFieldSourceVO;
 import cn.cslg.report.common.model.vo.ReportFieldVO;
 import cn.cslg.report.common.utils.Response;
-import cn.cslg.report.common.utils.StringUtils;
 import cn.cslg.report.entity.ReportField;
 import cn.cslg.report.entity.ReportFieldOption;
-import cn.cslg.report.entity.SysDictItem;
-import cn.cslg.report.service.business.CompareFilesService;
 import cn.cslg.report.service.business.ReportFieldOptionService;
 import cn.cslg.report.service.business.ReportFieldService;
 import cn.cslg.report.service.business.ReportFieldTreeService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
-
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
 
 @Tag(name = "自定义字段")
 @RestController
@@ -87,9 +76,6 @@ 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 (type == 6) {
             reportFieldTreeService.delete(id);
         } else {

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

@@ -86,6 +86,9 @@ private  final  AssoTaskPersonelService assoTaskPersonelService;
    //获得自定义字段列表
   public String getPageList(ReportFieldVO reportFieldVO){
       LambdaQueryWrapper<ReportField> queryWrapper = new LambdaQueryWrapper<>();
+      if(reportFieldVO.getReportId()!=null){
+          queryWrapper.eq(ReportField::getReportId,reportFieldVO.getReportId());
+      }
       if (reportFieldVO.getName() != null) {
           queryWrapper.like(ReportField::getName, reportFieldVO.getName());
       }
@@ -315,9 +318,8 @@ private  final  AssoTaskPersonelService assoTaskPersonelService;
         lambdaQueryWrapper.eq(ReportFieldPatentLink::getFieldId,params.getFieldId()).eq(ReportFieldPatentLink::getOptionId,params.getKey());
         List<ReportFieldPatentLink> reportFieldPatentLinks = reportFieldPatentLinkService.list(lambdaQueryWrapper);
         for(ReportFieldPatentLink reportFieldPatentLink : reportFieldPatentLinks){
-            PatentQueryFieldSourceVO patentQueryFieldSourceVO = new PatentQueryFieldSourceVO();
 
-            list.add(patentQueryFieldSourceVO.getPatentNo());
+            list.add(reportFieldPatentLink.getPatentNo());
         }
 
         return list;