|
@@ -117,12 +117,12 @@ public class MeterWorkCarMeterTimeServiceImpl extends BaseServiceImpl<MeterWorkC
|
|
|
|
|
|
|
|
//计量一班总车数
|
|
//计量一班总车数
|
|
|
long sumCount1 = (list1==null||list1.size()==0)?0: lists.stream().filter(item -> list1.contains(item.getCreateManNo())//判断班组中的人是否存在于班组中
|
|
long sumCount1 = (list1==null||list1.size()==0)?0: lists.stream().filter(item -> list1.contains(item.getCreateManNo())//判断班组中的人是否存在于班组中
|
|
|
- &&StringUtils.isNotEmpty(item.getBaseSpotNo())
|
|
|
|
|
- && StringUtils.isNotEmpty(item.getBaseSpotName())
|
|
|
|
|
- && StringUtils.isNotEmpty(carMeterTimeAndCarFirst.getBaseSpotNo())
|
|
|
|
|
- && StringUtils.isNotEmpty(carMeterTimeAndCarFirst.getBaseSpotName())
|
|
|
|
|
- && item.getBaseSpotNo().equals(carMeterTimeAndCarFirst.getBaseSpotNo())
|
|
|
|
|
- && item.getBaseSpotName().equals(carMeterTimeAndCarFirst.getBaseSpotName())).count();
|
|
|
|
|
|
|
+ &&StringUtils.isNotEmpty(item.getBaseSpotNo())
|
|
|
|
|
+ && StringUtils.isNotEmpty(item.getBaseSpotName())
|
|
|
|
|
+ && StringUtils.isNotEmpty(carMeterTimeAndCarFirst.getBaseSpotNo())
|
|
|
|
|
+ && StringUtils.isNotEmpty(carMeterTimeAndCarFirst.getBaseSpotName())
|
|
|
|
|
+ && item.getBaseSpotNo().equals(carMeterTimeAndCarFirst.getBaseSpotNo())
|
|
|
|
|
+ && item.getBaseSpotName().equals(carMeterTimeAndCarFirst.getBaseSpotName())).count();
|
|
|
//计量二班总车数
|
|
//计量二班总车数
|
|
|
long sumCount2 = (list1==null||list1.size()==0)?0: lists.stream().filter(item -> list2.contains(item.getCreateManNo())//判断班组中的人是否存在于班组中
|
|
long sumCount2 = (list1==null||list1.size()==0)?0: lists.stream().filter(item -> list2.contains(item.getCreateManNo())//判断班组中的人是否存在于班组中
|
|
|
&&StringUtils.isNotEmpty(item.getBaseSpotNo())
|
|
&&StringUtils.isNotEmpty(item.getBaseSpotNo())
|
dengyj