fix: 优化逻辑

This commit is contained in:
tangwei 2026-07-23 11:50:31 +08:00
parent 0d8bc39af6
commit aec144ccf3

View File

@ -107,7 +107,7 @@ public class MsWarnRuleBServiceImpl extends ServiceImpl<MsWarnRuleBMapper, MsWar
"FROM MS_WARN_RULE_B t1\n" + "FROM MS_WARN_RULE_B t1\n" +
"INNER JOIN MS_WARN_RULE_DETAIL_B t2 ON t1.ID = t2.RULE_ID\n" + "INNER JOIN MS_WARN_RULE_DETAIL_B t2 ON t1.ID = t2.RULE_ID\n" +
"INNER JOIN ST_YS_B t3 ON t2.YS = t3.YS\n" + "INNER JOIN ST_YS_B t3 ON t2.YS = t3.YS\n" +
"WHERE t1.RULE_TYPE ="+dbRuleType+"\n" + "WHERE t1.RULE_TYPE ='"+dbRuleType+"'\n" +
" AND t1.IS_DELETED = 0\n" + " AND t1.IS_DELETED = 0\n" +
" AND t2.IS_DELETED = 0\n" + " AND t2.IS_DELETED = 0\n" +
"GROUP BY t2.TB_ID, t2.YS, t3.YS_SHOW_NAME"; "GROUP BY t2.TB_ID, t2.YS, t3.YS_SHOW_NAME";
@ -119,13 +119,13 @@ public class MsWarnRuleBServiceImpl extends ServiceImpl<MsWarnRuleBMapper, MsWar
* 旧版规则类型枚举映射 * 旧版规则类型枚举映射
*/ */
private String getOldRuleType(String ruleType) { private String getOldRuleType(String ruleType) {
if ("WQ".equals(ruleType)) { if ("WQ_RULE".equals(ruleType)) {
return "WQLVL"; return "WQLVL";
} else if ("WT".equals(ruleType)) { } else if ("WT_RULE".equals(ruleType)) {
return "WTMN"; return "WTMN";
} else if ("QGC".equals(ruleType)) { } else if ("QGC_RULE".equals(ruleType)) {
return "EQMN"; return "EQMN";
} else if ("RZ".equals(ruleType)) { } else if ("RZ_RULE".equals(ruleType)) {
return "RSVRFSR"; return "RSVRFSR";
} }
return ruleType; return ruleType;