修改名称

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

@@ -0,0 +1,200 @@
+package com.jero.data.payCaseCommittee.controller;
+
+import java.util.*;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.data.payCaseCommittee.entity.DTO.PayCaseCommitteeDTO;
+import com.jero.data.payCaseCommittee.entity.DTO.PayCaseCommitteeUpdateDTO;
+import com.jero.data.payCaseCommittee.entity.PayCaseCommittee;
+import com.jero.data.payCaseCommittee.service.IPayCaseCommitteeService;
+import com.jero.data.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
+import com.jero.data.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+ * @Description: 分标委表
+ * @Author: jeecg-boot
+ * @Date:   2021-08-27
+ * @Version: V1.0
+ */
+@Api(tags="分标委表")
+@RestController
+@RequestMapping("/payCaseCommittee/payCaseCommittee")
+@Slf4j
+public class PayCaseCommitteeController extends JeroController<PayCaseCommittee, IPayCaseCommitteeService> {
+	@Autowired
+	private IPayCaseCommitteeService payCaseCommitteeService;
+	 @Autowired
+	 private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param payCaseCommittee
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "分标委表-分页列表查询")
+	@ApiOperation(value="分标委表-分页列表查询", notes="分标委表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(PayCaseCommittee payCaseCommittee,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<PayCaseCommittee> queryWrapper = QueryGenerator.initQueryWrapper(payCaseCommittee, req.getParameterMap());
+		Page<PayCaseCommittee> page = new Page<PayCaseCommittee>(pageNo, pageSize);
+		IPage<PayCaseCommittee> pageList = payCaseCommitteeService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param payCaseCommitteeDTO
+	 * @return
+	 */
+	@AutoLog(value = "分标委表-添加")
+	@ApiOperation(value="分标委表-添加", notes="分标委表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add( @Valid @RequestBody PayCaseCommitteeDTO payCaseCommitteeDTO) {
+		LambdaQueryWrapper<PayCaseCommittee> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(PayCaseCommittee::getName,payCaseCommitteeDTO.getName());
+		PayCaseCommittee one = payCaseCommitteeService.getOne(queryWrapper);
+		if (ObjectUtils.isEmpty(one)) {
+			PayCaseCommittee payCaseCommittee = new PayCaseCommittee();
+			BeanUtils.copyProperties(payCaseCommitteeDTO, payCaseCommittee);
+			payCaseCommitteeService.save(payCaseCommittee);
+			return Result.OK("添加成功！");
+		}else {
+			return Result.error("分标委表名已存在");
+		}
+
+	}
+
+
+
+	/**
+	 *  编辑
+	 *
+	 * @param payCaseCommitteeUpdateDTO
+	 * @return
+	 */
+	@AutoLog(value = "分标委表-编辑")
+	@ApiOperation(value="分标委表-编辑", notes="分标委表-编辑")
+	@PostMapping(value = "/edit")
+	public Result<?> edit( @Valid @RequestBody PayCaseCommitteeUpdateDTO payCaseCommitteeUpdateDTO) {
+		LambdaQueryWrapper<PayCaseCommittee> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(PayCaseCommittee::getName,payCaseCommitteeUpdateDTO.getName());
+		PayCaseCommittee one = payCaseCommitteeService.getOne(queryWrapper);
+		if (ObjectUtils.isEmpty(one)) {
+			PayCaseCommittee payCaseCommittee = new PayCaseCommittee();
+			BeanUtils.copyProperties(payCaseCommitteeUpdateDTO,payCaseCommittee);
+			payCaseCommitteeService.updateById(payCaseCommittee);
+			return Result.OK("编辑成功!");
+		}else {
+			return Result.error("分标委表名已存在");
+		}
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "分标委表-通过id删除")
+	@ApiOperation(value="分标委表-通过id删除", notes="分标委表-通过id删除")
+	@GetMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		LambdaQueryWrapper<PayCaseCommitteeSubitem> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(PayCaseCommitteeSubitem::getCommitteeId,id);
+		boolean b = payCaseCommitteeService.removeById(id);
+		if (b){
+			List<PayCaseCommitteeSubitem> list = payCaseCommitteeSubitemService.list(queryWrapper);
+			List<String> collect = list.stream().map(payCaseCommitteeSubitem -> payCaseCommitteeSubitem.getId()).collect(Collectors.toList());
+			payCaseCommitteeSubitemService.removeByIds(collect);
+		}else {
+			return Result.error("删除失败，参数错误");
+		}
+		return Result.OK("删除成功!");
+	}
+
+	 /**
+	  * 导出excel
+	  *
+	  * @param request
+	  * @param payCaseCommittee
+	  */
+	 @AutoLog(value = "分标委表-导出")
+	 @ApiOperation(value="分标委表-导出", notes="分标委表-导出")
+	 @RequestMapping(value = "/exportXls")
+	 public ModelAndView exportXls(HttpServletRequest request, PayCaseCommittee payCaseCommittee) {
+		 return super.exportXls(request, payCaseCommittee, PayCaseCommittee.class, "分标委表");
+	 }
+//	/**
+//	 *  批量删除
+//	 *
+//	 * @param ids
+//	 * @return
+//	 */
+//	@AutoLog(value = "分标委表-批量删除")
+//	@ApiOperation(value="分标委表-批量删除", notes="分标委表-批量删除")
+//	@GetMapping(value = "/deleteBatch")
+//	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+//		this.payCaseCommitteeService.removeByIds(Arrays.asList(ids.split(",")));
+//		return Result.OK("批量删除成功!");
+//	}
+	
+//	/**
+//	 * 通过id查询
+//	 *
+//	 * @param id
+//	 * @return
+//	 */
+//	@AutoLog(value = "分标委表-通过id查询")
+//	@ApiOperation(value="分标委表-通过id查询", notes="分标委表-通过id查询")
+//	@GetMapping(value = "/queryById")
+//	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+//		PayCaseCommittee payCaseCommittee = payCaseCommitteeService.getById(id);
+//		if(payCaseCommittee==null) {
+//			return Result.error("未找到对应数据");
+//		}
+//		return Result.OK(payCaseCommittee);
+//	}
+
+
+//
+//    /**
+//      * 通过excel导入数据
+//    *
+//    * @param request
+//    * @param response
+//    * @return
+//    */
+//	@AutoLog(value = "分标委表-通过id删除")
+//	@ApiOperation(value="分标委表-通过id删除", notes="分标委表-通过id删除")
+//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+//    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+//        return super.importExcel(request, response, PayCaseCommittee.class);
+//    }
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payCaseCommittee/entity/DTO/PayCaseCommitteeDTO.java

@@ -0,0 +1,21 @@
+package com.jero.data.payCaseCommittee.entity.DTO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+@Data
+@ApiModel(value="PayCaseCommitteeDTO对象", description="分标委请求对象")
+public class PayCaseCommitteeDTO {
+
+    @NotBlank(message = "分标委名称不能为空")
+    @Size(max = 20,message = "分标委名称长度不能超过20")
+    @ApiModelProperty(value = "分标委名称")
+    private java.lang.String name;
+
+    @Size(max = 100,message = "备注长度不得超过100")
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remarks;
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payCaseCommittee/entity/DTO/PayCaseCommitteeUpdateDTO.java

@@ -0,0 +1,25 @@
+package com.jero.data.payCaseCommittee.entity.DTO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+@Data
+@ApiModel(value="PayCaseCommitteeUpdateDTO对象", description="分标委更新对象")
+public class PayCaseCommitteeUpdateDTO {
+
+    @NotBlank(message = "主键不能为空")
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+
+    @NotBlank(message = "分标委名称不能为空")
+    @Size(max = 20,message = "分标委名称长度不能超过20")
+    @ApiModelProperty(value = "分标委名称")
+    private java.lang.String name;
+
+    @Size(max = 100,message = "备注长度不得超过100")
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remarks;
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payCaseCommittee/entity/PayCaseCommittee.java

@@ -0,0 +1,58 @@
+package com.jero.data.payCaseCommittee.entity;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: pay_case_committee
+ * @Author: jeecg-boot
+ * @Date:   2021-08-27
+ * @Version: V1.0
+ */
+@Data
+@TableName("pay_case_committee")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="pay_case_committee对象", description="pay_case_committee")
+public class PayCaseCommittee implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**分标委名称*/
+	@Excel(name = "分标委名称", width = 15)
+    @ApiModelProperty(value = "分标委名称")
+    private java.lang.String name;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remarks;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private java.util.Date updateTime;
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payCaseCommittee/mapper/PayCaseCommitteeMapper.java

@@ -0,0 +1,15 @@
+package com.jero.data.payCaseCommittee.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.data.payCaseCommittee.entity.PayCaseCommittee;
+
+/**
+ * @Description: pay_case_committee
+ * @Author: jeecg-boot
+ * @Date:   2021-08-27
+ * @Version: V1.0
+ */
+public interface PayCaseCommitteeMapper extends BaseMapper<PayCaseCommittee> {
+
+}

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.demo.payCaseCommittee.mapper.PayCaseCommitteeMapper">
+
+</mapper>

jero-boot-incoming-payment/src/main/java/com/jero/data/payCaseCommittee/service/IPayCaseCommitteeService.java

@@ -0,0 +1,15 @@
+package com.jero.data.payCaseCommittee.service;
+
+import com.jero.data.payCaseCommittee.entity.PayCaseCommittee;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: pay_case_committee
+ * @Author: jeecg-boot
+ * @Date:   2021-08-27
+ * @Version: V1.0
+ */
+public interface IPayCaseCommitteeService extends IService<PayCaseCommittee> {
+
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payCaseCommittee/service/impl/PayCaseCommitteeServiceImpl.java

@@ -0,0 +1,23 @@
+package com.jero.data.payCaseCommittee.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.data.payCaseCommittee.entity.PayCaseCommittee;
+import com.jero.data.payCaseCommittee.mapper.PayCaseCommitteeMapper;
+import com.jero.data.payCaseCommittee.service.IPayCaseCommitteeService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @Description: pay_case_committee
+ * @Author: jeecg-boot
+ * @Date:   2021-08-27
+ * @Version: V1.0
+ */
+@Service
+public class PayCaseCommitteeServiceImpl extends ServiceImpl<PayCaseCommitteeMapper, PayCaseCommittee> implements IPayCaseCommitteeService {
+
+
+
+
+}

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

@@ -0,0 +1,203 @@
+package com.jero.data.payCaseCommitteeSubitem.controller;
+import java.util.Arrays;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.data.payCaseCommitteeSubitem.entity.DTO.PayCaseCommitteeSubitemDTO;
+import com.jero.data.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
+import com.jero.data.payCaseCommitteeSubitem.entity.VO.payCaseCommitteeSubitemVO;
+import com.jero.data.payCaseCommitteeSubitem.entity.FindByName;
+import com.jero.data.payCaseCommitteeSubitem.mapper.PayCaseCommitteeSubitemMapper;
+import com.jero.data.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService;
+import io.swagger.annotations.ApiImplicitParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+
+/**
+ * @Description: 分标委成员表
+ * @Author: jeecg-boot
+ * @Date:   2021-08-27
+ * @Version: V1.0
+ */
+@Api(tags="分标委成员表")
+@RestController
+@RequestMapping("/payCaseCommitteeSubitem/payCaseCommitteeSubitem")
+@Slf4j
+public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCommitteeSubitem, IPayCaseCommitteeSubitemService> {
+	@Autowired
+	private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService;
+
+	 @Autowired
+	 private PayCaseCommitteeSubitemMapper payCaseCommitteeSubitemMapper;
+	
+	/**
+	 * 分页列表查询
+	 * @param pageNo
+	 * @param pageSize
+
+	 * @return
+	 */
+	@AutoLog(value = "分标委成员表-搜索")
+	@ApiOperation(value="分标委成员表-搜索", notes="分标委成员表-搜索",response = FindByName.class)
+	@GetMapping(value = "/find")
+	public Result<?> find(@RequestParam(name="name",required =false) String name,
+						  @RequestParam(name="companyName",required =false) String companyName,
+						  @RequestParam(name="fenbiaoweiName",required =false) String fenbiaoweiName,
+						  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+						  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize
+								   ) {
+		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 = payCaseCommitteeSubitemMapper.list(page,queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 * 列表查询
+	 * @return
+	 */
+	@AutoLog(value = "分标委成员表-列表查询")
+	@ApiOperation(value="分标委成员表-列表查询", notes="分标委成员表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(@RequestParam(name="id",required =true) String id) {
+		QueryWrapper<PayCaseCommitteeSubitem> queryWrapper = Wrappers.query();
+		queryWrapper.eq("pm.committee_id",id);
+		List<payCaseCommitteeSubitemVO> list = payCaseCommitteeSubitemMapper.list2(queryWrapper);
+		return Result.OK(list);
+	}
+	/**
+	 * 校验
+	 * @return
+	 */
+	@AutoLog(value = "分标委成员表-新增时校验重复")
+	@ApiOperation(value="分标委成员表-新增时校验重复", notes="分标委成员表-新增时校验重复")
+	@ApiImplicitParam(name = "id", value = "联系人主键", dataType = "String", required = true)
+	@GetMapping(value = "/voiled")
+	public Result<?> voiled(@RequestParam(name="id") String id) {
+		LambdaQueryWrapper<PayCaseCommitteeSubitem> lambdaQueryWrapper = new LambdaQueryWrapper();
+		lambdaQueryWrapper.eq(PayCaseCommitteeSubitem::getContactsId, id);
+		List<PayCaseCommitteeSubitem> list = payCaseCommitteeSubitemService.list(lambdaQueryWrapper);
+		if (list.size() > 0) {
+			return Result.error("联系人重复，请重新选择");
+		} else {
+			return Result.OK();
+		}
+	}
+
+
+
+	/**
+	 *   添加
+	 * @param payCaseCommitteeSubitemDTO
+	 * @return
+	 */
+	@AutoLog(value = "分标委成员表-添加")
+	@ApiOperation(value="分标委成员表-添加", notes="分标委成员表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody PayCaseCommitteeSubitemDTO payCaseCommitteeSubitemDTO) {
+		PayCaseCommitteeSubitem payCaseCommitteeSubitem = new PayCaseCommitteeSubitem();
+		BeanUtils.copyProperties(payCaseCommitteeSubitemDTO,payCaseCommitteeSubitem);
+		payCaseCommitteeSubitemService.save(payCaseCommitteeSubitem);
+		return Result.OK("添加成功！");
+	}
+	 /**
+	  *   通过id删除
+	  * @param id
+	  * @return
+	  */
+	 @AutoLog(value = "分标委成员表-通过id删除")
+	 @ApiOperation(value="分标委成员表-通过id删除", notes="分标委成员表-通过id删除")
+	 @GetMapping(value = "/delete")
+	 public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		 payCaseCommitteeSubitemService.removeById(id);
+		 return Result.OK("删除成功!");
+	 }
+
+	 /**
+	  *  批量删除
+	  *
+	  * @param ids
+	  * @return
+	  */
+	 @AutoLog(value = "分标委成员表-批量删除")
+	 @ApiOperation(value="分标委成员表-批量删除", notes="分标委成员表-批量删除")
+	 @GetMapping(value = "/deleteBatch")
+	 public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		 this.payCaseCommitteeSubitemService.removeByIds(Arrays.asList(ids.split(",")));
+		 return Result.OK("批量删除成功!");
+	 }
+
+//	/**
+//	 *  编辑
+//	 * @param payCaseCommitteeSubitemUpdateDTO
+//	 * @return
+//	 */
+//	@AutoLog(value = "分标委成员表-编辑")
+//	@ApiOperation(value="分标委成员表-编辑", notes="分标委成员表-编辑")
+//	@PostMapping(value = "/edit")
+//	public Result<?> edit(@RequestBody PayCaseCommitteeSubitemUpdateDTO payCaseCommitteeSubitemUpdateDTO) {
+//		PayCaseCommitteeSubitem payCaseCommitteeSubitem = new PayCaseCommitteeSubitem();
+//		BeanUtils.copyProperties(payCaseCommitteeSubitemUpdateDTO,payCaseCommitteeSubitem);
+//		payCaseCommitteeSubitemService.updateById(payCaseCommitteeSubitem);
+//		return Result.OK("编辑成功!");
+//	}
+	
+
+//
+//	/**
+//	 * 通过id查询
+//	 *
+//	 * @param id
+//	 * @return
+//	 */
+//	@AutoLog(value = "分标委成员表-通过id查询")
+//	@ApiOperation(value="分标委成员表-通过id查询", notes="分标委成员表-通过id查询")
+//	@GetMapping(value = "/queryById")
+//	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+//		PayCaseCommitteeSubitem payCaseCommitteeSubitem = payCaseCommitteeSubitemService.getById(id);
+//		if(payCaseCommitteeSubitem==null) {
+//			return Result.error("未找到对应数据");
+//		}
+//		return Result.OK(payCaseCommitteeSubitem);
+//	}
+
+//    /**
+//    * 导出excel
+//    * @param request
+//    * @param payCaseCommitteeSubitem
+//    */
+//    @RequestMapping(value = "/exportXls")
+//    public ModelAndView exportXls(HttpServletRequest request, PayCaseCommitteeSubitem payCaseCommitteeSubitem) {
+//        return super.exportXls(request, payCaseCommitteeSubitem, PayCaseCommitteeSubitem.class, "分标委成员表");
+//    }
+//
+//    /**
+//      * 通过excel导入数据
+//    *
+//    * @param request
+//    * @param response
+//    * @return
+//    */
+//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+//    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+//        return super.importExcel(request, response, PayCaseCommitteeSubitem.class);
+//    }
+//
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payCaseCommitteeSubitem/entity/ChildrenFindByName.java

@@ -0,0 +1,22 @@
+package com.jero.data.payCaseCommitteeSubitem.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+public class ChildrenFindByName implements Serializable {
+
+    @ApiModelProperty(value = "企业名称")
+    private java.lang.String companyName;
+
+    @ApiModelProperty(value = "姓名")
+    private java.lang.String peopleName;
+
+    @ApiModelProperty(value = "电话")
+    private java.lang.String phone;
+
+    @ApiModelProperty(value = "职位")
+    private java.lang.String post;
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payCaseCommitteeSubitem/entity/DTO/PayCaseCommitteeSubitemDTO.java

@@ -0,0 +1,34 @@
+package com.jero.data.payCaseCommitteeSubitem.entity.DTO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@ApiModel(value="PayCaseCommitteeSubitemDTO对象", description="分标委成员请求对象")
+public class PayCaseCommitteeSubitemDTO {
+
+    @NotBlank(message = "分标委id不能为空")
+    @ApiModelProperty(value = "分标委id")
+    private java.lang.String committeeId;
+
+    @NotBlank(message = "企业id不能为空")
+    @ApiModelProperty(value = "企业id")
+    private java.lang.String companyId;
+
+    @NotBlank(message = "企业名称不能为空")
+    @ApiModelProperty(value = "企业名称")
+    private java.lang.String companyName;
+
+    @NotBlank(message = "联系人id不能为空")
+    @ApiModelProperty(value = "联系人id")
+    private java.lang.String contactsId;
+
+    @NotBlank(message = "联系人名称不能为空")
+    @ApiModelProperty(value = "联系人名称")
+    private java.lang.String contactsName;
+
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payCaseCommitteeSubitem/entity/FindByName.java

@@ -0,0 +1,23 @@
+package com.jero.data.payCaseCommitteeSubitem.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class FindByName implements Serializable {
+
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+
+    @ApiModelProperty(value = "分标委名称")
+    private java.lang.String name;
+
+    @ApiModelProperty(value = "子目录分标委成员")
+    private List<ChildrenFindByName> list;
+
+
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payCaseCommitteeSubitem/entity/PayCaseCommitteeSubitem.java

@@ -0,0 +1,71 @@
+package com.jero.data.payCaseCommitteeSubitem.entity;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: pay_case_committee_subitem
+ * @Author: jeecg-boot
+ * @Date:   2021-08-27
+ * @Version: V1.0
+ */
+@Data
+@TableName("pay_case_committee_subitem")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="pay_case_committee_subitem对象", description="pay_case_committee_subitem")
+public class PayCaseCommitteeSubitem implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**分标委id*/
+	@Excel(name = "分标委id", width = 15)
+    @ApiModelProperty(value = "分标委id")
+    private java.lang.String committeeId;
+	/**企业id*/
+	@Excel(name = "企业id", width = 15)
+    @ApiModelProperty(value = "企业id")
+    private java.lang.String companyId;
+	/**企业名称*/
+	@Excel(name = "企业名称", width = 15)
+    @ApiModelProperty(value = "企业名称")
+    private java.lang.String companyName;
+	/**联系人id*/
+	@Excel(name = "联系人id", width = 15)
+    @ApiModelProperty(value = "联系人id")
+    private java.lang.String contactsId;
+	/**联系人名称*/
+	@Excel(name = "联系人名称", width = 15)
+    @ApiModelProperty(value = "联系人名称")
+    private java.lang.String contactsName;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private java.util.Date updateTime;
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payCaseCommitteeSubitem/entity/VO/payCaseCommitteeSubitemVO.java

@@ -0,0 +1,26 @@
+package com.jero.data.payCaseCommitteeSubitem.entity.VO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value="payCaseCommitteeSubitemVO对象", description="分标委成员返回对象")
+public class payCaseCommitteeSubitemVO {
+
+
+    @ApiModelProperty(value = "分标委成员主键")
+    private java.lang.String id;
+
+    @ApiModelProperty(value = "企业名称")
+    private java.lang.String companyName;
+
+    @ApiModelProperty(value = "联系人名称")
+    private java.lang.String contactsName;
+
+    @ApiModelProperty(value = "联系人手机号")
+    private String PhoneNamber;
+
+    @ApiModelProperty(value = "职务")
+    private String Post;
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payCaseCommitteeSubitem/mapper/PayCaseCommitteeSubitemMapper.java

@@ -0,0 +1,29 @@
+package com.jero.data.payCaseCommitteeSubitem.mapper;
+
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.data.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.data.payCaseCommitteeSubitem.entity.VO.payCaseCommitteeSubitemVO;
+import com.jero.data.payCaseCommitteeSubitem.entity.FindByName;
+import org.apache.ibatis.annotations.Param;
+
+
+import java.util.List;
+
+/**
+ * @Description: pay_case_committee_subitem
+ * @Author: jeecg-boot
+ * @Date:   2021-08-27
+ * @Version: V1.0
+ */
+public interface PayCaseCommitteeSubitemMapper extends BaseMapper<PayCaseCommitteeSubitem> {
+
+    Page<FindByName> list (IPage<PayCaseCommitteeSubitem> page, @Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
+
+    List<payCaseCommitteeSubitemVO> list2 (@Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
+}
+

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

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.data.payCaseCommitteeSubitem.mapper.PayCaseCommitteeSubitemMapper">
+    <resultMap id="people" type="com.jero.data.payCaseCommitteeSubitem.entity.FindByName">
+        <id property="id" column="id"></id>
+        <result property="name" column="name"></result>
+        <collection property="list" ofType="com.jero.data.payCaseCommitteeSubitem.entity.ChildrenFindByName" javaType="java.util.List">
+            <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>
+    </resultMap>
+    <select id="list"  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
+       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}
+    </select>
+
+
+    <select id="list2"  resultType="com.jero.data.payCaseCommitteeSubitem.entity.VO.payCaseCommitteeSubitemVO">
+       SELECT pm.id as id,pt.name as contactsName,pm.company_name as companyName,pt.post as post,pt.phone as PhoneNamber
+       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}
+    </select>
+</mapper>

jero-boot-incoming-payment/src/main/java/com/jero/data/payCaseCommitteeSubitem/service/IPayCaseCommitteeSubitemService.java

@@ -0,0 +1,16 @@
+package com.jero.data.payCaseCommitteeSubitem.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.data.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
+
+/**
+ * @Description: pay_case_committee_subitem
+ * @Author: jeecg-boot
+ * @Date:   2021-08-27
+ * @Version: V1.0
+ */
+public interface IPayCaseCommitteeSubitemService extends IService<PayCaseCommitteeSubitem> {
+
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payCaseCommitteeSubitem/service/impl/PayCaseCommitteeSubitemServiceImpl.java

@@ -0,0 +1,21 @@
+package com.jero.data.payCaseCommitteeSubitem.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.data.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
+import com.jero.data.payCaseCommitteeSubitem.mapper.PayCaseCommitteeSubitemMapper;
+import com.jero.data.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @Description: pay_case_committee_subitem
+ * @Author: jeecg-boot
+ * @Date:   2021-08-27
+ * @Version: V1.0
+ */
+@Service
+public class PayCaseCommitteeSubitemServiceImpl extends ServiceImpl<PayCaseCommitteeSubitemMapper, PayCaseCommitteeSubitem> implements IPayCaseCommitteeSubitemService {
+
+
+}

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

@@ -0,0 +1,266 @@
+package com.jero.data.payDataDirectory.controller;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.data.payDataDirectory.entity.DTO.PayDataDirectoryDTO;
+import com.jero.data.payDataDirectory.entity.PayDataDirectory;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jero.data.payDataDirectory.entity.DirectoryToTree;
+import com.jero.data.payDataDirectory.mapper.PayDataDirectoryMapper;
+import com.jero.data.payDataDirectory.service.IPayDataDirectoryService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+
+ /**
+ * @Description: pay_data_directory
+ * @Author: zql
+ * @Date:   2021-08-30
+ * @Version: V1.0
+ */
+@Api(tags="资料目录管理")
+@RestController
+@RequestMapping("/payDataDirectory/payDataDirectory")
+@Slf4j
+public class PayDataDirectoryController extends JeroController<PayDataDirectory, IPayDataDirectoryService> {
+	 @Autowired
+	 private IPayDataDirectoryService payDataDirectoryService;
+	 @Resource
+	 private PayDataDirectoryMapper payDataDirectoryMapper;
+
+	 ArrayList<String> list = new ArrayList<>();
+	 ArrayList<PayDataDirectory> list2 = new ArrayList<>();
+
+	 /**
+	  * 资料目录树
+	  *
+	  * @return
+	  */
+	 @AutoLog(value = "资料目录管理-树")
+	 @ApiOperation(value = "资料目录管理-树", notes = "资料目录管理-树")
+	 @GetMapping(value = "/tree")
+	 public Result<?> tree() {
+		 QueryWrapper<PayDataDirectory> queryWrapper = new QueryWrapper();
+		 List<PayDataDirectory> list = payDataDirectoryService.list(queryWrapper);
+		 List<DirectoryToTree> collect = list.stream()
+				 .filter(payDataDirectory -> "0".equals(payDataDirectory.getParentId()))
+				 .map(payDataDirectory -> {
+					 DirectoryToTree directoryToTree = transtoTree(payDataDirectory, list);
+					 return directoryToTree;
+				 }).sorted(Comparator.comparing(DirectoryToTree::getSort))
+				 .collect(Collectors.toList());
+		 return Result.OK(collect);
+	 }
+
+	 /**
+	  * 转换为树
+	  * @param payDataDirectory 单个节点用于查找其子节点
+	  * @param list 所以节点集合
+	  * @return
+	  */
+	 private DirectoryToTree transtoTree(PayDataDirectory payDataDirectory, List<PayDataDirectory> list) {
+		 DirectoryToTree directoryToTree = new DirectoryToTree();
+		 BeanUtils.copyProperties(payDataDirectory, directoryToTree);
+		 List<PayDataDirectory> collect = list.stream()
+				 .filter(payDataDirectory1 -> payDataDirectory.getId().equals(payDataDirectory1.getParentId()))
+				 .map(
+						 payDataDirectory2 -> transtoTree(payDataDirectory2, list)
+
+				 ).sorted(Comparator.comparing(PayDataDirectory::getSort))
+				 .collect(Collectors.toList());
+
+		 directoryToTree.setChildren(collect);
+		 return directoryToTree;
+	 }
+
+	 /**
+	  * 添加
+	  *
+	  * @param payDataDirectoryDTO
+	  * @return
+	  */
+	 @AutoLog(value = "资料目录管理-新增")
+	 @ApiOperation(value = "资料目录管理-新增", notes = "资料目录管理-新增")
+	 @PostMapping(value = "/add")
+	 public Result<?> add(@Valid @RequestBody PayDataDirectoryDTO payDataDirectoryDTO) {
+		 LambdaQueryWrapper<PayDataDirectory> lambdaQueryWrapper = new LambdaQueryWrapper();
+		 lambdaQueryWrapper.eq(PayDataDirectory::getParentId, payDataDirectoryDTO.getParentId());
+		 List<PayDataDirectory> payDataDirectories = payDataDirectoryMapper.selectList(lambdaQueryWrapper);
+		 for(PayDataDirectory PayDataDirectory :payDataDirectories){
+			if(PayDataDirectory.getName().equals(payDataDirectoryDTO.getName())){
+				return Result.error("同级文件名重复，请重新输入。");
+			}
+		 }
+		 PayDataDirectory payDataDirectory = new PayDataDirectory();
+		 BeanUtils.copyProperties(payDataDirectoryDTO, payDataDirectory);
+		 payDataDirectoryService.save(payDataDirectory);
+		 return Result.OK("添加成功！");
+	 }
+
+	 /**
+	  * 批量删除
+	  *
+	  * @param ids
+	  * @return
+	  */
+	 @AutoLog(value = "资料目录管理-批量删除")
+	 @ApiOperation(value = "资料目录管理-批量删除", notes = "资料目录管理-批量删除")
+	 @PostMapping(value = "/deleteBatch")
+	 public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+		 List<String> ides = new ArrayList<>(Arrays.asList(ids.split(",")));
+		 for (String id : ides) {
+			 //查询子文件夹
+			 getPayDataDirectories(id);
+		 }
+		 //添加到主id集合进行删除
+		 for(String ID :list){
+		 	ides.add(ID);
+		 }
+		 this.payDataDirectoryService.removeByIds(ides);
+		 return Result.OK("批量删除成功!");
+	 }
+
+	 //递归查询子文件夹
+	 private void getPayDataDirectories(String id) {
+		 LambdaQueryWrapper<PayDataDirectory> lambdaQueryWrapper = new LambdaQueryWrapper();
+		 lambdaQueryWrapper.eq(PayDataDirectory::getParentId, id);
+		 List<PayDataDirectory> payDataDirectories = payDataDirectoryMapper.selectList(lambdaQueryWrapper);
+		 //判断有无子文件夹
+		 if(payDataDirectories.size()>0){
+		 for (PayDataDirectory payDataDirector : payDataDirectories) {
+			 list.add(payDataDirector.getId());
+			 getPayDataDirectories(payDataDirector.getId());
+		 }
+		 }
+	 }
+	 /**
+	  	 * 通过id查询
+	  	 *
+	  	 * @param name
+	  	 * @return
+	  	 */
+	@AutoLog(value = "资料目录管理-通过name查询")
+	@ApiOperation(value="资料目录管理-通过name查询", notes="资料目录管理-通过name查询")
+	@GetMapping(value = "/queryByName")
+	public Result<?> queryByName(@RequestParam(name="name",required=false) String name) {
+		QueryWrapper queryWrapper = new QueryWrapper();
+		queryWrapper.like(StringUtils.isNotBlank(name), "name", name);
+		List<PayDataDirectory> byName = payDataDirectoryMapper.selectList(queryWrapper);
+		for(PayDataDirectory payDataDirectory:byName) {
+			list2.add(payDataDirectory);
+			findToTree(payDataDirectory);
+
+		}
+		//转换为树
+		List<DirectoryToTree> directoryToTrees = tree2(list2);
+		list2.clear();
+		return Result.OK(directoryToTrees);
+	}
+
+	 /**
+	  * 查找次节点的所以父节点和根节点
+	  * @param payDataDirectory
+	  */
+	 private void findToTree(PayDataDirectory payDataDirectory) {
+		 LambdaQueryWrapper<PayDataDirectory> lambdaQueryWrapper = new LambdaQueryWrapper();
+		 lambdaQueryWrapper.eq(PayDataDirectory::getId, payDataDirectory.getParentId());
+		 PayDataDirectory one = payDataDirectoryService.getOne(lambdaQueryWrapper);
+		 if (!ObjectUtils.isEmpty(one)&&!list2.contains(one)) {
+			 list2.add(one);
+			 if (!"0".equals(one.getId())) {
+				 findToTree(one);
+
+			 }
+		 }
+	 }
+
+	 /**
+	  * 转换为树
+	  * @param list2
+	  * @return
+	  */
+	 public List<DirectoryToTree> tree2(ArrayList<PayDataDirectory> list2) {
+
+		 List<DirectoryToTree> collect = list2.stream()
+				 .filter(payDataDirectory -> "0".equals(payDataDirectory.getParentId()))
+				 .map(payDataDirectory -> {
+					 DirectoryToTree directoryToTree = transtoTree(payDataDirectory, list2);
+					 return directoryToTree;
+				 }).sorted(Comparator.comparing(DirectoryToTree::getSort))
+				 .collect(Collectors.toList());
+		 return collect;
+	 }
+
+
+	 /**
+	  *  编辑
+	  *
+	  * @param payDataDirectoryDTO
+	  * @return
+	  */
+	 @AutoLog(value = "资料目录管理-编辑")
+	 @ApiOperation(value="资料目录管理-编辑", notes="资料目录管理-编辑")
+	 @PutMapping(value = "/edit")
+	 public Result<?> edit(@RequestBody PayDataDirectoryDTO payDataDirectoryDTO) {
+		 PayDataDirectory payDataDirectory = new PayDataDirectory();
+		 BeanUtils.copyProperties(payDataDirectoryDTO,payDataDirectory);
+		 payDataDirectoryService.updateById(payDataDirectory);
+		 return Result.OK("编辑成功!");
+	 }
+
+	 /**
+	  *   通过id删除
+	  *
+	  * @param id
+	  * @return
+	  */
+	 @AutoLog(value = "资料目录管理-通过id查询")
+	 @ApiOperation(value="资料目录管理-通过id查询", notes="资料目录管理-通过id查询")
+	 @GetMapping(value = "/getOne")
+	 public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		 PayDataDirectory payDataDirectory = payDataDirectoryService.getById(id);
+		 return Result.OK(payDataDirectory);
+	 }
+//
+//
+//    /**
+//    * 导出excel
+//    *
+//    * @param request
+//    * @param payDataDirectory
+//    */
+//    @RequestMapping(value = "/exportXls")
+//    public ModelAndView exportXls(HttpServletRequest request, PayDataDirectory payDataDirectory) {
+//        return super.exportXls(request, payDataDirectory, PayDataDirectory.class, "pay_data_directory");
+//    }
+//
+//    /**
+//      * 通过excel导入数据
+//    *
+//    * @param request
+//    * @param response
+//    * @return
+//    */
+//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+//    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+//        return super.importExcel(request, response, PayDataDirectory.class);
+//    }
+
+
+ }

jero-boot-incoming-payment/src/main/java/com/jero/data/payDataDirectory/entity/DTO/PayDataDirectoryDTO.java

@@ -0,0 +1,30 @@
+package com.jero.data.payDataDirectory.entity.DTO;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class PayDataDirectoryDTO {
+    @NotBlank(message = "id不能为空")
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
+
+    @NotBlank(message = "父id不能为空")
+    @ApiModelProperty(value = "父id")
+    private java.lang.String parentId;
+
+    @NotBlank(message = "名称不能为空")
+    @ApiModelProperty(value = "名称")
+    private java.lang.String name;
+
+    @ApiModelProperty(value = "排序号")
+    private java.lang.String sort;
+
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remarks;
+
+//    @ApiModelProperty(value = "类型(1：分标委，2：会议)")
+//    private java.lang.Integer type;
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payDataDirectory/entity/DirectoryToTree.java

@@ -0,0 +1,13 @@
+package com.jero.data.payDataDirectory.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DirectoryToTree extends PayDataDirectory{
+
+    @ApiModelProperty(value = "子集")
+    private List<PayDataDirectory> children;
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payDataDirectory/entity/PayDataDirectory.java

@@ -0,0 +1,70 @@
+package com.jero.data.payDataDirectory.entity;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: pay_data_directory
+ * @Author: jeecg-boot
+ * @Date:   2021-08-30
+ * @Version: V1.0
+ */
+@Data
+@TableName("pay_data_directory")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="pay_data_directory对象", description="pay_data_directory")
+public class PayDataDirectory implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**父id*/
+	@Excel(name = "父id", width = 15)
+    @ApiModelProperty(value = "父id")
+    private java.lang.String parentId;
+	/**名称*/
+	@Excel(name = "名称", width = 15)
+    @ApiModelProperty(value = "名称")
+    private java.lang.String name;
+	/**排序号*/
+	@Excel(name = "排序号", width = 15)
+    @ApiModelProperty(value = "排序号")
+    private java.lang.String sort;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remarks;
+	/**类型(1：分标委，2：会议)*/
+	@Excel(name = "类型(1：分标委，2：会议)", width = 15)
+    @ApiModelProperty(value = "类型(1：分标委，2：会议)")
+    private java.lang.Integer type;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private java.util.Date updateTime;
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payDataDirectory/mapper/PayDataDirectoryMapper.java

@@ -0,0 +1,25 @@
+package com.jero.data.payDataDirectory.mapper;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.jero.data.payDataDirectory.entity.DirectoryToTree;
+import com.jero.data.payDataDirectory.entity.PayDataDirectory;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Description: pay_data_directory
+ * @Author: jeecg-boot
+ * @Date:   2021-08-30
+ * @Version: V1.0
+ */
+public interface PayDataDirectoryMapper extends BaseMapper<PayDataDirectory> {
+
+
+    List<DirectoryToTree> getByName(@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
+
+}
+

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.data.payDataDirectory.mapper.PayDataDirectoryMapper">
+<!--    <resultMap id="data" type="com.jero.data.payDataDirectory.entity.DirectoryToTree">-->
+<!--        <id property="id" column="id"></id>-->
+<!--        <result property="name" column="name"></result>-->
+<!--        <collection property="children" ofType="com.jero.data.payDataDirectory.entity.PayDataDirectory" javaType="java.util.List">-->
+<!--            <id property="id" column="id"></id>-->
+<!--            <result property="name" column="name"></result>-->
+<!--        </collection>-->
+<!--    </resultMap>-->
+<!--    <select id="getByName"  resultMap="data">-->
+<!--       SELECT * FROM pay_data_directory-->
+<!--         ${ew.customSqlSegment}-->
+<!--    </select>-->
+</mapper>

jero-boot-incoming-payment/src/main/java/com/jero/data/payDataDirectory/service/IPayDataDirectoryService.java

@@ -0,0 +1,15 @@
+package com.jero.data.payDataDirectory.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.data.payDataDirectory.entity.PayDataDirectory;
+
+/**
+ * @Description: pay_data_directory
+ * @Author: jeecg-boot
+ * @Date:   2021-08-30
+ * @Version: V1.0
+ */
+public interface IPayDataDirectoryService extends IService<PayDataDirectory> {
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payDataDirectory/service/impl/PayDataDirectoryServiceImpl.java

@@ -0,0 +1,19 @@
+package com.jero.data.payDataDirectory.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.data.payDataDirectory.entity.PayDataDirectory;
+import com.jero.data.payDataDirectory.mapper.PayDataDirectoryMapper;
+import com.jero.data.payDataDirectory.service.IPayDataDirectoryService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @Description: pay_data_directory
+ * @Author: jeecg-boot
+ * @Date:   2021-08-30
+ * @Version: V1.0
+ */
+@Service
+public class PayDataDirectoryServiceImpl extends ServiceImpl<PayDataDirectoryMapper, PayDataDirectory> implements IPayDataDirectoryService {
+
+}

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

@@ -0,0 +1,155 @@
+package com.jero.data.payDataFile.controller;
+
+import java.util.Arrays;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.data.payDataFile.entity.PayDataFile;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.data.payDataFile.service.IPayDataFileService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+ * @Description: pay_data_file
+ * @Author: jeecg-boot
+ * @Date:   2021-08-30
+ * @Version: V1.0
+ */
+@Api(tags="pay_data_file")
+@RestController
+@RequestMapping("/payDataFile/payDataFile")
+@Slf4j
+public class PayDataFileController extends JeroController<PayDataFile, IPayDataFileService> {
+	@Autowired
+	private IPayDataFileService payDataFileService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param payDataFile
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "pay_data_file-分页列表查询")
+	@ApiOperation(value="pay_data_file-分页列表查询", notes="pay_data_file-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(PayDataFile payDataFile,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<PayDataFile> queryWrapper = QueryGenerator.initQueryWrapper(payDataFile, req.getParameterMap());
+		Page<PayDataFile> page = new Page<PayDataFile>(pageNo, pageSize);
+		IPage<PayDataFile> pageList = payDataFileService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param payDataFile
+	 * @return
+	 */
+	@AutoLog(value = "pay_data_file-添加")
+	@ApiOperation(value="pay_data_file-添加", notes="pay_data_file-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody PayDataFile payDataFile) {
+		payDataFileService.save(payDataFile);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param payDataFile
+	 * @return
+	 */
+	@AutoLog(value = "pay_data_file-编辑")
+	@ApiOperation(value="pay_data_file-编辑", notes="pay_data_file-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@RequestBody PayDataFile payDataFile) {
+		payDataFileService.updateById(payDataFile);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "pay_data_file-通过id删除")
+	@ApiOperation(value="pay_data_file-通过id删除", notes="pay_data_file-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		payDataFileService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "pay_data_file-批量删除")
+	@ApiOperation(value="pay_data_file-批量删除", notes="pay_data_file-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.payDataFileService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "pay_data_file-通过id查询")
+	@ApiOperation(value="pay_data_file-通过id查询", notes="pay_data_file-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		PayDataFile payDataFile = payDataFileService.getById(id);
+		if(payDataFile==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(payDataFile);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param payDataFile
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, PayDataFile payDataFile) {
+        return super.exportXls(request, payDataFile, PayDataFile.class, "pay_data_file");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, PayDataFile.class);
+    }
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payDataFile/entity/PayDataFile.java

@@ -0,0 +1,62 @@
+package com.jero.data.payDataFile.entity;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: pay_data_file
+ * @Author: zql
+ * @Date:   2021-08-30
+ * @Version: V1.0
+ */
+@Data
+@TableName("pay_data_file")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="pay_data_file对象", description="pay_data_file")
+public class PayDataFile implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**资料目录id*/
+	@Excel(name = "资料目录id", width = 15)
+    @ApiModelProperty(value = "资料目录id")
+    private java.lang.String dataId;
+	/**文件id*/
+	@Excel(name = "文件id", width = 15)
+    @ApiModelProperty(value = "文件id")
+    private java.lang.String fileId;
+	/**文件目录*/
+	@Excel(name = "文件目录", width = 15)
+    @ApiModelProperty(value = "文件目录")
+    private java.lang.String filePath;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private java.util.Date updateTime;
+}

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

@@ -0,0 +1,14 @@
+package com.jero.data.payDataFile.mapper;
+
+import com.jero.data.payDataFile.entity.PayDataFile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: pay_data_file
+ * @Author: jeecg-boot
+ * @Date:   2021-08-30
+ * @Version: V1.0
+ */
+public interface PayDataFileMapper extends BaseMapper<PayDataFile> {
+
+}

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.demo.payDataFile.mapper.PayDataFileMapper">
+
+</mapper>

jero-boot-incoming-payment/src/main/java/com/jero/data/payDataFile/service/IPayDataFileService.java

@@ -0,0 +1,15 @@
+package com.jero.data.payDataFile.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.data.payDataFile.entity.PayDataFile;
+
+/**
+ * @Description: pay_data_file
+ * @Author: jeecg-boot
+ * @Date:   2021-08-30
+ * @Version: V1.0
+ */
+public interface IPayDataFileService extends IService<PayDataFile> {
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payDataFile/service/impl/PayDataFileServiceImpl.java

@@ -0,0 +1,20 @@
+package com.jero.data.payDataFile.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.data.payDataFile.entity.PayDataFile;
+import com.jero.data.payDataFile.mapper.PayDataFileMapper;
+import com.jero.data.payDataFile.service.IPayDataFileService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @Description: pay_data_file
+ * @Author: jeecg-boot
+ * @Date:   2021-08-30
+ * @Version: V1.0
+ */
+@Service
+public class PayDataFileServiceImpl extends ServiceImpl<PayDataFileMapper, PayDataFile> implements IPayDataFileService {
+
+}

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

@@ -0,0 +1,155 @@
+package com.jero.data.payDistributionRecord.controller;
+
+import java.util.Arrays;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.data.payDistributionRecord.entity.PayDistributionRecord;
+import com.jero.data.payDistributionRecord.service.IPayDistributionRecordService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+ * @Description: pay_distribution_record
+ * @Author: jeecg-boot
+ * @Date:   2021-08-30
+ * @Version: V1.0
+ */
+@Api(tags="pay_distribution_record")
+@RestController
+@RequestMapping("/payDistributionRecord/payDistributionRecord")
+@Slf4j
+public class PayDistributionRecordController extends JeroController<PayDistributionRecord, IPayDistributionRecordService> {
+	@Autowired
+	private IPayDistributionRecordService payDistributionRecordService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param payDistributionRecord
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "pay_distribution_record-分页列表查询")
+	@ApiOperation(value="pay_distribution_record-分页列表查询", notes="pay_distribution_record-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(PayDistributionRecord payDistributionRecord,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<PayDistributionRecord> queryWrapper = QueryGenerator.initQueryWrapper(payDistributionRecord, req.getParameterMap());
+		Page<PayDistributionRecord> page = new Page<PayDistributionRecord>(pageNo, pageSize);
+		IPage<PayDistributionRecord> pageList = payDistributionRecordService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param payDistributionRecord
+	 * @return
+	 */
+	@AutoLog(value = "pay_distribution_record-添加")
+	@ApiOperation(value="pay_distribution_record-添加", notes="pay_distribution_record-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody PayDistributionRecord payDistributionRecord) {
+		payDistributionRecordService.save(payDistributionRecord);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param payDistributionRecord
+	 * @return
+	 */
+	@AutoLog(value = "pay_distribution_record-编辑")
+	@ApiOperation(value="pay_distribution_record-编辑", notes="pay_distribution_record-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@RequestBody PayDistributionRecord payDistributionRecord) {
+		payDistributionRecordService.updateById(payDistributionRecord);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "pay_distribution_record-通过id删除")
+	@ApiOperation(value="pay_distribution_record-通过id删除", notes="pay_distribution_record-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		payDistributionRecordService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "pay_distribution_record-批量删除")
+	@ApiOperation(value="pay_distribution_record-批量删除", notes="pay_distribution_record-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.payDistributionRecordService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "pay_distribution_record-通过id查询")
+	@ApiOperation(value="pay_distribution_record-通过id查询", notes="pay_distribution_record-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		PayDistributionRecord payDistributionRecord = payDistributionRecordService.getById(id);
+		if(payDistributionRecord==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(payDistributionRecord);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param payDistributionRecord
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, PayDistributionRecord payDistributionRecord) {
+        return super.exportXls(request, payDistributionRecord, PayDistributionRecord.class, "pay_distribution_record");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, PayDistributionRecord.class);
+    }
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payDistributionRecord/entity/PayDistributionRecord.java

@@ -0,0 +1,62 @@
+package com.jero.data.payDistributionRecord.entity;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: pay_distribution_record
+ * @Author: jeecg-boot
+ * @Date:   2021-08-30
+ * @Version: V1.0
+ */
+@Data
+@TableName("pay_distribution_record")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="pay_distribution_record对象", description="pay_distribution_record")
+public class PayDistributionRecord implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**资料文件id*/
+	@Excel(name = "资料文件id", width = 15)
+    @ApiModelProperty(value = "资料文件id")
+    private java.lang.String dataFileId;
+	/**联系人id*/
+	@Excel(name = "联系人id", width = 15)
+    @ApiModelProperty(value = "联系人id")
+    private java.lang.String contactsId;
+	/**联系人名称*/
+	@Excel(name = "联系人名称", width = 15)
+    @ApiModelProperty(value = "联系人名称")
+    private java.lang.String contactsName;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private java.util.Date updateTime;
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payDistributionRecord/mapper/PayDistributionRecordMapper.java

@@ -0,0 +1,15 @@
+package com.jero.data.payDistributionRecord.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.data.payDistributionRecord.entity.PayDistributionRecord;
+
+/**
+ * @Description: pay_distribution_record
+ * @Author: jeecg-boot
+ * @Date:   2021-08-30
+ * @Version: V1.0
+ */
+public interface PayDistributionRecordMapper extends BaseMapper<PayDistributionRecord> {
+
+}

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.demo.payDistributionRecord.mapper.PayDistributionRecordMapper">
+
+</mapper>

jero-boot-incoming-payment/src/main/java/com/jero/data/payDistributionRecord/service/IPayDistributionRecordService.java

@@ -0,0 +1,15 @@
+package com.jero.data.payDistributionRecord.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.data.payDistributionRecord.entity.PayDistributionRecord;
+
+/**
+ * @Description: pay_distribution_record
+ * @Author: jeecg-boot
+ * @Date:   2021-08-30
+ * @Version: V1.0
+ */
+public interface IPayDistributionRecordService extends IService<PayDistributionRecord> {
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payDistributionRecord/service/impl/PayDistributionRecordServiceImpl.java

@@ -0,0 +1,20 @@
+package com.jero.data.payDistributionRecord.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.data.payDistributionRecord.entity.PayDistributionRecord;
+import com.jero.data.payDistributionRecord.mapper.PayDistributionRecordMapper;
+import com.jero.data.payDistributionRecord.service.IPayDistributionRecordService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @Description: pay_distribution_record
+ * @Author: jeecg-boot
+ * @Date:   2021-08-30
+ * @Version: V1.0
+ */
+@Service
+public class PayDistributionRecordServiceImpl extends ServiceImpl<PayDistributionRecordMapper, PayDistributionRecord> implements IPayDistributionRecordService {
+
+}

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

@@ -0,0 +1,155 @@
+package com.jero.data.payFileDownloadRecord.controller;
+
+import java.util.Arrays;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.data.payFileDownloadRecord.entity.PayFileDownloadRecord;
+import com.jero.data.payFileDownloadRecord.service.IPayFileDownloadRecordService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+ * @Description: pay_file_download_record
+ * @Author: jeecg-boot
+ * @Date:   2021-08-30
+ * @Version: V1.0
+ */
+@Api(tags="pay_file_download_record")
+@RestController
+@RequestMapping("/payFileDownloadRecord/payFileDownloadRecord")
+@Slf4j
+public class PayFileDownloadRecordController extends JeroController<PayFileDownloadRecord, IPayFileDownloadRecordService> {
+	@Autowired
+	private IPayFileDownloadRecordService payFileDownloadRecordService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param payFileDownloadRecord
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "pay_file_download_record-分页列表查询")
+	@ApiOperation(value="pay_file_download_record-分页列表查询", notes="pay_file_download_record-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(PayFileDownloadRecord payFileDownloadRecord,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<PayFileDownloadRecord> queryWrapper = QueryGenerator.initQueryWrapper(payFileDownloadRecord, req.getParameterMap());
+		Page<PayFileDownloadRecord> page = new Page<PayFileDownloadRecord>(pageNo, pageSize);
+		IPage<PayFileDownloadRecord> pageList = payFileDownloadRecordService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param payFileDownloadRecord
+	 * @return
+	 */
+	@AutoLog(value = "pay_file_download_record-添加")
+	@ApiOperation(value="pay_file_download_record-添加", notes="pay_file_download_record-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody PayFileDownloadRecord payFileDownloadRecord) {
+		payFileDownloadRecordService.save(payFileDownloadRecord);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param payFileDownloadRecord
+	 * @return
+	 */
+	@AutoLog(value = "pay_file_download_record-编辑")
+	@ApiOperation(value="pay_file_download_record-编辑", notes="pay_file_download_record-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@RequestBody PayFileDownloadRecord payFileDownloadRecord) {
+		payFileDownloadRecordService.updateById(payFileDownloadRecord);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "pay_file_download_record-通过id删除")
+	@ApiOperation(value="pay_file_download_record-通过id删除", notes="pay_file_download_record-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		payFileDownloadRecordService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "pay_file_download_record-批量删除")
+	@ApiOperation(value="pay_file_download_record-批量删除", notes="pay_file_download_record-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.payFileDownloadRecordService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "pay_file_download_record-通过id查询")
+	@ApiOperation(value="pay_file_download_record-通过id查询", notes="pay_file_download_record-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		PayFileDownloadRecord payFileDownloadRecord = payFileDownloadRecordService.getById(id);
+		if(payFileDownloadRecord==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(payFileDownloadRecord);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param payFileDownloadRecord
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, PayFileDownloadRecord payFileDownloadRecord) {
+        return super.exportXls(request, payFileDownloadRecord, PayFileDownloadRecord.class, "pay_file_download_record");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, PayFileDownloadRecord.class);
+    }
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payFileDownloadRecord/entity/PayFileDownloadRecord.java

@@ -0,0 +1,74 @@
+package com.jero.data.payFileDownloadRecord.entity;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: pay_file_download_record
+ * @Author: jeecg-boot
+ * @Date:   2021-08-30
+ * @Version: V1.0
+ */
+@Data
+@TableName("pay_file_download_record")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="pay_file_download_record对象", description="pay_file_download_record")
+public class PayFileDownloadRecord implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**文件id*/
+	@Excel(name = "文件id", width = 15)
+    @ApiModelProperty(value = "文件id")
+    private java.lang.String fileId;
+	/**文件名称*/
+	@Excel(name = "文件名称", width = 15)
+    @ApiModelProperty(value = "文件名称")
+    private java.lang.String fileName;
+	/**文件目录*/
+	@Excel(name = "文件目录", width = 15)
+    @ApiModelProperty(value = "文件目录")
+    private java.lang.String filePath;
+	/**企业名称*/
+	@Excel(name = "企业名称", width = 15)
+    @ApiModelProperty(value = "企业名称")
+    private java.lang.String companyName;
+	/**下载用户名称*/
+	@Excel(name = "下载用户名称", width = 15)
+    @ApiModelProperty(value = "下载用户名称")
+    private java.lang.String downloadName;
+	/**会议名称*/
+	@Excel(name = "会议名称", width = 15)
+    @ApiModelProperty(value = "会议名称")
+    private java.lang.String meetingName;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private java.util.Date updateTime;
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payFileDownloadRecord/mapper/PayFileDownloadRecordMapper.java

@@ -0,0 +1,16 @@
+package com.jero.data.payFileDownloadRecord.mapper;
+
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.data.payFileDownloadRecord.entity.PayFileDownloadRecord;
+
+/**
+ * @Description: pay_file_download_record
+ * @Author: jeecg-boot
+ * @Date:   2021-08-30
+ * @Version: V1.0
+ */
+public interface PayFileDownloadRecordMapper extends BaseMapper<PayFileDownloadRecord> {
+
+}

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.demo.payFileDownloadRecord.mapper.PayFileDownloadRecordMapper">
+
+</mapper>

jero-boot-incoming-payment/src/main/java/com/jero/data/payFileDownloadRecord/service/IPayFileDownloadRecordService.java

@@ -0,0 +1,15 @@
+package com.jero.data.payFileDownloadRecord.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.data.payFileDownloadRecord.entity.PayFileDownloadRecord;
+
+/**
+ * @Description: pay_file_download_record
+ * @Author: jeecg-boot
+ * @Date:   2021-08-30
+ * @Version: V1.0
+ */
+public interface IPayFileDownloadRecordService extends IService<PayFileDownloadRecord> {
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/data/payFileDownloadRecord/service/impl/PayFileDownloadRecordServiceImpl.java

@@ -0,0 +1,20 @@
+package com.jero.data.payFileDownloadRecord.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.data.payFileDownloadRecord.entity.PayFileDownloadRecord;
+import com.jero.data.payFileDownloadRecord.mapper.PayFileDownloadRecordMapper;
+import com.jero.data.payFileDownloadRecord.service.IPayFileDownloadRecordService;
+import org.springframework.stereotype.Service;
+
+
+
+/**
+ * @Description: pay_file_download_record
+ * @Author: jeecg-boot
+ * @Date:   2021-08-30
+ * @Version: V1.0
+ */
+@Service
+public class PayFileDownloadRecordServiceImpl extends ServiceImpl<PayFileDownloadRecordMapper, PayFileDownloadRecord> implements IPayFileDownloadRecordService {
+
+}