From 8d6989e580b4384586815fa9899a68a177f1fe0e Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Thu, 9 Sep 2021 16:25:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=96=99=E7=BB=B4=E6=8A=A4=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/data/controller/PayDataFileController.java | 4 ++-- .../src/main/java/com/jero/data/entity/QueryFileList.java | 3 +++ .../src/main/java/com/jero/data/entity/QueryFileList2.java | 3 +++ .../main/java/com/jero/data/mapper/xml/PayDataFileMapper.xml | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java index 0029eb5d..de1407df 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java @@ -97,7 +97,7 @@ public class PayDataFileController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(queryFileList2, req.getParameterMap()); - queryWrapper.eq("pd.parent_id",id).or().eq("pd.id",id); + queryWrapper.eq("pd.id",id); queryWrapper.eq("pd.type",1); queryWrapper.orderByDesc("pf.create_time"); Page page = new Page<>(pageNo, pageSize); @@ -142,7 +142,7 @@ public class PayDataFileController extends JeroController page = new Page<>(pageNo, pageSize); queryWrapper.eq("pd.type",2); queryWrapper.orderByDesc("pf.create_time"); - queryWrapper.eq("pd.parent_id",id).or().eq("pd.id",id); + queryWrapper.eq("pd.id",id); // QueryWrapper queryWrapper = new QueryWrapper<>(); // queryWrapper.eq("pf.id",id); // queryWrapper.like(StringUtils.isNotBlank(fileName),"of.fileName",fileName); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileList.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileList.java index ff87d173..a864bd9c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileList.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileList.java @@ -14,6 +14,9 @@ public class QueryFileList { @ApiModelProperty(value = "资料id") private java.lang.String dataId; + @ApiModelProperty(value = "资料id") + private java.lang.String fileId; + @ApiModelProperty(value = "资料名称") private java.lang.String fileName; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileList2.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileList2.java index 3ce535f7..dc2c1e7d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileList2.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileList2.java @@ -11,6 +11,9 @@ public class QueryFileList2 { @ApiModelProperty(value = "主键id") private java.lang.String keyId; + @ApiModelProperty(value = "目录id") + private java.lang.String fileId; + @ApiModelProperty(value = "资料id") private java.lang.String dataId; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayDataFileMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayDataFileMapper.xml index edfb82f5..876415b0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayDataFileMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayDataFileMapper.xml @@ -4,6 +4,7 @@ SELECT pf.id as keyid, pf.file_id as dataId, + pf.data_id as fileId, pf.file_path as filePath, of.file_name as fileName, pd.meeting_id as meetingId,