|
@@ -66,7 +66,7 @@ public class DeviceAlgorithmChargingJob {
|
|
String algorithmDate = DateUtil.format(DateUtil.date(), DatePattern.PURE_DATE_PATTERN);
|
|
String algorithmDate = DateUtil.format(DateUtil.date(), DatePattern.PURE_DATE_PATTERN);
|
|
LambdaQueryWrapper<DeviceAlgorithmCharging> lambdaQueryWrapper = new LambdaQueryWrapper<DeviceAlgorithmCharging>()
|
|
LambdaQueryWrapper<DeviceAlgorithmCharging> lambdaQueryWrapper = new LambdaQueryWrapper<DeviceAlgorithmCharging>()
|
|
.select(DeviceAlgorithmCharging::getDeviceId)
|
|
.select(DeviceAlgorithmCharging::getDeviceId)
|
|
- .gt(DeviceAlgorithmCharging::getMercId, mercAccount.getMercId())
|
|
|
|
|
|
+ .eq(DeviceAlgorithmCharging::getMercId, mercAccount.getMercId())
|
|
.gt(DeviceAlgorithmCharging::getUnusedSize, 0)
|
|
.gt(DeviceAlgorithmCharging::getUnusedSize, 0)
|
|
.in(DeviceAlgorithmCharging::getDeviceId, deviceInfosJMaps.getKeys())
|
|
.in(DeviceAlgorithmCharging::getDeviceId, deviceInfosJMaps.getKeys())
|
|
.and(deviceAlgorithmChargingLambdaQueryWrapper -> deviceAlgorithmChargingLambdaQueryWrapper
|
|
.and(deviceAlgorithmChargingLambdaQueryWrapper -> deviceAlgorithmChargingLambdaQueryWrapper
|