zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 优化逻辑

Browse Source
This commit is contained in:
tangwei 2026-07-28 14:01:39 +08:00
parent 2ba302ae86
commit 56305b8f89
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java
View File

@ -173,8 +173,10 @@ public class MsWarnRuleBServiceImpl extends ServiceImpl<MsWarnRuleBMapper, MsWar
paramMap.put("ruleType", dbRuleType); paramMap.put("ruleType", dbRuleType);
} }
String orderBy="\nORDER BY t2.TB_ID";
// 组装完整 SQL // 组装完整 SQL
String sql = selectClause + fromJoin + condition + "\n" + groupByClause; String sql = selectClause + fromJoin + condition + "\n" + groupByClause + orderBy;
return microservicDynamicSQLMapper.getAllListWithResultType(sql, paramMap, WarnYsVo.class); return microservicDynamicSQLMapper.getAllListWithResultType(sql, paramMap, WarnYsVo.class);
} }
@ -457,7 +459,9 @@ public class MsWarnRuleBServiceImpl extends ServiceImpl<MsWarnRuleBMapper, MsWar
List<MsWarnRuleDetailB> detailGroup = warnLevelMap.get(warnLevel); List<MsWarnRuleDetailB> detailGroup = warnLevelMap.get(warnLevel);
List<WarnYsVo> ysVoList = new ArrayList<>(); List<WarnYsVo> ysVoList = new ArrayList<>();
MsWarnRuleDetailB first = detailGroup.getFirst(); MsWarnRuleDetailB first = detailGroup.getFirst();
detailVo.setLvl(first.getLvl().toString()); if (first != null && first.getLvl() != null) {
detailVo.setLvl(first.getLvl().toString());
}
detailVo.setWarnLevel(first.getWarnLevel()); detailVo.setWarnLevel(first.getWarnLevel());
// detailVo.setLvlName(first.n); // detailVo.setLvlName(first.n);
// BeanUtils.copyProperties(first, detailVo); // BeanUtils.copyProperties(first, detailVo);