wkc/ccdi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复结果总览模型名称排序兼容性问题

Browse Source
This commit is contained in:
wkc
2026-03-20 12:06:37 +08:00
parent a7f068b309
commit 633f085083
4 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ccdi-project/src/main/resources/mapper/ccdi/project/CcdiProjectOverviewMapper.xml
View File

@@ -247,7 +247,7 @@
</select>
<select id="selectRiskModelNamesByScope" resultType="java.lang.String">
select distinct scoped.model_name
select scoped.model_name
from (
<include refid="resolvedEmployeeRiskBaseSql"/>
) scoped
@@ -256,6 +256,7 @@
<if test="selectedModelCodes != null and selectedModelCodes != ''">
and find_in_set(scoped.model_code, #{selectedModelCodes})
</if>
group by scoped.model_code, scoped.model_name
order by scoped.model_code asc
</select>

4
ccdi-project/src/test/java/com/ruoyi/ccdi/project/mapper/CcdiProjectOverviewMapperRiskModelPeopleTest.java
View File

@@ -8,6 +8,7 @@ import java.nio.file.Path;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
class CcdiProjectOverviewMapperRiskModelPeopleTest {
@@ -40,6 +41,9 @@ class CcdiProjectOverviewMapperRiskModelPeopleTest {
assertTrue(xml.contains("select=\"selectRiskModelNamesByScope\""));
assertTrue(xml.contains("select=\"selectRiskHitTagsByScope\""));
assertTrue(xml.contains("find_in_set(scoped.model_code, #{selectedModelCodes})"));
assertFalse(xml.contains("select distinct scoped.model_name"));
assertTrue(xml.contains("group by scoped.model_code, scoped.model_name"));
assertTrue(xml.contains("order by scoped.model_code asc"));
assertTrue(xml.contains("order by case max(scoped.risk_level)"));
assertTrue(xml.contains("scoped.rule_code asc"));
}