| | |
| | | querySettlementAmount.setAmount(new BigDecimal(sum).add(new BigDecimal(sum1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue()); |
| | | |
| | | List<Integer> collect = settlementRecords.stream().map(SettlementRecord::getId).collect(Collectors.toList()); |
| | | Wrapper<SettlementDetail> wrapper = new EntityWrapper<SettlementDetail>().eq("driverId", driverId); |
| | | Wrapper<SettlementDetail> wrapper = new EntityWrapper<SettlementDetail>(); |
| | | if(collect.size() > 0){ |
| | | wrapper.in("settlementRecordId", collect).or().isNull("settlementRecordId"); |
| | | wrapper.eq("driverId", driverId).in("settlementRecordId", collect).or().eq("driverId", driverId).isNull("settlementRecordId"); |
| | | }else{ |
| | | wrapper.isNull("settlementRecordId"); |
| | | wrapper.eq("driverId", driverId).isNull("settlementRecordId"); |
| | | } |
| | | settlementDetailList = settlementDetailService.selectList(wrapper.orderBy("createTime desc")); |
| | | SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); |