This commit is contained in:
caozehui
2025-09-12 15:11:09 +08:00
parent 12edb57581
commit fd7ffbe87e
3 changed files with 11 additions and 8 deletions

View File

@@ -47,11 +47,13 @@ public class ContrastNonHarmonicServiceImpl extends ServiceImpl<ContrastNonHarmo
DynamicTableNameHandler.setTableName(prefix);
LambdaQueryChainWrapper<ContrastNonHarmonicResult> wrapper = this.lambdaQuery().likeRight(ContrastNonHarmonicResult::getDevMonitorId, devId)
.eq(ObjectUtil.isNotNull(num), ContrastNonHarmonicResult::getNum, num)
.isNull(ObjectUtil.isNull(waveNum), ContrastNonHarmonicResult::getWaveNum)
.in(CollUtil.isNotEmpty(adTypeList), ContrastNonHarmonicResult::getAdType, adTypeList);
if (isWave) {
wrapper.isNotNull(ContrastNonHarmonicResult::getWaveNum)
.eq(ObjectUtil.isNotNull(waveNum), ContrastNonHarmonicResult::getWaveNum, waveNum);
if (ObjectUtil.isNotNull(waveNum)) {
wrapper.eq(ContrastNonHarmonicResult::getWaveNum, waveNum);
} else {
wrapper.isNotNull(ContrastNonHarmonicResult::getWaveNum);
}
} else {
wrapper.isNull(ContrastNonHarmonicResult::getWaveNum);
}