支持电池组列表展示共享字段

yeg

2026-08-29 3a5a4c918cffc1836de16314abca051a1d61d763

支持电池组列表展示共享字段

列表查询附带各电池组的模板字段和值，供前端列设置动态展示自定义字段，并补充服务测试。

 ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/TBatteryGroupServiceImplTest.java

@@ -29,6 +29,24 @@
    @Mock
    private TBatteryGroupMapper batteryGroupMapper;

    @Test
    void listShouldIncludeSharedFieldValues()
    {
        TBatteryGroup group = new TBatteryGroup();
        group.setGroupId(12L);
        TBatteryGroupRelationField relation = new TBatteryGroupRelationField();
        relation.setBatteryGroupFieldId(7L);
        relation.setFieldName("额定容量");
        relation.setFieldValue("72");
        when(batteryGroupMapper.selectBatteryGroupList(any(TBatteryGroup.class))).thenReturn(Collections.singletonList(group));
        when(batteryGroupMapper.selectRelationFields(12L)).thenReturn(Collections.singletonList(relation));

        List<TBatteryGroup> result = batteryGroupService.selectBatteryGroupList(new TBatteryGroup());

        assertEquals("额定容量", result.get(0).getTemplateFields().get(0).getFieldName());
        assertEquals("72", result.get(0).getTemplateFields().get(0).getFieldValue());
    }

    @InjectMocks
    private TBatteryGroupServiceImpl batteryGroupService;


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBatteryGroupServiceImpl.java

@@ -32,11 +32,20 @@
    @Autowired
    private TBatteryGroupMapper batteryGroupMapper;

    /** 按查询条件返回未删除的电池组列表。 */
    /** 按查询条件返回未删除的电池组列表，并附带共享字段值。 */
    @Override
    public List<TBatteryGroup> selectBatteryGroupList(TBatteryGroup group)
    {
        return batteryGroupMapper.selectBatteryGroupList(group);
        List<TBatteryGroup> groups = batteryGroupMapper.selectBatteryGroupList(group);
        if (groups == null)
        {
            return List.of();
        }
        for (TBatteryGroup item : groups)
        {
            item.setTemplateFields(batteryGroupMapper.selectRelationFields(item.getGroupId()));
        }
        return groups;
    }

    /** 返回已有电池组的创建人选项。 */