From 849ca76ad1f71208a678fcfeac6ae75b9a2a26da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Wed, 20 Oct 2021 09:25:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=88=E5=90=8C=E6=9D=83?= =?UTF-8?q?=E9=99=90=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayIncomeContractController.java | 5 +++ .../PaySpendingContractController.java | 10 ++++- .../mapper/PaySpendingContractMapper.java | 5 +-- .../mapper/xml/PayIncomeContractMapper.xml | 3 ++ .../mapper/xml/PaySpendingContractMapper.xml | 11 +++-- .../service/IPaySpendingContractService.java | 2 +- .../impl/PayIncomeContractServiceImpl.java | 43 ++++++++++++++++--- .../impl/PaySpendingContractServiceImpl.java | 4 +- 8 files changed, 66 insertions(+), 17 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java index df5748f0..4133f545 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java @@ -8,6 +8,7 @@ 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.common.RoleCommon; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.base.controller.JeroController; @@ -113,6 +114,10 @@ public class PayIncomeContractController extends JeroController page = new Page<>(pageNo, pageSize); IPage pageList = payIncomeContractService.queryPageList(page, payIncomeContract,chargeStatus,projectName,startTime,endTime); return Result.OK(pageList); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java index 9e8d7f77..9f4b992c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java @@ -16,10 +16,12 @@ 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.common.RoleCommon; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; import com.jero.common.util.DateUtils; import com.jero.common.util.oConvertUtils; import com.jero.contract.common.PayIncomeContractCommon; @@ -30,6 +32,7 @@ import com.jero.contract.vo.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecgframework.poi.excel.def.MapExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -95,9 +98,12 @@ public class PaySpendingContractController extends JeroController page = new Page<>(pageNo, pageSize); - IPage pageList = paySpendingContractService.queryPageList(page, paySpendingContract.getContractNum(), - paySpendingContract.getContractName(),startTime,endTime); + IPage pageList = paySpendingContractService.queryPageList(page, paySpendingContract,startTime,endTime); return Result.OK(pageList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java index 1bf918de..d5d2244c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java @@ -25,9 +25,8 @@ public interface PaySpendingContractMapper extends BaseMapper queryPageList(Page page, @Param("contractNum") String contractNum, - @Param("contractName") String contractName,@Param("startTime") String startTime, - @Param("endTime") String endTime); + IPage queryPageList(Page page, @Param("paySpendingContract") PaySpendingContract paySpendingContract + ,@Param("startTime") String startTime, @Param("endTime") String endTime); /** * @Description excel导出 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml index 6baaa33a..aa375ee1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml @@ -90,6 +90,9 @@ AND aa.associatedProject LIKE CONCAT('%',CONCAT(#{projectName},'%')) + + AND aa.principal_id = #{payIncomeContract.principalId} + ORDER BY aa.chargeStatus desc,aa.statusOrder desc, aa.createTime desc diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml index be7cca07..a8085638 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml @@ -40,11 +40,11 @@ ) AS chargeStatus FROM pay_spending_contract psc - - AND contract_num LIKE CONCAT('%',CONCAT(#{contractNum},'%')) + + AND contract_num LIKE CONCAT('%',CONCAT(#{paySpendingContract.contractNum},'%')) - - AND contract_name LIKE CONCAT('%',CONCAT(#{contractName},'%')) + + AND contract_name LIKE CONCAT('%',CONCAT(#{paySpendingContract.contractName},'%')) AND DATE_FORMAT(create_time,'%Y-%m-%d') >= #{startTime} @@ -52,6 +52,9 @@ AND DATE_FORMAT(create_time,'%Y-%m-%d') <= #{endTime} + + AND principal_id = #{paySpendingContract.principalId} + ORDER BY chargeStatus desc,create_time desc diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java index ac054efc..dec52bb5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java @@ -24,7 +24,7 @@ public interface IPaySpendingContractService extends IService queryPageList(Page page,String contractNum,String contractName,String startTime,String endTime); + IPage queryPageList(Page page,PaySpendingContract paySpendingContract,String startTime,String endTime); /** * @Description 添加 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java index 21436a61..4b02e333 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java @@ -249,6 +249,12 @@ public class PayIncomeContractServiceImpl extends ServiceImpl{ String projectName = ""; String principalId = ""; @@ -317,10 +332,6 @@ public class PayIncomeContractServiceImpl extends ServiceImpl{ if(!Objects.equals(p.getStatus(),PayIncomeContractCommon.STATUS1) && !Objects.equals(p.getStatus(),PayIncomeContractCommon.STATUS4)){ throw new JeroBootException("收入合同不可删除！"); } + if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){ + if(!Objects.equals(sysUser.getId(),p.getPrincipalId())){ + throw new JeroBootException("收入合同不可操作！"); + } + } }); payIncomeContractService.removeByIds(ids); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java index 10a0c9d9..b9782216 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java @@ -64,8 +64,8 @@ public class PaySpendingContractServiceImpl extends ServiceImpl queryPageList(Page page, String contractNum, String contractName, String startTime, String endTime) { - return paySpendingContractMapper.queryPageList(page,contractNum,contractName,startTime,endTime); + public IPage queryPageList(Page page, PaySpendingContract paySpendingContract, String startTime, String endTime) { + return paySpendingContractMapper.queryPageList(page,paySpendingContract,startTime,endTime); } @Override