From 143389f52b48c4f3833d16bf36301065f5582e2e Mon Sep 17 00:00:00 2001 From: sxlong Date: Fri, 29 Nov 2024 10:00:25 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E7=9A=84bug?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/boardservice/indicator/parames/EDDataParams.java | 4 ++++ .../software/data/manage/request/indicator/EDDataRequest.java | 4 ++++ .../src/main/resources/sqlmapper/EdDataInfoMapper.xml | 3 +++ 3 files changed, 11 insertions(+) diff --git a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/parames/EDDataParams.java b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/parames/EDDataParams.java index 10bad3c..1c0031e 100644 --- a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/parames/EDDataParams.java +++ b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/parames/EDDataParams.java @@ -37,6 +37,10 @@ public class EDDataParams implements Serializable { * 文件夹名称 */ private String name; + /** + * 文件类型 + */ + private String dataType; /** * 创建日期排序 */ diff --git a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/indicator/EDDataRequest.java b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/indicator/EDDataRequest.java index f924802..2ad96c4 100644 --- a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/indicator/EDDataRequest.java +++ b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/indicator/EDDataRequest.java @@ -29,6 +29,10 @@ public class EDDataRequest extends BaseRequest { * 文件夹名称 */ private String name; + /** + * 文件类型 + */ + private String dataType; /** * 创建日期排序 */ diff --git a/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml b/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml index 26f0d5e..a8ed76a 100644 --- a/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml +++ b/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml @@ -74,6 +74,9 @@ and data_name LIKE '%${keyWord}%' + + and data_type = '${dataType}' + and save_status='${saveStatus}'