xiexiang 1 éve
szülő
commit
06db972ccd

+ 15 - 0
src/main/java/cn/cslg/pas/common/dto/business/GetReferencesDTO.java

@@ -0,0 +1,15 @@
+package cn.cslg.pas.common.dto.business;
+
+import lombok.Data;
+
+/**
+ * @Author xiexiang
+ * @Date 2023/12/20
+ */
+@Data
+public class GetReferencesDTO {
+    private Integer projectId;
+    private String fileName;
+    private Integer current;
+    private Integer size;
+}

+ 2 - 2
src/main/java/cn/cslg/pas/controller/FTOController.java

@@ -43,8 +43,8 @@ public class FTOController {
 
     @Operation(summary = "查询某个任务下的某件专利的对比结果(包含拆分特征)")
     @PostMapping("/getFTOCompareRecord")
-    public Response getFTOCompareRecord(@RequestBody GetFeatureSplitDTO getFeatureSplitDTO) throws Exception {
-        TortCompareRecordVO tortCompareRecordVO = ftoCompareRecordService.getTortCompareRecord(getFeatureSplitDTO);
+    public Response getFTOCompareRecord(@RequestBody GetFeatureSplitDTO getFeatureSplitDTO) {
+        TortCompareRecordVO tortCompareRecordVO = ftoCompareRecordService.getFTOCompareRecord(getFeatureSplitDTO);
         return Response.success(tortCompareRecordVO);
     }
 

+ 4 - 3
src/main/java/cn/cslg/pas/controller/ReferencesController.java

@@ -1,6 +1,7 @@
 package cn.cslg.pas.controller;
 
 import cn.cslg.pas.common.core.base.Constants;
+import cn.cslg.pas.common.dto.business.GetReferencesDTO;
 import cn.cslg.pas.common.dto.business.ReferencesDTO;
 import cn.cslg.pas.common.dto.business.ReferencesUpdateDTO;
 import cn.cslg.pas.common.model.cronModel.Records;
@@ -44,9 +45,9 @@ public class ReferencesController {
     }
 
     @Operation(summary = "查报告文档")
-    @GetMapping("/getReferences")
-    public Response getReferences(Integer projectId, Integer current, Integer size) {
-        List<ReferencesVO> referencesVOS = referencesService.query(projectId, current, size);
+    @PostMapping("/getReferences")
+    public Response getReferences(@RequestBody GetReferencesDTO getReferencesDTO) {
+        List<ReferencesVO> referencesVOS = referencesService.query(getReferencesDTO);
         return Response.success(referencesVOS);
     }
 

+ 1 - 1
src/main/java/cn/cslg/pas/service/business/FTOCompareRecordService.java

@@ -81,7 +81,7 @@ public class FTOCompareRecordService extends ServiceImpl<FTOCompareRecordMapper,
      * @param getFeatureSplitDTO
      * @return
      */
-    public TortCompareRecordVO getTortCompareRecord(GetFeatureSplitDTO getFeatureSplitDTO) {
+    public TortCompareRecordVO getFTOCompareRecord(GetFeatureSplitDTO getFeatureSplitDTO) {
         // 判断参数不能为空
         // 分配任务id
         Integer taskId = getFeatureSplitDTO.getTaskId();

+ 10 - 4
src/main/java/cn/cslg/pas/service/business/ReferencesService.java

@@ -1,5 +1,6 @@
 package cn.cslg.pas.service.business;
 
+import cn.cslg.pas.common.dto.business.GetReferencesDTO;
 import cn.cslg.pas.common.dto.business.ReferencesDTO;
 import cn.cslg.pas.common.dto.business.ReferencesUpdateDTO;
 import cn.cslg.pas.common.model.cronModel.Personnel;
@@ -104,15 +105,20 @@ public class ReferencesService extends ServiceImpl<ReferencesMapper, References>
 
     /**
      * 查询
-     * @param projectId
-     * @param pageNum
-     * @param pageSize
+     * @param getReferencesDTO
      * @return
      */
-    public List<ReferencesVO> query(Integer projectId, int pageNum, int pageSize) {
+    public List<ReferencesVO> query(GetReferencesDTO getReferencesDTO) {
+        Integer projectId = getReferencesDTO.getProjectId();
+        String fileName = getReferencesDTO.getFileName();
+        Integer pageNum = getReferencesDTO.getCurrent();
+        Integer pageSize = getReferencesDTO.getSize();
         Page<References> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<References> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(References::getProjectId, projectId);
+        if (fileName != null && !fileName.equals("")) {
+            queryWrapper.like(References::getReferencesName, fileName);
+        }
         IPage<References> referencesPage = this.page(page, queryWrapper);
         List<References> references = referencesPage.getRecords();
         List<ReferencesVO> referencesVOS = this.loadReferencesVO(references);