LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
梁琦涛
2021-08-26 18:05:50 +08:00
parent f22c41456e 4fabf20ad2
commit c81d3142a9
14 changed files with 31 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/mybatis/MybatisPlusConfig.java
+1 -1
View File
@@ -26,7 +26,7 @@ import java.util.List;
*
*/
@Configuration
@MapperScan(value={"com.jero.**.mapper*"})
@MapperScan(value={"com.jero.member.mapper"})
public class MybatisPlusConfig {
/**
jero-boot-incoming-payment/src/main/java/com/jero/controller/MemberProjectController.java → jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectController.java
+3 -3
View File
@@ -1,4 +1,4 @@
package com.jero.controller;
package com.jero.member.controller;
import java.util.Arrays;
import java.util.List;
@@ -6,8 +6,8 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.entity.MemberProject;
import com.jero.service.IMemberProjectService;
import com.jero.member.entity.MemberProject;
import com.jero.member.service.IMemberProjectService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
jero-boot-incoming-payment/src/main/java/com/jero/controller/MemberProjectSubitemController.java → jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectSubitemController.java
+3 -4
View File
@@ -1,4 +1,4 @@
package com.jero.controller;
package com.jero.member.controller;
import java.util.Arrays;
import java.util.List;
@@ -7,14 +7,13 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.entity.MemberProjectSubitem;
import com.jero.service.IMemberProjectSubitemService;
import com.jero.member.entity.MemberProjectSubitem;
import com.jero.member.service.IMemberProjectSubitemService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import com.jero.common.system.base.controller.JeroController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
jero-boot-incoming-payment/src/main/java/com/jero/entity/MemberProject.java → jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProject.java
+1 -5
View File
@@ -1,8 +1,6 @@
package com.jero.entity;
package com.jero.member.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -11,12 +9,10 @@ import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
/**
jero-boot-incoming-payment/src/main/java/com/jero/entity/MemberProjectSubitem.java → jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProjectSubitem.java
+1 -5
View File
@@ -1,8 +1,6 @@
package com.jero.entity;
package com.jero.member.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -11,12 +9,10 @@ import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
/**
jero-boot-incoming-payment/src/main/java/com/jero/mapper/MemberProjectMapper.java → jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/MemberProjectMapper.java
+2 -5
View File
@@ -1,9 +1,6 @@
package com.jero.mapper;
package com.jero.member.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.jero.entity.MemberProject;
import com.jero.member.entity.MemberProject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
jero-boot-incoming-payment/src/main/java/com/jero/mapper/MemberProjectSubitemMapper.java → jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/MemberProjectSubitemMapper.java
+2 -5
View File
@@ -1,9 +1,6 @@
package com.jero.mapper;
package com.jero.member.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.jero.entity.MemberProjectSubitem;
import com.jero.member.entity.MemberProjectSubitem;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
jero-boot-incoming-payment/src/main/java/com/jero/mapper/xml/MemberProjectMapper.xml → jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/MemberProjectMapper.xml
+2 -2
View File
@@ -1,7 +1,7 @@
<?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.mapper.MemberProjectMapper">
<resultMap id="MemberProjectResultMap" type="com.jero.entity.MemberProject">
<mapper namespace="com.jero.member.mapper.MemberProjectMapper">
<resultMap id="MemberProjectResultMap" type="com.jero.member.entity.MemberProject">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
jero-boot-incoming-payment/src/main/java/com/jero/mapper/xml/MemberProjectSubitemMapper.xml → jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/MemberProjectSubitemMapper.xml
+2 -2
View File
@@ -1,7 +1,7 @@
<?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.mapper.MemberProjectSubitemMapper">
<resultMap id="MemberProjectSubitemResultMap" type="com.jero.entity.MemberProjectSubitem">
<mapper namespace="com.jero.member.mapper.MemberProjectSubitemMapper">
<resultMap id="MemberProjectSubitemResultMap" type="com.jero.member.entity.MemberProjectSubitem">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
jero-boot-incoming-payment/src/main/java/com/jero/service/IMemberProjectService.java → jero-boot-incoming-payment/src/main/java/com/jero/member/service/IMemberProjectService.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.jero.service;
package com.jero.member.service;
import com.jero.entity.MemberProject;
import com.jero.member.entity.MemberProject;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
jero-boot-incoming-payment/src/main/java/com/jero/service/IMemberProjectSubitemService.java → jero-boot-incoming-payment/src/main/java/com/jero/member/service/IMemberProjectSubitemService.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.jero.service;
package com.jero.member.service;
import com.jero.entity.MemberProjectSubitem;
import com.jero.member.entity.MemberProjectSubitem;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
jero-boot-incoming-payment/src/main/java/com/jero/service/impl/MemberProjectServiceImpl.java → jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/MemberProjectServiceImpl.java
+5 -5
View File
@@ -1,11 +1,11 @@
package com.jero.service.impl;
package com.jero.member.service.impl;
import com.jero.entity.MemberProject;
import com.jero.mapper.MemberProjectMapper;
import com.jero.service.IMemberProjectService;
import com.jero.member.entity.MemberProject;
import com.jero.member.mapper.MemberProjectMapper;
import com.jero.member.service.IMemberProjectService;
import org.springframework.stereotype.Service;
import java.util.List;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
jero-boot-incoming-payment/src/main/java/com/jero/service/impl/MemberProjectSubitemServiceImpl.java → jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/MemberProjectSubitemServiceImpl.java
+4 -4
View File
@@ -1,8 +1,8 @@
package com.jero.service.impl;
package com.jero.member.service.impl;
import com.jero.entity.MemberProjectSubitem;
import com.jero.mapper.MemberProjectSubitemMapper;
import com.jero.service.IMemberProjectSubitemService;
import com.jero.member.entity.MemberProjectSubitem;
import com.jero.member.mapper.MemberProjectSubitemMapper;
import com.jero.member.service.IMemberProjectSubitemService;
import org.springframework.stereotype.Service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
jero-boot-incoming-payment/src/main/java/com/jero/vo/AVO.java → jero-boot-incoming-payment/src/main/java/com/jero/member/vo/AVO.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.jero.vo;
package com.jero.member.vo;
/**
* @author liJiaRao