diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/EnumFetcherServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/EnumFetcherServiceImpl.java index 5e0a865b..b5922ac5 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/EnumFetcherServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/EnumFetcherServiceImpl.java @@ -7,11 +7,13 @@ import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboReference; import org.dromara.property.domain.AttendanceUserGroup; import org.dromara.property.domain.ServiceWorkOrdersType; +import org.dromara.property.domain.TbUnit; import org.dromara.property.domain.enums.BookingPayStatusEnum; import org.dromara.property.domain.enums.BookingStatusEnum; import org.dromara.property.domain.enums.MeetAttachStatusEnum; import org.dromara.property.domain.enums.MeetStatusEnum; import org.dromara.property.mapper.ServiceWorkOrdersTypeMapper; +import org.dromara.property.mapper.TbUnitMapper; import org.dromara.property.mapper.attendanceMapper.AttendanceUserGroupMapper; import org.dromara.property.service.*; import org.dromara.system.api.RemoteUserService; @@ -47,6 +49,7 @@ public class EnumFetcherServiceImpl implements EnumFetcherService { @Autowired private ServiceWorkOrdersTypeMapper serviceWorkOrdersTypeMapper; @Autowired + private TbUnitMapper unitMapper; private AttendanceUserGroupMapper attendanceUserGroupMapper; @Override @@ -74,11 +77,29 @@ public class EnumFetcherServiceImpl implements EnumFetcherService { return getAccount(new ArrayList<>()); case "getServiceWorkOrdersHandler": return serviceWorkOrdersService.getServiceWorkOrdersHandler(type); + case "getUnit": + return getUnit(); default: throw new IllegalArgumentException("Unknown type: " + type); } } + /** + * 获取单位枚举接口下拉 + * @return + */ + + private List> getUnit() { + List tbUnitList = unitMapper.selectList(); + return tbUnitList.stream() + .map(e -> { + Map map = new HashMap<>(); + map.put("value", e.getId()); + map.put("name", e.getUnitName()); + return map; + }) + .collect(Collectors.toList()); + } /** * 获取会议室状态枚举接口