diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
index e0fd2683..c8563907 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
@@ -66,11 +66,10 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
 								   ) {
 		QueryWrapper<PayCaseCommitteeSubitem> queryWrapper = Wrappers.query();
 		queryWrapper
-				.like(StringUtils.isNotBlank(name), "pt.name", name).or()
-				.like(StringUtils.isNotBlank(companyName), "pm.company_name", companyName)
 				.like(StringUtils.isNotBlank(fenBiaoWeiName), "pe.name", fenBiaoWeiName);
 		Page<PayCaseCommitteeSubitem> page = new Page<>(pageNo, pageSize);
-		IPage<FindByName> pageList = payCaseCommitteeSubitemService.list3(page, queryWrapper);
+
+		IPage<FindByName> pageList = payCaseCommitteeSubitemService.list3(name,companyName,page, queryWrapper);
 		List<FindByName> records = pageList.getRecords();
 		if (!CollectionUtils.isEmpty(records)) {
 			try {
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 2884fcc6..a5f7ea5c 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
@@ -11,6 +11,8 @@ import java.util.zip.ZipOutputStream;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
@@ -84,7 +86,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 	 *
 	 */
 	@AutoLog(value = "资料维护（资料列表）-根据文件夹id分页列表查询")
-	@ApiOperation(value="资料维护（资料列表）-根据文件夹id分页列表查询", notes="资料维护（资料列表）-根据文件夹id分页列表查询")
+	@ApiOperation(value="资料维护（资料列表）-根据文件夹id分页列表查询", notes="资料维护（资料列表）-根据文件夹id分页列表查询",response =QueryFileList2.class)
 	@GetMapping(value = "/list")
 	@ApiImplicitParam(name = "id", value = "目录id，查询该目录下文件", dataType = "String", required = true)
 	public Result<?> queryPageList(
@@ -95,7 +97,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 
 			) {
 		QueryWrapper<QueryFileList2> queryWrapper = QueryGenerator.initQueryWrapper(queryFileList2, req.getParameterMap());
-		queryWrapper.eq("pd.id",id);
+		queryWrapper.eq("pd.parent_id",id).or().eq("pd.id",id);
 		queryWrapper.eq("pd.type",1);
 		queryWrapper.orderByDesc("pf.create_time");
 		Page<PayDataFile> page = new Page<>(pageNo, pageSize);
@@ -118,11 +120,29 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 										    @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 										    @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 										    HttpServletRequest req) {
-			QueryWrapper<QueryFileListBySearch> queryWrapper = QueryGenerator.initQueryWrapper(queryFileListBySearch, req.getParameterMap());
-			Page<PayDataFile> page = new Page<>(pageNo, pageSize);
+//			QueryWrapper<QueryFileListBySearch> queryWrapper = QueryGenerator.initQueryWrapper(queryFileListBySearch, req.getParameterMap());
+		QueryWrapper<QueryFileListBySearch> queryWrapper = new QueryWrapper<>();
+		if (ObjectUtil.isNotEmpty(queryFileListBySearch.getStartTime()) && ObjectUtil.isNotEmpty(queryFileListBySearch.getEndTime())) {
+			queryWrapper.gt("pm.start_time", queryFileListBySearch.getStartTime());
+			queryWrapper.lt("pm.start_time", queryFileListBySearch.getEndTime());
+
+		}else if (ObjectUtil.isNotEmpty(queryFileListBySearch.getStartTime())){
+			queryWrapper.gt("pm.start_time", queryFileListBySearch.getStartTime());
+
+		}else if (ObjectUtil.isNotEmpty(queryFileListBySearch.getEndTime())){
+			queryWrapper.lt("pm.start_time", queryFileListBySearch.getEndTime());
+
+		}
+		if (ObjectUtil.isNotEmpty(queryFileListBySearch.getFileName())){
+			queryWrapper.eq("of.file_name",queryFileListBySearch.getFileName());
+		}
+		if (ObjectUtil.isNotEmpty(queryFileListBySearch.getMeetingName())){
+			queryWrapper.eq("pm.meeting_name",queryFileListBySearch.getMeetingName());
+		}
+		Page<PayDataFile> page = new Page<>(pageNo, pageSize);
 			queryWrapper.eq("pd.type",2);
 			queryWrapper.orderByDesc("pf.create_time");
-			queryWrapper.eq("pd.id",id);
+			queryWrapper.eq("pd.parent_id",id).or().eq("pd.id",id);
 //		QueryWrapper<Object> queryWrapper = new QueryWrapper<>();
 //		queryWrapper.eq("pf.id",id);
 //		queryWrapper.like(StringUtils.isNotBlank(fileName),"of.fileName",fileName);
@@ -190,18 +210,29 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
 	@PostMapping(value = "/edit")
 	@Transactional
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "id",value = "主键id",required = true),
-			@ApiImplicitParam(name = "fileId", value = "资料id",required = true),
+			@ApiImplicitParam(name = "dataId",value = "目录id",required = true),
+			@ApiImplicitParam(name = "keyId",value = "主键id",required = true),
+			@ApiImplicitParam(name = "fileIds", value = "资料ids,多个以逗号隔开",required = true),
+			@ApiImplicitParam(name = "filePath", value = "目录层级",required = true),
 			@ApiImplicitParam(name = "oldFileId", value = "原来资料id",required = true)
 	})
-	public Result<?> edit(@RequestParam(name="id") String id,
-						  @RequestParam(name="fileId") String fileId,
+	public Result<?> edit(@RequestParam(name="dataId") String dataId,
+						  @RequestParam(name="keyId") String keyId,
+						  @RequestParam(name="fileIds") String fileIds,
+						  @RequestParam(name="filePath") String filePath,
 						  @RequestParam(name="oldFileId") String oldFileId) {
 		iossFileService.removeById(oldFileId);
-		PayDataFile payDataFile = new PayDataFile();
-		payDataFile.setFileId(fileId);
-		payDataFile.setId(id);
-		payDataFileService.updateById(payDataFile);
+		payDataFileService.removeById(keyId);
+		ArrayList<String> strings2 = new ArrayList<>(Arrays.asList(fileIds.split(",")));
+		ArrayList<PayDataFile> objects = new ArrayList<>();
+		for(String fileid:strings2){
+			PayDataFile payDataFile = new PayDataFile();
+			payDataFile.setFileId(fileid);
+			payDataFile.setFilePath(filePath);
+			payDataFile.setDataId(dataId);
+			objects.add(payDataFile);
+		}
+		payDataFileService.saveBatch(objects);
 		return Result.OK("编辑成功!");
 	}
 
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 d96fd418..ff87d173 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
@@ -9,7 +9,7 @@ import lombok.Data;
 public class QueryFileList {
 
     @ApiModelProperty(value = "主键id")
-    private java.lang.String id;
+    private java.lang.String keyid;
 
     @ApiModelProperty(value = "资料id")
     private java.lang.String dataId;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileListBySearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileListBySearch.java
index 388bd4b4..1d27fef9 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileListBySearch.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/QueryFileListBySearch.java
@@ -1,8 +1,12 @@
 package com.jero.data.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
 @Data
 @ApiModel(value = "资料（会议）列表")
 public class QueryFileListBySearch {
@@ -31,4 +35,18 @@ public class QueryFileListBySearch {
         @ApiModelProperty(value = "上传人")
         private java.lang.String upLodePeople;
 
+        /**开始时间*/
+        @Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+        @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+        @ApiModelProperty(value = "开始时间")
+        private java.util.Date startTime;
+
+        /**结束时间*/
+        @Excel(name = "结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+        @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+        @ApiModelProperty(value = "结束时间")
+        private java.util.Date endTime;
+
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java
index afaaa538..3844b75c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java
@@ -24,7 +24,7 @@ import java.util.List;
  */
 public interface PayCaseCommitteeSubitemMapper extends BaseMapper<PayCaseCommitteeSubitem> {
 
-    Page<FindByName> list3 (IPage<PayCaseCommitteeSubitem> page, @Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
+    Page<FindByName> list3 (String name,String companyName,IPage<PayCaseCommitteeSubitem> page, @Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
 
     List<payCaseCommitteeSubitemVO> list2 (@Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
index e3af8555..2e2d2f27 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
@@ -4,21 +4,31 @@
     <resultMap id="people" type="com.jero.data.entity.FindByName">
         <id property="id" column="id"></id>
         <result property="name" column="name"></result>
-        <collection property="list" ofType="com.jero.data.entity.ChildrenFindByName" javaType="java.util.List">
-            <id property="childrenId" column="childrenId"></id>
-            <result property="companyName" column="companyName"></result>
-            <result property="post" column="post"></result>
-            <result property="phone" column="phone"></result>
-            <result property="peopleName" column="peopleName"></result>
+        <collection property="list" column="id" select="list4">
+
         </collection>
     </resultMap>
     <select id="list3"  resultMap="people">
-       SELECT pe.id as id,pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone ,pe.name as name,pm.id as childrenId
+       SELECT pe.id as id,pe.name as name
        from
         pay_case_committee pe
-        left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)
-        left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
-         ${ew.customSqlSegment}
+        ${ew.customSqlSegment}
+<!--         <if test="#{fenBiaoWeiName} != null  and #{fenBiaoWeiName} !=''">-->
+<!--             where pe.name=#{fenBiaoWeiName}-->
+<!--         </if>-->
+    </select>
+    <select id="list4"  resultType="com.jero.data.entity.ChildrenFindByName">
+      SELECT pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone ,pm.id as childrenId
+       from
+         pay_case_committee_subitem pm
+        left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) where pm.committee_id = #{id}
+        ${wrapper2.customSqlSegment}
+<!--        <if test="#{companyName} != null  and  #{companyName} !=''">-->
+<!--            and pm.company_name=#{companyName}-->
+<!--        </if>-->
+<!--        <if test="#{name} != null  and  #{name} !=''">-->
+<!--            and pt.name=#{name}-->
+<!--        </if>-->
     </select>
 
 
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 bba3b9f9..edfb82f5 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
@@ -15,7 +15,7 @@
     </select>
 
     <select id="pageDataMeeting"  resultType="com.jero.data.entity.QueryFileList">
-        SELECT pf.id as id,
+        SELECT pf.id as keyid,
        pf.file_id as dataId,
        pf.file_path as filePath,
        of.file_name as fileName,
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java
index 56a8c777..03ad4508 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java
@@ -28,5 +28,5 @@ public interface IPayCaseCommitteeSubitemService extends IService<PayCaseCommitt
 
     List<payCaseCommitteeSubitemVO> list2(QueryWrapper<PayCaseCommitteeSubitem> queryWrapper);
 
-    IPage<FindByName> list3(Page<PayCaseCommitteeSubitem> page, QueryWrapper<PayCaseCommitteeSubitem> queryWrapper);
+    IPage<FindByName> list3(String name,String companyName,Page<PayCaseCommitteeSubitem> page, QueryWrapper<PayCaseCommitteeSubitem> queryWrapper);
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java
index 38b13ed2..accd0d4c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java
@@ -46,7 +46,7 @@ public class PayCaseCommitteeSubitemServiceImpl extends ServiceImpl<PayCaseCommi
     }
 
     @Override
-    public IPage<FindByName> list3(Page<PayCaseCommitteeSubitem> page, QueryWrapper<PayCaseCommitteeSubitem> queryWrapper) {
-        return payCaseCommitteeSubitemMapper.list3(page, queryWrapper);
+    public IPage<FindByName> list3(String name,String companyName,Page<PayCaseCommitteeSubitem> page, QueryWrapper<PayCaseCommitteeSubitem> queryWrapper) {
+        return payCaseCommitteeSubitemMapper.list3(name,companyName,page, queryWrapper);
     }
 }