| | |
|---|
| | | tSettlementConfirm.setDistribution(dto.getDistribution()); |
|---|
| | | tSettlementConfirm.setIncome(dto.getElectrovalence().add(dto.getServiceCharge())); |
|---|
| | | tSettlementConfirm.setCost(dto.getVenue().add(dto.getClean()).add(dto.getMaintain()).add(dto.getSupplyElectronic())); |
|---|
| | | tSettlementConfirm.setProfitMoney(chargingElectronic.add(serviceCharge).subtract(tSettlementConfirm.getCost())); |
|---|
| | | tSettlementConfirm.setProfitMoney(tSettlementConfirm.getElectrovalence().add(tSettlementConfirm.getServiceCharge()) |
|---|
| | | .subtract(tSettlementConfirm.getCost())); |
|---|
| | | tSettlementConfirm.setNewSettlement(subtract2.subtract(tSettlementConfirm.getCost())); |
|---|
| | | |
|---|
| | | tSettlementConfirmMapper.insert(tSettlementConfirm); |
|---|
| | |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto) { |
|---|
| | | String startTime = null; |
|---|
| | | String endTime = null; |
|---|
| | | if (StringUtils.hasLength(dto.getStartTime())){ |
|---|
| | | dto.setType(1); |
|---|
| | | String[] split = dto.getStartTime().split(" - "); |
|---|
| | | dto.setStartTime(split[0]); |
|---|
| | | dto.setEndTime(split[1]); |
|---|
| | | startTime = split[0]; |
|---|
| | | endTime = split[1]; |
|---|
| | | } |
|---|
| | | if (StringUtils.hasLength(dto.getEndTime())){ |
|---|
| | | dto.setType(2); |
|---|
| | | String[] split = dto.getStartTime().split(" - "); |
|---|
| | | dto.setStartTime(split[0]); |
|---|
| | | dto.setEndTime(split[1]); |
|---|
| | | String[] split = dto.getEndTime().split(" - "); |
|---|
| | | startTime = split[0]; |
|---|
| | | endTime = split[1]; |
|---|
| | | } |
|---|
| | | dto.setStartTime(startTime); |
|---|
| | | dto.setEndTime(endTime); |
|---|
| | | PageInfo<TSettlementConfirm> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize()); |
|---|
| | | List<TSettlementConfirm> list = tSettlementConfirmMapper.settlementList(pageInfo,dto); |
|---|
| | | for (TSettlementConfirm tSettlementConfirm : list) { |
|---|
