修改结构

This commit is contained in:
zhangqinlin
2021-09-01 10:23:38 +08:00
parent 26dff9f3f2
commit 648520e6d3
44 changed files with 101 additions and 101 deletions
@@ -1,4 +1,4 @@
package com.jero.data.payCaseCommittee.controller;
package com.jero.data.controller;
import java.util.*;
import java.util.stream.Collectors;
@@ -13,12 +13,12 @@ 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 com.jero.data.entity.DTO.PayCaseCommitteeDTO;
import com.jero.data.entity.DTO.PayCaseCommitteeUpdateDTO;
import com.jero.data.entity.PayCaseCommittee;
import com.jero.data.service.IPayCaseCommitteeService;
import com.jero.data.entity.PayCaseCommitteeSubitem;
import com.jero.data.service.IPayCaseCommitteeSubitemService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -1,4 +1,4 @@
package com.jero.data.payCaseCommitteeSubitem.controller;
package com.jero.data.controller;
import java.util.Arrays;
import java.util.List;
@@ -11,12 +11,12 @@ 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 com.jero.data.entity.DTO.PayCaseCommitteeSubitemDTO;
import com.jero.data.entity.PayCaseCommitteeSubitem;
import com.jero.data.entity.VO.payCaseCommitteeSubitemVO;
import com.jero.data.entity.FindByName;
import com.jero.data.mapper.PayCaseCommitteeSubitemMapper;
import com.jero.data.service.IPayCaseCommitteeSubitemService;
import io.swagger.annotations.ApiImplicitParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -1,4 +1,4 @@
package com.jero.data.payDataDirectory.controller;
package com.jero.data.controller;
import java.util.ArrayList;
import java.util.Arrays;
@@ -13,12 +13,12 @@ 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.jero.data.entity.DTO.PayDataDirectoryDTO;
import com.jero.data.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 com.jero.data.entity.DirectoryToTree;
import com.jero.data.mapper.PayDataDirectoryMapper;
import com.jero.data.service.IPayDataDirectoryService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -1,4 +1,4 @@
package com.jero.data.payDataFile.controller;
package com.jero.data.controller;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
@@ -8,11 +8,11 @@ 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.jero.data.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 com.jero.data.service.IPayDataFileService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -1,4 +1,4 @@
package com.jero.data.payDistributionRecord.controller;
package com.jero.data.controller;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
@@ -11,8 +11,8 @@ 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 com.jero.data.entity.PayDistributionRecord;
import com.jero.data.service.IPayDistributionRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -1,4 +1,4 @@
package com.jero.data.payFileDownloadRecord.controller;
package com.jero.data.controller;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
@@ -11,8 +11,8 @@ 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 com.jero.data.entity.PayFileDownloadRecord;
import com.jero.data.service.IPayFileDownloadRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -1,4 +1,4 @@
package com.jero.data.payCaseCommitteeSubitem.entity;
package com.jero.data.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -1,4 +1,4 @@
package com.jero.data.payCaseCommittee.entity.DTO;
package com.jero.data.entity.DTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -1,4 +1,4 @@
package com.jero.data.payCaseCommitteeSubitem.entity.DTO;
package com.jero.data.entity.DTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -1,4 +1,4 @@
package com.jero.data.payCaseCommittee.entity.DTO;
package com.jero.data.entity.DTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -1,4 +1,4 @@
package com.jero.data.payDataDirectory.entity.DTO;
package com.jero.data.entity.DTO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -1,4 +1,4 @@
package com.jero.data.payDataDirectory.entity;
package com.jero.data.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -1,4 +1,4 @@
package com.jero.data.payCaseCommitteeSubitem.entity;
package com.jero.data.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -1,4 +1,4 @@
package com.jero.data.payCaseCommittee.entity;
package com.jero.data.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -1,4 +1,4 @@
package com.jero.data.payCaseCommitteeSubitem.entity;
package com.jero.data.entity;
import java.io.Serializable;
@@ -1,4 +1,4 @@
package com.jero.data.payDataDirectory.entity;
package com.jero.data.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -1,4 +1,4 @@
package com.jero.data.payDataFile.entity;
package com.jero.data.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -1,4 +1,4 @@
package com.jero.data.payDistributionRecord.entity;
package com.jero.data.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -1,4 +1,4 @@
package com.jero.data.payFileDownloadRecord.entity;
package com.jero.data.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -1,4 +1,4 @@
package com.jero.data.payCaseCommitteeSubitem.entity.VO;
package com.jero.data.entity.VO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -1,8 +1,8 @@
package com.jero.data.payCaseCommittee.mapper;
package com.jero.data.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.data.payCaseCommittee.entity.PayCaseCommittee;
import com.jero.data.entity.PayCaseCommittee;
/**
* @Description: pay_case_committee
@@ -1,14 +1,14 @@
package com.jero.data.payCaseCommitteeSubitem.mapper;
package com.jero.data.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.jero.data.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 com.jero.data.entity.VO.payCaseCommitteeSubitemVO;
import com.jero.data.entity.FindByName;
import org.apache.ibatis.annotations.Param;
@@ -1,11 +1,11 @@
package com.jero.data.payDataDirectory.mapper;
package com.jero.data.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 com.jero.data.entity.DirectoryToTree;
import com.jero.data.entity.PayDataDirectory;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -1,6 +1,6 @@
package com.jero.data.payDataFile.mapper;
package com.jero.data.mapper;
import com.jero.data.payDataFile.entity.PayDataFile;
import com.jero.data.entity.PayDataFile;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
@@ -1,8 +1,8 @@
package com.jero.data.payDistributionRecord.mapper;
package com.jero.data.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.data.payDistributionRecord.entity.PayDistributionRecord;
import com.jero.data.entity.PayDistributionRecord;
/**
* @Description: pay_distribution_record
@@ -1,9 +1,9 @@
package com.jero.data.payFileDownloadRecord.mapper;
package com.jero.data.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.data.payFileDownloadRecord.entity.PayFileDownloadRecord;
import com.jero.data.entity.PayFileDownloadRecord;
/**
* @Description: pay_file_download_record
@@ -1,10 +1,10 @@
<?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">
<mapper namespace="com.jero.data.mapper.PayCaseCommitteeSubitemMapper">
<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.payCaseCommitteeSubitem.entity.ChildrenFindByName" javaType="java.util.List">
<collection property="list" ofType="com.jero.data.entity.ChildrenFindByName" javaType="java.util.List">
<result property="companyName" column="companyName"></result>
<result property="post" column="post"></result>
<result property="phone" column="phone"></result>
@@ -21,7 +21,7 @@
</select>
<select id="list2" resultType="com.jero.data.payCaseCommitteeSubitem.entity.VO.payCaseCommitteeSubitemVO">
<select id="list2" resultType="com.jero.data.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
@@ -1,10 +1,10 @@
<?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">-->
<mapper namespace="com.jero.data.mapper.PayDataDirectoryMapper">
<!-- <resultMap id="data" type="com.jero.data.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">-->
<!-- <collection property="children" ofType="com.jero.data.entity.PayDataDirectory" javaType="java.util.List">-->
<!-- <id property="id" column="id"></id>-->
<!-- <result property="name" column="name"></result>-->
<!-- </collection>-->
@@ -1,6 +1,6 @@
package com.jero.data.payCaseCommittee.service;
package com.jero.data.service;
import com.jero.data.payCaseCommittee.entity.PayCaseCommittee;
import com.jero.data.entity.PayCaseCommittee;
import com.baomidou.mybatisplus.extension.service.IService;
/**
@@ -1,8 +1,8 @@
package com.jero.data.payCaseCommitteeSubitem.service;
package com.jero.data.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.data.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
import com.jero.data.entity.PayCaseCommitteeSubitem;
/**
* @Description: pay_case_committee_subitem
@@ -1,8 +1,8 @@
package com.jero.data.payDataDirectory.service;
package com.jero.data.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.data.payDataDirectory.entity.PayDataDirectory;
import com.jero.data.entity.PayDataDirectory;
/**
* @Description: pay_data_directory
@@ -1,8 +1,8 @@
package com.jero.data.payDataFile.service;
package com.jero.data.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.data.payDataFile.entity.PayDataFile;
import com.jero.data.entity.PayDataFile;
/**
* @Description: pay_data_file
@@ -1,8 +1,8 @@
package com.jero.data.payDistributionRecord.service;
package com.jero.data.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.data.payDistributionRecord.entity.PayDistributionRecord;
import com.jero.data.entity.PayDistributionRecord;
/**
* @Description: pay_distribution_record
@@ -1,8 +1,8 @@
package com.jero.data.payFileDownloadRecord.service;
package com.jero.data.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.data.payFileDownloadRecord.entity.PayFileDownloadRecord;
import com.jero.data.entity.PayFileDownloadRecord;
/**
* @Description: pay_file_download_record
@@ -1,10 +1,10 @@
package com.jero.data.payCaseCommittee.service.impl;
package com.jero.data.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 com.jero.data.entity.PayCaseCommittee;
import com.jero.data.mapper.PayCaseCommitteeMapper;
import com.jero.data.service.IPayCaseCommitteeService;
import org.springframework.stereotype.Service;
@@ -1,10 +1,10 @@
package com.jero.data.payCaseCommitteeSubitem.service.impl;
package com.jero.data.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 com.jero.data.entity.PayCaseCommitteeSubitem;
import com.jero.data.mapper.PayCaseCommitteeSubitemMapper;
import com.jero.data.service.IPayCaseCommitteeSubitemService;
import org.springframework.stereotype.Service;
@@ -1,9 +1,9 @@
package com.jero.data.payDataDirectory.service.impl;
package com.jero.data.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 com.jero.data.entity.PayDataDirectory;
import com.jero.data.mapper.PayDataDirectoryMapper;
import com.jero.data.service.IPayDataDirectoryService;
import org.springframework.stereotype.Service;
@@ -1,10 +1,10 @@
package com.jero.data.payDataFile.service.impl;
package com.jero.data.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 com.jero.data.entity.PayDataFile;
import com.jero.data.mapper.PayDataFileMapper;
import com.jero.data.service.IPayDataFileService;
import org.springframework.stereotype.Service;
@@ -1,10 +1,10 @@
package com.jero.data.payDistributionRecord.service.impl;
package com.jero.data.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 com.jero.data.entity.PayDistributionRecord;
import com.jero.data.mapper.PayDistributionRecordMapper;
import com.jero.data.service.IPayDistributionRecordService;
import org.springframework.stereotype.Service;
@@ -1,9 +1,9 @@
package com.jero.data.payFileDownloadRecord.service.impl;
package com.jero.data.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 com.jero.data.entity.PayFileDownloadRecord;
import com.jero.data.mapper.PayFileDownloadRecordMapper;
import com.jero.data.service.IPayFileDownloadRecordService;
import org.springframework.stereotype.Service;