Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
xuyang
2023-09-13 16:29:52 +08:00
parent aaca80a328 9c3464c998
commit 61743b4b7e
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java
View File

@@ -811,7 +811,10 @@ public class HistoryResultServiceImpl implements HistoryResultService {
if (Integer.parseInt(normHistoryParam.getTargetCode()) != 60 || Integer.parseInt(normHistoryParam.getTargetCode()) != 61 || Integer.parseInt(normHistoryParam.getTargetCode()) != 62) {
stringBuilder.append(" and ").append(InfluxDBTableConstant.VALUE_TYPE + "='").append(valueTypeName).append("'");
}
stringBuilder.append(" and ").append("phasic_type ='").append(phasicType).append("'");
if(StrUtil.isNotBlank(phasicType)){
stringBuilder.append(" and ").append("phasic_type ='").append(phasicType).append("'");
}
String sql = "";
List<String> unit = new ArrayList<>();
Integer number = normHistoryParam.getNumber();