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

字典翻译修改，包名修改

Browse Source
This commit is contained in:
梁琦涛
2021-08-31 09:48:13 +08:00
parent c05c66bd8e
commit 0928f7e649
20 changed files with 54 additions and 54 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/common/aspect/DictAspect.java
+1 -1
View File
@@ -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() {
}
jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java → jero-boot-incoming-payment/src/main/java/com/jero/commonProject/common/PayProjectCommon.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.jero.project.common;
package com.jero.commonProject.common;
public class PayProjectCommon {
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java → jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayCommonProjectController.java
+15 -14
View File
@@ -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<PayCommonProject,
*/
@ApiOperation(value="普通项目管理-分页列表查询", notes="普通项目管理-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(PayCommonProject payCommonProject,
public Result<IPage<PayCommonProject>> 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<IPage<PayCommonProject>> result = new Result<>();
Page<PayCommonProject> page = new Page<PayCommonProject>(pageNo, pageSize);
IPage<PayCommonProject> pageList = payCommonProjectService.queryPageList(page, payCommonProject, paymentDate);
return Result.OK(pageList);
result.setSuccess(true);
result.setResult(pageList);
return result;
}
/**
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java → jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayWorkingGroupController.java
+3 -4
View File
@@ -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;
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubitemController.java → jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayWorkingGroupSubitemController.java
+3 -3
View File
@@ -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;
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java → jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayCommonProject.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.jero.project.entity;
package com.jero.commonProject.entity;
import java.io.Serializable;
import java.sql.Date;
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java → jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayWorkingGroup.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.jero.project.entity;
package com.jero.commonProject.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubitem.java → jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayWorkingGroupSubitem.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.jero.project.entity;
package com.jero.commonProject.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayCommonProjectMapper.java → jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayCommonProjectMapper.java
+2 -2
View File
@@ -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;
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java → jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupMapper.java
+2 -2
View File
@@ -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;
/**
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubitemMapper.java → jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupSubitemMapper.java
+2 -2
View File
@@ -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;
/**
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml → jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayCommonProjectMapper.xml
+2 -2
View File
@@ -1,8 +1,8 @@
<?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.project.mapper.PayCommonProjectMapper">
<mapper namespace="com.jero.commonProject.mapper.PayCommonProjectMapper">
<select id="queryPageList" resultType="com.jero.project.entity.PayCommonProject">
<select id="queryPageList" resultType="com.jero.commonProject.entity.PayCommonProject">
SELECT
pcp.id,
pcp.charge_project AS chargeProject,
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml → jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupMapper.xml
+1 -1
View File
@@ -1,5 +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="com.jero.project.mapper.PayWorkingGroupMapper">
<mapper namespace="com.jero.commonProject.mapper.PayWorkingGroupMapper">
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubitemMapper.xml → jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupSubitemMapper.xml
+1 -1
View File
@@ -1,5 +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="com.jero.project.mapper.PayWorkingGroupSubitemMapper">
<mapper namespace="com.jero.commonProject.mapper.PayWorkingGroupSubitemMapper">
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayCommonProjectService.java → jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayCommonProjectService.java
+2 -2
View File
@@ -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;
/**
jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java → jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupService.java
+2 -2
View File
@@ -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;
/**
jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubitemService.java → jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupSubitemService.java
+2 -2
View File
@@ -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;
/**
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java → jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayCommonProjectServiceImpl.java
+4 -4
View File
@@ -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;
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java → jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupServiceImpl.java
+4 -4
View File
@@ -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;
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubitemServiceImpl.java → jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupSubitemServiceImpl.java
+4 -4
View File
@@ -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;