资料维护调整

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java

@@ -97,7 +97,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 
 			) {
 		QueryWrapper<QueryFileList2> 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<PayDataFile> page = new Page<>(pageNo, pageSize);
@@ -142,7 +142,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 		Page<PayDataFile> 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<Object> queryWrapper = new QueryWrapper<>();
 //		queryWrapper.eq("pf.id",id);
 //		queryWrapper.like(StringUtils.isNotBlank(fileName),"of.fileName",fileName);

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;
 

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;
 

jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayDataFileMapper.xml

@@ -4,6 +4,7 @@
     <select id="pageData"  resultType="com.jero.data.entity.QueryFileList2">
        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,
        dt.downLodeTime,
@@ -17,6 +18,7 @@
     <select id="pageDataMeeting"  resultType="com.jero.data.entity.QueryFileList">
         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,