ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

结果展示调整

Browse Source
This commit is contained in:
caozehui
2025-09-17 09:08:23 +08:00
parent d220ee0187
commit 213d940ff1
12 changed files with 192 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
storage/src/main/java/com/njcn/gather/storage/service/impl/ContrastHarmonicServiceImpl.java
View File

@@ -32,7 +32,11 @@ public class ContrastHarmonicServiceImpl extends ServiceImpl<ContrastHarmonicMap
.in(CollUtil.isNotEmpty(adTypeList), ContrastHarmonicResult::getAdType, adTypeList)
.orderByAsc(ContrastHarmonicResult::getTimeId);
if (isWave) {
wrapper.eq(ObjectUtil.isNotNull(waveNum), ContrastHarmonicResult::getWaveNum, waveNum);
if (ObjectUtil.isNotNull(waveNum)) {
wrapper.eq(ContrastHarmonicResult::getWaveNum, waveNum);
} else {
wrapper.isNotNull(ContrastHarmonicResult::getWaveNum);
}
} else {
wrapper.isNull(ContrastHarmonicResult::getWaveNum);
}
@@ -47,10 +51,13 @@ public class ContrastHarmonicServiceImpl extends ServiceImpl<ContrastHarmonicMap
DynamicTableNameHandler.setTableName(prefix);
LambdaQueryChainWrapper<ContrastHarmonicResult> wrapper = this.lambdaQuery().likeRight(ContrastHarmonicResult::getDevMonitorId, devId)
.eq(ObjectUtil.isNotNull(num), ContrastHarmonicResult::getNum, num)
.eq(ObjectUtil.isNotNull(waveNum), ContrastHarmonicResult::getWaveNum, waveNum)
.in(CollUtil.isNotEmpty(adTypeList), ContrastHarmonicResult::getAdType, adTypeList);
if (isWave) {
wrapper.eq(ObjectUtil.isNotNull(waveNum), ContrastHarmonicResult::getWaveNum, waveNum);
if (ObjectUtil.isNotNull(waveNum)) {
wrapper.eq(ContrastHarmonicResult::getWaveNum, waveNum);
} else {
wrapper.isNotNull(ContrastHarmonicResult::getWaveNum);
}
} else {
wrapper.isNull(ContrastHarmonicResult::getWaveNum);
}

6
storage/src/main/java/com/njcn/gather/storage/service/impl/ContrastNonHarmonicServiceImpl.java
View File

@@ -32,7 +32,11 @@ public class ContrastNonHarmonicServiceImpl extends ServiceImpl<ContrastNonHarmo
.in(CollUtil.isNotEmpty(adTypeList), ContrastNonHarmonicResult::getAdType, adTypeList)
.orderByAsc(ContrastNonHarmonicResult::getTimeId);
if (isWave) {
wrapper.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);
}