Merge remote-tracking branch 'origin/master_novelty' into master_novelty

src/main/java/cn/cslg/pas/common/dto/NoveltyProjectDTO/NoveltyReportReferenceQueryDTO.java

@@ -11,7 +11,7 @@ public class NoveltyReportReferenceQueryDTO {
     private String fileName;
     private Integer current;
     private Integer size;
-
+    private Integer id;
 
 
 }

src/main/java/cn/cslg/pas/common/dto/business/GetReferencesDTO.java

@@ -16,4 +16,5 @@ public class GetReferencesDTO {
     private Integer current;
     private Integer size;
     private List<OrderDTO> orderDTOList;
+    private Integer id;
 }

src/main/java/cn/cslg/pas/common/vo/CompareLiteratureVO.java

@@ -122,5 +122,5 @@ public class CompareLiteratureVO  {
      */
     private String beneficialEffect;
     //标注
-    private NoveltyCompareRecordVO noveltyCompareRecordVO;
+    private List<NoveltyCompareRecordVO> noveltyCompareRecordVOS;
 }

src/main/java/cn/cslg/pas/common/vo/NoveltyProjectVO/NoveltyReferencesVO.java

@@ -64,4 +64,5 @@ public class NoveltyReferencesVO {
     private Boolean ifHaveFinalFile;
 
     private String configMessage;
+    private Integer templateId;
 }

src/main/java/cn/cslg/pas/controller/NoveltyProjectController.java

@@ -192,7 +192,7 @@ public class NoveltyProjectController {
     @Operation(summary = "查询查新检索报告模板")
     @PostMapping("/queryTemplate")
     public Response queryTemplate(@RequestBody QueryTemplateDTO queryTemplateDTO) throws IOException {
-        Records records = noveltyReportTemplateService.queryTemplate(queryTemplateDTO);
+         Records records = noveltyReportTemplateService.queryTemplate(queryTemplateDTO);
         return Response.success(records);
     }
 

src/main/java/cn/cslg/pas/service/business/CompareLiteratureService.java

@@ -237,50 +237,25 @@ public class CompareLiteratureService extends ServiceImpl<CompareLiteratureMappe
                     literatureVO.setExcuteCase(noveltyCompareLiterature.getExcuteCase());
                     literatureVO.setBeneficialEffect(noveltyCompareLiterature.getBeneficialEffect());
                 }
-                if (CollectionUtils.isEmpty(recordVOS)) {
-                    NoveltyCompareRecordVO recordVO = recordVOS.stream().filter(i -> i.getPatentNo().equals(literatureVO.getLiteratureNo())).findFirst().orElse(new NoveltyCompareRecordVO());
-                    literatureVO.setNoveltyCompareRecordVO(recordVO);
+                if (!CollectionUtils.isEmpty(recordVOS)) {
+                    List<NoveltyCompareRecordVO> collect = recordVOS.stream().filter(i -> i.getPatentNo().equals(literatureVO.getLiteratureNo())).collect(Collectors.toList());
+                    if (CollectionUtils.isEmpty(collect)) {
+                        collect = new ArrayList<>();
+                    }
+                    literatureVO.setNoveltyCompareRecordVOS(collect);
                 }
             }
         }
     }
 
     public List<CompareLiteratureVO> loadCompareLiterature(List<CompareLiterature> compareLiteratures, ReportProject reportProject) {
-        String signPatentNo = reportProject.getSignPatentNo();
-
-        //查询标的专利号
         List<CompareLiteratureVO> compareLiteratureVOS = new ArrayList<>();
-
-        //非专利文献列表
-        List<String> guids = compareLiteratures.stream().filter(item -> item.getType().equals(1)).map(CompareLiterature::getLiteratureNo).collect(Collectors.toList());
-
-        //专利文献列表
-        List<String> patentNos = compareLiteratures.stream().filter(item -> item.getType().equals(0)).map(CompareLiterature::getLiteratureNo).collect(Collectors.toList());
-        List<Patent> patentList = new ArrayList<>();
-
-        if (reportProject.getSignPatentNo() != null) {
-            patentNos.add(reportProject.getSignPatentNo());
-        }
-
-        if (patentNos.size() > 0) {
-            try {
-                patentList = esPatentService.getPatentsByNo(patentNos, false, null, null);
-            } catch (Exception e) {
-                throw new XiaoShiException("装载文献信息失败");
-            }
-        }
-
-        //获得标的专利信息
-        Patent signPatent = patentList.stream()
-                .filter(item -> signPatentNo.equals(item.getAppNo())
-                        || signPatentNo.equals(item.getPublicNo()) ||
-                        signPatentNo.equals(item.getGrantNo())).findFirst().orElse(null);
-
         //查询文件
         List<SystemFile> systemFiles = new ArrayList<>();
-
+        //非专利文献列表
+        List<String> guids = compareLiteratures.stream().filter(item -> item.getType().equals(1)).map(CompareLiterature::getLiteratureNo).collect(Collectors.toList());
         //查询文件
-        if (guids.size() != 0) {
+        if (!CollectionUtils.isEmpty(guids)) {
             try {
                 String res = fileManagerService.getSystemFileFromFMS(guids);
                 if (res != null && !res.trim().equals("")) {
@@ -290,82 +265,131 @@ public class CompareLiteratureService extends ServiceImpl<CompareLiteratureMappe
                 throw new XiaoShiException("装载错误");
             }
         }
-        for (CompareLiterature compareLiterature : compareLiteratures) {
-            Integer id = compareLiterature.getId();
-            String literatureNo = compareLiterature.getLiteratureNo();
-            Date publicDate = compareLiterature.getPublicDate();
-            CompareLiteratureVO compareLiteratureVO = new CompareLiteratureVO();
-            BeanUtils.copyProperties(compareLiterature, compareLiteratureVO);
-            //当为专利文献时
-            if (compareLiterature.getType().equals(0)) {
-                compareLiteratureVO.setFitType(0);
-                if (patentList.size() > 0) {
-                    Patent patent = patentList.stream()
-                            .filter(item -> literatureNo.equals(item.getAppNo())
-                                    || literatureNo.equals(item.getPublicNo()) ||
-                                    literatureNo.equals(item.getGrantNo())).findFirst().orElse(null);
-                    if (patent != null) {
-                        compareLiteratureVO.setAppNo(patent.getAppNo());
-                        compareLiteratureVO.setAppDate(patent.getAppDate());
-                        if (patent.getPublicNo() == null) {
-                            compareLiteratureVO.setPublicDate(patent.getGrantDate());
-                            compareLiteratureVO.setPublicNo(patent.getGrantNo());
-                        } else {
-                            compareLiteratureVO.setPublicDate(patent.getPublicDate());
-                            compareLiteratureVO.setPublicNo(patent.getPublicNo());
-                        }
-                        compareLiteratureVO.setGrantDate(patent.getGrantDate());
-                        compareLiteratureVO.setGrantNo(patent.getGrantNo());
-                        compareLiteratureVO.setApplicant(patent.getApplicant());
-                        //比较标的专利的申请日和对比专利的公开或者公告日
-                        if (signPatent.getAppDate() != null) {
-                            //当专利的申请日存在时
-                            if (patent.getAppDate() != null) {
-                                if (signPatent.getAppDate().compareTo(patent.getAppDate()) <= 0) {
-                                    compareLiteratureVO.setFitType(0);
-                                } else if (patent.getPublicDate() != null) {
-                                    if (signPatent.getAppDate().compareTo(patent.getPublicDate()) <= 0)
-                                        compareLiteratureVO.setFitType(1);
-                                    else if (signPatent.getAppDate().compareTo(patent.getPublicDate()) > 0) {
-                                        compareLiteratureVO.setFitType(2);
-                                    }
-                                } else if (patent.getGrantDate() != null) {
-                                    if (signPatent.getAppDate().compareTo(patent.getGrantDate()) <= 0)
-                                        compareLiteratureVO.setFitType(1);
-                                    else if (signPatent.getAppDate().compareTo(patent.getGrantDate()) > 0) {
-                                        compareLiteratureVO.setFitType(2);
+        if (!ObjectUtils.isEmpty(reportProject)) {
+            //查询标的专利号
+            String signPatentNo = reportProject.getSignPatentNo();
+
+            //专利文献列表
+            List<String> patentNos = compareLiteratures.stream().filter(item -> item.getType().equals(0)).map(CompareLiterature::getLiteratureNo).collect(Collectors.toList());
+            List<Patent> patentList = new ArrayList<>();
+
+            if (reportProject.getSignPatentNo() != null) {
+                patentNos.add(reportProject.getSignPatentNo());
+            }
+
+            if (patentNos.size() > 0) {
+                try {
+                    patentList = esPatentService.getPatentsByNo(patentNos, false, null, null);
+                } catch (Exception e) {
+                    throw new XiaoShiException("装载文献信息失败");
+                }
+            }
+
+            //获得标的专利信息
+            Patent signPatent = patentList.stream()
+                    .filter(item -> signPatentNo.equals(item.getAppNo())
+                            || signPatentNo.equals(item.getPublicNo()) ||
+                            signPatentNo.equals(item.getGrantNo())).findFirst().orElse(null);
+
+            for (CompareLiterature compareLiterature : compareLiteratures) {
+                String literatureNo = compareLiterature.getLiteratureNo();
+                Date publicDate = compareLiterature.getPublicDate();
+                CompareLiteratureVO compareLiteratureVO = new CompareLiteratureVO();
+                BeanUtils.copyProperties(compareLiterature, compareLiteratureVO);
+                //当为专利文献时
+                if (compareLiterature.getType().equals(0)) {
+                    compareLiteratureVO.setFitType(0);
+                    if (patentList.size() > 0) {
+                        Patent patent = patentList.stream()
+                                .filter(item -> literatureNo.equals(item.getAppNo())
+                                        || literatureNo.equals(item.getPublicNo()) ||
+                                        literatureNo.equals(item.getGrantNo())).findFirst().orElse(null);
+                        if (patent != null) {
+                            compareLiteratureVO.setAppNo(patent.getAppNo());
+                            compareLiteratureVO.setAppDate(patent.getAppDate());
+                            if (patent.getPublicNo() == null) {
+                                compareLiteratureVO.setPublicDate(patent.getGrantDate());
+                                compareLiteratureVO.setPublicNo(patent.getGrantNo());
+                            } else {
+                                compareLiteratureVO.setPublicDate(patent.getPublicDate());
+                                compareLiteratureVO.setPublicNo(patent.getPublicNo());
+                            }
+                            compareLiteratureVO.setGrantDate(patent.getGrantDate());
+                            compareLiteratureVO.setGrantNo(patent.getGrantNo());
+                            compareLiteratureVO.setApplicant(patent.getApplicant());
+                            //比较标的专利的申请日和对比专利的公开或者公告日
+                            if (signPatent.getAppDate() != null) {
+                                //当专利的申请日存在时
+                                if (patent.getAppDate() != null) {
+                                    if (signPatent.getAppDate().compareTo(patent.getAppDate()) <= 0) {
+                                        compareLiteratureVO.setFitType(0);
+                                    } else if (patent.getPublicDate() != null) {
+                                        if (signPatent.getAppDate().compareTo(patent.getPublicDate()) <= 0)
+                                            compareLiteratureVO.setFitType(1);
+                                        else if (signPatent.getAppDate().compareTo(patent.getPublicDate()) > 0) {
+                                            compareLiteratureVO.setFitType(2);
+                                        }
+                                    } else if (patent.getGrantDate() != null) {
+                                        if (signPatent.getAppDate().compareTo(patent.getGrantDate()) <= 0)
+                                            compareLiteratureVO.setFitType(1);
+                                        else if (signPatent.getAppDate().compareTo(patent.getGrantDate()) > 0) {
+                                            compareLiteratureVO.setFitType(2);
+                                        }
                                     }
                                 }
-                            }
 
+                            }
                         }
                     }
+
                 }
+                //非专利文献
+                else {
+                    if (signPatent.getAppDate() != null) {
+                        if (publicDate != null) {
+                            if (signPatent.getAppDate().compareTo(publicDate) <= 0) {
+                                compareLiteratureVO.setFitType(0);
+                            } else {
+                                compareLiteratureVO.setFitType(2);
+                            }
+                        }
+                    }
 
-            }
-            //非专利文献
-            else {
-                if (signPatent.getAppDate() != null) {
-                    if (publicDate != null) {
-                        if (signPatent.getAppDate().compareTo(publicDate) <= 0) {
-                            compareLiteratureVO.setFitType(0);
-                        } else {
-                            compareLiteratureVO.setFitType(2);
+                    //装载文件
+                    if (literatureNo != null && systemFiles != null && systemFiles.size() != 0) {
+                        SystemFile systemFile = systemFiles.stream().filter(item -> item.getGuid().equals(literatureNo)).findFirst().orElse(null);
+                        if (systemFile != null) {
+                            compareLiteratureVO.setSystemFile(systemFile);
                         }
                     }
                 }
-
-                //装载文件
-                if (literatureNo != null && systemFiles != null && systemFiles.size() != 0) {
-                    SystemFile systemFile = systemFiles.stream().filter(item -> item.getGuid().equals(literatureNo)).findFirst().orElse(null);
-                    if (systemFile != null) {
-                        compareLiteratureVO.setSystemFile(systemFile);
+                compareLiteratureVOS.add(compareLiteratureVO);
+            }
+        } else {
+            for (CompareLiterature compareLiterature : compareLiteratures) {
+                String literatureNo = compareLiterature.getLiteratureNo();
+                CompareLiteratureVO compareLiteratureVO = new CompareLiteratureVO();
+                BeanUtils.copyProperties(compareLiterature, compareLiteratureVO);
+                //当为专利文献时
+                if (compareLiterature.getType().equals(0)) {
+                    compareLiteratureVO.setFitType(0);
+                }
+                //非专利文献
+                else {
+                    compareLiteratureVO.setFitType(2);
+                    //装载文件
+                    if (literatureNo != null && !CollectionUtils.isEmpty(systemFiles)) {
+                        SystemFile systemFile = systemFiles.stream().filter(item -> item.getGuid().equals(literatureNo)).findFirst().orElse(null);
+                        if (systemFile != null) {
+                            compareLiteratureVO.setSystemFile(systemFile);
+                        }
                     }
                 }
+                compareLiteratureVOS.add(compareLiteratureVO);
             }
-            compareLiteratureVOS.add(compareLiteratureVO);
         }
 
+
         return compareLiteratureVOS;
     }
 

src/main/java/cn/cslg/pas/service/business/NoveltyProjectService.java

@@ -71,12 +71,13 @@ public class NoveltyProjectService extends ServiceImpl<NoveltyProjectMapper, Nov
     @Autowired
     private TechnicalCaseMapper technicalCaseMapper;
 
-@Autowired
-private NoveltySearchRecordService noveltySearchRecordService;
-@Autowired
-private NoveltyCompareRecordService noveltyCompareRecordService;
-@Autowired
-private NoveltyCompareLiteratureService noveltyCompareLiteratureService;
+    @Autowired
+    private NoveltySearchRecordService noveltySearchRecordService;
+    @Autowired
+    private NoveltyCompareRecordService noveltyCompareRecordService;
+    @Autowired
+    private NoveltyCompareLiteratureService noveltyCompareLiteratureService;
+
     public Records queryNoveltyProject(QueryNoveltyProjectDTO vo) throws IOException {
         //查询数据库
         List<QueryNoveltyProjectVO> noveltyProjectVOS = noveltyProjectMapper.queryNoveltyProject(vo);
@@ -317,6 +318,9 @@ private NoveltyCompareLiteratureService noveltyCompareLiteratureService;
     }
 
     public void deleteNoveltyProject(NoveltyProjectIdDTO vo) {
+        if (vo.getProjectId() == null) {
+            throw new XiaoShiException("参数不得为空");
+        }
         //删除关联的查新详情
         this.remove(new LambdaQueryWrapper<NoveltyProject>().eq(NoveltyProject::getProjectId, vo.getProjectId()));
         //查询技术方案
@@ -336,16 +340,17 @@ private NoveltyCompareLiteratureService noveltyCompareLiteratureService;
         //删除本身报告
         projectMapper.deleteById(vo.getProjectId());
     }
-    public void copyNoveltyProject(NoveltyProjectCopyDTO noveltyProjectCopyDTO) throws Exception{
-      Integer fromProjectId =noveltyProjectCopyDTO.getFromProjectId();
-      Integer toProjectId =noveltyProjectCopyDTO.getToProjectId();
-       List<String> compareRecordIds =      noveltyProjectCopyDTO.getCompareRecordIds();
-       List<Integer>  searchRecordIds =noveltyProjectCopyDTO.getSearchRecordIds();
-        List<Integer>   compareLiteratureIds =noveltyProjectCopyDTO.getCompareLiteratureIds();
-
-        noveltySearchRecordService.copySearchRecord(searchRecordIds,toProjectId);
-        noveltyCompareLiteratureService.copyCompareFile(compareLiteratureIds,toProjectId,fromProjectId);
-        noveltyCompareRecordService.copyCompareRecord(compareRecordIds,toProjectId,fromProjectId);
+
+    public void copyNoveltyProject(NoveltyProjectCopyDTO noveltyProjectCopyDTO) throws Exception {
+        Integer fromProjectId = noveltyProjectCopyDTO.getFromProjectId();
+        Integer toProjectId = noveltyProjectCopyDTO.getToProjectId();
+        List<String> compareRecordIds = noveltyProjectCopyDTO.getCompareRecordIds();
+        List<Integer> searchRecordIds = noveltyProjectCopyDTO.getSearchRecordIds();
+        List<Integer> compareLiteratureIds = noveltyProjectCopyDTO.getCompareLiteratureIds();
+
+        noveltySearchRecordService.copySearchRecord(searchRecordIds, toProjectId);
+        noveltyCompareLiteratureService.copyCompareFile(compareLiteratureIds, toProjectId, fromProjectId);
+        noveltyCompareRecordService.copyCompareRecord(compareRecordIds, toProjectId, fromProjectId);
 
     }
 }

src/main/java/cn/cslg/pas/service/business/ReferencesService.java

@@ -126,6 +126,7 @@ public class ReferencesService extends ServiceImpl<ReferencesMapper, References>
         String fileName = getReferencesDTO.getFileName();
         Integer pageNum = getReferencesDTO.getCurrent();
         Integer pageSize = getReferencesDTO.getSize();
+        Integer id=getReferencesDTO.getId();
         List<OrderDTO> orderDTOList = getReferencesDTO.getOrderDTOList();
         //分页配置
         Page<References> page = new Page<>(pageNum, pageSize);
@@ -134,6 +135,10 @@ public class ReferencesService extends ServiceImpl<ReferencesMapper, References>
         if (fileName != null && !fileName.equals("")) {
             queryWrapper.lambda().like(References::getReferencesName, fileName);
         }
+        if(id!=null){
+            queryWrapper.lambda().eq(References::getId, id);
+
+        }
         //添加排序逻辑
         if (orderDTOList != null && !orderDTOList.isEmpty() && orderDTOList.size() == 1) {
             OrderDTO orderDTO = orderDTOList.get(0);

src/main/java/cn/cslg/pas/service/business/TechnicalCaseService.java

@@ -151,21 +151,23 @@ public class TechnicalCaseService extends ServiceImpl<TechnicalCaseMapper, Techn
         TechnicalCase technicalCase = this.getOne(new LambdaQueryWrapper<TechnicalCase>()
                 .eq(TechnicalCase::getProjectId, vo.getProjectId()));
         TechnicalCaseVO technicalCaseVO = new TechnicalCaseVO();
-        BeanUtils.copyProperties(technicalCase, technicalCaseVO);
-        technicalCaseVO.setTechnicalCaseId(technicalCase.getId());
-        List<AssoTechnicalCaseFile> assoTechnicalCaseFiles = assoTechnicalCaseFileMapper.selectList(new LambdaQueryWrapper<AssoTechnicalCaseFile>()
-                .eq(AssoTechnicalCaseFile::getTechnicalCaseId, technicalCase.getId()));
-        if (!CollectionUtils.isEmpty(assoTechnicalCaseFiles)) {
-            List<String> guids = assoTechnicalCaseFiles.stream().map(AssoTechnicalCaseFile::getFileGuid).collect(Collectors.toList());
-            String res = null;
-            try {
-                res = fileManagerService.getSystemFileFromFMS(guids);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            if (StringUtils.isNotEmpty(res)) {
-                List<SystemFile> systemFiles = JSON.parseArray(res, SystemFile.class);
-                technicalCaseVO.setSystemFileList(systemFiles);
+        if (ObjectUtils.isNotEmpty(technicalCase)) {
+            BeanUtils.copyProperties(technicalCase, technicalCaseVO);
+            technicalCaseVO.setTechnicalCaseId(technicalCase.getId());
+            List<AssoTechnicalCaseFile> assoTechnicalCaseFiles = assoTechnicalCaseFileMapper.selectList(new LambdaQueryWrapper<AssoTechnicalCaseFile>()
+                    .eq(AssoTechnicalCaseFile::getTechnicalCaseId, technicalCase.getId()));
+            if (!CollectionUtils.isEmpty(assoTechnicalCaseFiles)) {
+                List<String> guids = assoTechnicalCaseFiles.stream().map(AssoTechnicalCaseFile::getFileGuid).collect(Collectors.toList());
+                String res = null;
+                try {
+                    res = fileManagerService.getSystemFileFromFMS(guids);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                if (StringUtils.isNotEmpty(res)) {
+                    List<SystemFile> systemFiles = JSON.parseArray(res, SystemFile.class);
+                    technicalCaseVO.setSystemFileList(systemFiles);
+                }
             }
         }
         return technicalCaseVO;

src/main/java/cn/cslg/pas/service/business/es/EsScratchWordsService.java

@@ -431,6 +431,7 @@ public class EsScratchWordsService {
                 Marking marking = hit.source();
                 NoveltyCompareRecordVO noveltyCompareRecordVO = new NoveltyCompareRecordVO();
                 BeanUtils.copyProperties(marking, noveltyCompareRecordVO);
+                noveltyCompareRecordVO.setMarkNoteText(marking.getMarkNoteText());
                 noveltyCompareRecordVO.setId(hit.id());
                 vos.add(noveltyCompareRecordVO);
             }

src/main/java/cn/cslg/pas/service/novelty/NoveltyReportReferencesService.java

@@ -111,6 +111,7 @@ public class NoveltyReportReferencesService extends ServiceImpl<NoveltyReportRef
                 noveltyReferencesVO.setIfHaveFinalFile(noveltyReportReference.getIfHaveFinalFile());
                 noveltyReferencesVO.setDataSource(noveltyReportReference.getDataSource());
                 noveltyReferencesVO.setConfigMessage(noveltyReportReference.getConfigMessage());
+                noveltyReferencesVO.setTemplateId(noveltyReportReference.getTemplateId());
             }
             noveltyReferencesVOS.add(noveltyReferencesVO);
 

src/main/java/cn/cslg/pas/service/novelty/NoveltyReportTemplateService.java

@@ -49,19 +49,24 @@ public class NoveltyReportTemplateService extends ServiceImpl<NoveltyReportTempl
 //    }
 
     public Records queryTemplate(QueryTemplateDTO queryTemplateDTO) throws IOException {
+        Integer temId = queryTemplateDTO.getTemplateId();
+        Long size = queryTemplateDTO.getSize();
+        Long current = queryTemplateDTO.getCurrent();
         Records records = new Records();
         Long total = null;
         List<QueryTemplateVO> queryTemplateVOS = new ArrayList<>();
         List<NoveltyReportTemplate> noveltyReportTemplates = new ArrayList<>();
-        if (queryTemplateDTO.getTemplateId() != null) {
-            NoveltyReportTemplate noveltyReportTemplate = this.getById(queryTemplateDTO.getTemplateId());
-            noveltyReportTemplates.add(noveltyReportTemplate);
-        } else {
-            LambdaQueryWrapper<NoveltyReportTemplate> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.orderByDesc(NoveltyReportTemplate::getCreateTime);
-            IPage<NoveltyReportTemplate> noveltyReportTemplatePage = this.page(new Page<>(queryTemplateDTO.getCurrent(), queryTemplateDTO.getSize()), queryWrapper);
+        LambdaQueryWrapper<NoveltyReportTemplate> queryWrapper = new LambdaQueryWrapper<>();
+        if (temId != null) {
+            queryWrapper.eq(NoveltyReportTemplate::getId, temId);
+        }
+        if (size != null && current != null) {
+            IPage<NoveltyReportTemplate> noveltyReportTemplatePage = this.page(new Page<>(current, size), queryWrapper);
             noveltyReportTemplates = noveltyReportTemplatePage.getRecords();
             total = noveltyReportTemplatePage.getTotal();
+        } else {
+            noveltyReportTemplates = this.list();
+            total = (long) noveltyReportTemplates.size();
         }
         if (!noveltyReportTemplates.isEmpty()) {
             queryTemplateVOS = this.loadTemplateVOS(noveltyReportTemplates);

src/main/resources/application-dev.yml

@@ -61,8 +61,8 @@ spring:
     #初始化表结构
     jdbc:
       initialize-schema:  always
-authorUrl: http://localhost:8885
-PCSUrl: http://localhost:8885
+authorUrl: http://localhost:8880
+PCSUrl: http://localhost:8880
 #OPSUrl: http://192.168.2.24:5001
 OPSUrl: http://139.224.24.90:5001
 PASUrl: http://localhost:8879

src/main/resources/mapper/NoveltyProjectMapper.xml

@@ -42,6 +42,7 @@
                 np.project_id = #{vo.projectId}
             </if>
         </where>
+        order by p.create_time desc
         <if test="vo.current != null and vo.size != null">
             limit
             ${(vo.current -1) * vo.size},${vo.size}