|
|
|
@ -175,9 +175,13 @@ public class CashCollectionServiceImpl implements CashCollectionService { |
|
|
|
if (markets.contains("9") || markets.contains("9999")){ |
|
|
|
markets=null; |
|
|
|
} |
|
|
|
cashCollection.setReceivedMarket(marketMapper.getMarketId(cashCollection.getReceivedMarket())); |
|
|
|
if (cashCollection.getCashRoleId()==2) |
|
|
|
{ |
|
|
|
cashCollection.setStatus(134); |
|
|
|
cashCollection.setSubmitterId(null); |
|
|
|
}if (cashCollection.getCashRoleId()==1){ |
|
|
|
cashCollection.setSubmitterId(null); |
|
|
|
} |
|
|
|
cashCollection.setMarkets(markets); |
|
|
|
PageHelper.startPage(pageNum, pageSize); |
|
|
|
|