diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java index 938942c4..c8eef2cd 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java @@ -41,7 +41,7 @@ public class DictAspect { private CommonAPI commonAPI; // 定义切点Pointcut - @Pointcut("execution(public * com.jero.modules..*.*Controller.*(..))") + @Pointcut("execution(public * com.jero.modules..*.*Controller.*(..)) || execution(public * com.jero..*.*Controller.*(..))") public void excudeService() { } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/common/PayProjectCommon.java similarity index 97% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/common/PayProjectCommon.java index a22b5825..ba21a0bd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/common/PayProjectCommon.java @@ -1,4 +1,4 @@ -package com.jero.project.common; +package com.jero.commonProject.common; public class PayProjectCommon { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayCommonProjectController.java similarity index 90% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayCommonProjectController.java index a4755f5e..877c4714 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayCommonProjectController.java @@ -1,4 +1,4 @@ -package com.jero.project.controller; +package com.jero.commonProject.controller; import java.util.Arrays; import java.util.Objects; @@ -9,10 +9,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.ValidUtil; -import com.jero.company.entity.PayCompanyManagement; -import com.jero.project.common.PayProjectCommon; -import com.jero.project.service.IPayCommonProjectService; -import com.jero.project.entity.PayCommonProject; +import com.jero.commonProject.common.PayProjectCommon; +import com.jero.commonProject.service.IPayCommonProjectService; +import com.jero.commonProject.entity.PayCommonProject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -50,21 +49,23 @@ public class PayCommonProjectController extends JeroController queryPageList(PayCommonProject payCommonProject, + public Result> queryPageList(PayCommonProject payCommonProject, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="paymentDate",required = false) String paymentDate, HttpServletRequest req) { - if(!StringUtils.isBlank(payCommonProject.getChargeProject()) && payCommonProject.getChargeProject().length() > 100){ - return Result.error("来款项目长度应小于100个字符"); - } - if(!StringUtils.isBlank(payCommonProject.getChargeCompanyName()) && payCommonProject.getChargeCompanyName().length() > 50){ - return Result.error("来款单位长度应小于50个字符"); - } - +// if(!StringUtils.isBlank(payCommonProject.getChargeProject()) && payCommonProject.getChargeProject().length() > 100){ +// return Result.error("来款项目长度应小于100个字符"); +// } +// if(!StringUtils.isBlank(payCommonProject.getChargeCompanyName()) && payCommonProject.getChargeCompanyName().length() > 50){ +// return Result.error("来款单位长度应小于50个字符"); +// } + Result> result = new Result<>(); Page page = new Page(pageNo, pageSize); IPage pageList = payCommonProjectService.queryPageList(page, payCommonProject, paymentDate); - return Result.OK(pageList); + result.setSuccess(true); + result.setResult(pageList); + return result; } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayWorkingGroupController.java similarity index 96% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayWorkingGroupController.java index ec063a8e..9cdfb602 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayWorkingGroupController.java @@ -1,15 +1,14 @@ -package com.jero.project.controller; +package com.jero.commonProject.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.project.service.IPayWorkingGroupService; -import com.jero.project.entity.PayWorkingGroup; +import com.jero.commonProject.service.IPayWorkingGroupService; +import com.jero.commonProject.entity.PayWorkingGroup; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayWorkingGroupSubitemController.java similarity index 96% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubitemController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayWorkingGroupSubitemController.java index 99bd8190..6cac126f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayWorkingGroupSubitemController.java @@ -1,4 +1,4 @@ -package com.jero.project.controller; +package com.jero.commonProject.controller; import java.util.Arrays; import javax.servlet.http.HttpServletRequest; @@ -7,8 +7,8 @@ import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; -import com.jero.project.entity.PayWorkingGroupSubitem; -import com.jero.project.service.IPayWorkingGroupSubitemService; +import com.jero.commonProject.entity.PayWorkingGroupSubitem; +import com.jero.commonProject.service.IPayWorkingGroupSubitemService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayCommonProject.java similarity index 99% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayCommonProject.java index 04d5e745..1321bb75 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayCommonProject.java @@ -1,4 +1,4 @@ -package com.jero.project.entity; +package com.jero.commonProject.entity; import java.io.Serializable; import java.sql.Date; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayWorkingGroup.java similarity index 99% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayWorkingGroup.java index 5d6fdb58..04760483 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayWorkingGroup.java @@ -1,4 +1,4 @@ -package com.jero.project.entity; +package com.jero.commonProject.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayWorkingGroupSubitem.java similarity index 99% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubitem.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayWorkingGroupSubitem.java index 3e5388ba..42e98c9f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayWorkingGroupSubitem.java @@ -1,4 +1,4 @@ -package com.jero.project.entity; +package com.jero.commonProject.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayCommonProjectMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayCommonProjectMapper.java similarity index 89% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayCommonProjectMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayCommonProjectMapper.java index 5d5f817c..2482bbf8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayCommonProjectMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayCommonProjectMapper.java @@ -1,8 +1,8 @@ -package com.jero.project.mapper; +package com.jero.commonProject.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.project.entity.PayCommonProject; +import com.jero.commonProject.entity.PayCommonProject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupMapper.java similarity index 72% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupMapper.java index 2ddbf284..f86c6397 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupMapper.java @@ -1,6 +1,6 @@ -package com.jero.project.mapper; +package com.jero.commonProject.mapper; -import com.jero.project.entity.PayWorkingGroup; +import com.jero.commonProject.entity.PayWorkingGroup; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupSubitemMapper.java similarity index 72% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubitemMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupSubitemMapper.java index a4c7667d..eb7fd37d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupSubitemMapper.java @@ -1,6 +1,6 @@ -package com.jero.project.mapper; +package com.jero.commonProject.mapper; -import com.jero.project.entity.PayWorkingGroupSubitem; +import com.jero.commonProject.entity.PayWorkingGroupSubitem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayCommonProjectMapper.xml similarity index 94% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayCommonProjectMapper.xml index c1cafcc1..d229eb5b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayCommonProjectMapper.xml @@ -1,8 +1,8 @@ - + - SELECT pcp.id, pcp.charge_project AS chargeProject, diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupMapper.xml similarity index 68% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupMapper.xml index 43808909..2308df1f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupSubitemMapper.xml similarity index 66% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubitemMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupSubitemMapper.xml index e917253c..83700b14 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupSubitemMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayCommonProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayCommonProjectService.java similarity index 86% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayCommonProjectService.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayCommonProjectService.java index 6789d6cd..e15a743a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayCommonProjectService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayCommonProjectService.java @@ -1,8 +1,8 @@ -package com.jero.project.service; +package com.jero.commonProject.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.project.entity.PayCommonProject; +import com.jero.commonProject.entity.PayCommonProject; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupService.java similarity index 72% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupService.java index 5f66fab8..c07f4afb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupService.java @@ -1,6 +1,6 @@ -package com.jero.project.service; +package com.jero.commonProject.service; -import com.jero.project.entity.PayWorkingGroup; +import com.jero.commonProject.entity.PayWorkingGroup; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupSubitemService.java similarity index 72% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubitemService.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupSubitemService.java index 98e8c4d7..7f2963cc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupSubitemService.java @@ -1,6 +1,6 @@ -package com.jero.project.service; +package com.jero.commonProject.service; -import com.jero.project.entity.PayWorkingGroupSubitem; +import com.jero.commonProject.entity.PayWorkingGroupSubitem; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayCommonProjectServiceImpl.java similarity index 79% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayCommonProjectServiceImpl.java index 43cd1221..61359056 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayCommonProjectServiceImpl.java @@ -1,10 +1,10 @@ -package com.jero.project.service.impl; +package com.jero.commonProject.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.project.service.IPayCommonProjectService; -import com.jero.project.entity.PayCommonProject; -import com.jero.project.mapper.PayCommonProjectMapper; +import com.jero.commonProject.service.IPayCommonProjectService; +import com.jero.commonProject.entity.PayCommonProject; +import com.jero.commonProject.mapper.PayCommonProjectMapper; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupServiceImpl.java similarity index 62% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupServiceImpl.java index 9b378ab7..bc000af2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupServiceImpl.java @@ -1,8 +1,8 @@ -package com.jero.project.service.impl; +package com.jero.commonProject.service.impl; -import com.jero.project.service.IPayWorkingGroupService; -import com.jero.project.entity.PayWorkingGroup; -import com.jero.project.mapper.PayWorkingGroupMapper; +import com.jero.commonProject.service.IPayWorkingGroupService; +import com.jero.commonProject.entity.PayWorkingGroup; +import com.jero.commonProject.mapper.PayWorkingGroupMapper; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupSubitemServiceImpl.java similarity index 62% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubitemServiceImpl.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupSubitemServiceImpl.java index 7bfcd137..aeabf107 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupSubitemServiceImpl.java @@ -1,8 +1,8 @@ -package com.jero.project.service.impl; +package com.jero.commonProject.service.impl; -import com.jero.project.service.IPayWorkingGroupSubitemService; -import com.jero.project.entity.PayWorkingGroupSubitem; -import com.jero.project.mapper.PayWorkingGroupSubitemMapper; +import com.jero.commonProject.service.IPayWorkingGroupSubitemService; +import com.jero.commonProject.entity.PayWorkingGroupSubitem; +import com.jero.commonProject.mapper.PayWorkingGroupSubitemMapper; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;