diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java index 209fde2..f31fac4 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -196,15 +196,18 @@ public class CashCollectionServiceImpl implements CashCollectionService { cashCollection.setSubmitterMarket(null); } if (cashCollection.getCashRoleId()==1){ - //角色是地方财务,提交人置空不设筛选条件,仅按地区筛选,查看 + //角色是地方财务,提交人置空不设筛选条件,仅按收款地区、提交人地区筛选() if(cashCollection.getStatus()==null){ cashCollection.setStatus(123460);} + //状态为待审核和已驳回时按照提交人地区筛选 if (cashCollection.getStatus()==0||cashCollection.getStatus()==2){ cashCollection.setReceivedMarket(null);} + //状态为已通过和Link通过时,按收款地区筛选 if (cashCollection.getStatus()==1||cashCollection.getStatus()==3){ cashCollection.setSubmitterMarket(null);} cashCollection.setSubmitterId(null); + //状态为46,已通过和已退款,满足收款地区或提交人地区即可, } if (cashCollection.getCashRoleId()==0){ diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index 25d247b..a9d8cce 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -147,8 +147,8 @@ AND cr.submitter_id = #{cashCollection.submitterId} - + + AND cr.received_market = #{cashCollection.receivedMarket} AND cr.submitter_market = #{cashCollection.submitterMarket} - + + AND cr.activity like concat('%',#{cashCollection.activity},'%')