From cbf001cfa5b09256b54f5ec52b0c3c03fe1a67d2 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Wed, 8 Jan 2025 16:03:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../software/manage/pojo/resp/FileVersionViewVO.java | 1 + .../manage/service/serviceimpl/EdFileInfoServiceImpl.java | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileVersionViewVO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileVersionViewVO.java index 86c53d0..6580764 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileVersionViewVO.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileVersionViewVO.java @@ -11,4 +11,5 @@ public class FileVersionViewVO { private String fileCode; private Integer effectFlag; private String parentId; + private String fileId; } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java index 7e9727c..ee48c66 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java @@ -108,10 +108,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl qr.like(EdFileInfo::getFileName, pars.getKeyword()).or().like(EdFileInfo::getFileNote, pars.getKeyword())); + } Page edFileInfoPage = this.baseMapper.selectPage(new Page<>(pars.getPageNum(), pars.getPageSize()), queryWrapper); long total = edFileInfoPage.getTotal(); List records = BeanUtil.copyToList(edFileInfoPage.getRecords(), FileInfoVO.class); From 024c5bb9b866c3cd203ec2ef0dc1c57e4164cddb Mon Sep 17 00:00:00 2001 From: chenxudong Date: Wed, 8 Jan 2025 16:20:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/serviceimpl/EdFileInfoServiceImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java index ee48c66..1aa85f1 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java @@ -104,9 +104,11 @@ public class EdFileInfoServiceImpl extends ServiceImpl qr.like(EdFileInfo::getFileName, pars.getKeyword()).or().like(EdFileInfo::getFileNote, pars.getKeyword())); + queryWrapper.and(qr -> qr.like(EdFileInfo::getFileName, pars.getKeyword()) + .or() + .like(EdFileInfo::getFileCode, pars.getKeyword()) + .or() + .like(EdFileInfo::getFileNote, pars.getKeyword()) + .or() + .like(EdFileInfo::getFileContent, pars.getKeyword())); } Page edFileInfoPage = this.baseMapper.selectPage(new Page<>(pars.getPageNum(), pars.getPageSize()), queryWrapper); long total = edFileInfoPage.getTotal();