by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改了会议室等bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m24s
Details

Browse Source
This commit is contained in:
yuyongle 2025-08-22 20:03:34 +08:00
parent 9897bb8db7
commit 8340f5cf6a
13 changed files with 114 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionRouteController.java
View File

@ -40,7 +40,7 @@ public class InspectionRouteController extends BaseController {
/**
* 查询巡检路线列表
*/
@SaCheckPermission("property:route:list")
@SaCheckPermission("property:inspectionRoute:list")
@GetMapping("/list")
public TableDataInfo<InspectionRouteVo> list(InspectionRouteBo bo, PageQuery pageQuery) {
return inspectionRouteService.queryPageList(bo, pageQuery);
@ -49,7 +49,7 @@ public class InspectionRouteController extends BaseController {
/**
* 导出巡检路线列表
*/
@SaCheckPermission("property:route:export")
@SaCheckPermission("property:inspectionRoute:export")
@Log(title = "巡检路线", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(InspectionRouteBo bo, HttpServletResponse response) {
@ -62,7 +62,7 @@ public class InspectionRouteController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("property:route:query")
@SaCheckPermission("property:inspectionRoute:query")
@GetMapping("/{id}")
public R<InspectionRouteVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
@ -72,7 +72,7 @@ public class InspectionRouteController extends BaseController {
/**
* 新增巡检路线
*/
@SaCheckPermission("property:route:add")
@SaCheckPermission("property:inspectionRoute:add")
@Log(title = "巡检路线", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@ -83,7 +83,7 @@ public class InspectionRouteController extends BaseController {
/**
* 修改巡检路线
*/
@SaCheckPermission("property:route:edit")
@SaCheckPermission("property:inspectionRoute:edit")
@Log(title = "巡检路线", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@ -96,7 +96,7 @@ public class InspectionRouteController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("property:route:remove")
@SaCheckPermission("property:inspectionRoute:remove")
@Log(title = "巡检路线", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

10
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetAttachController.java
View File

@ -40,7 +40,7 @@ public class MeetAttachController extends BaseController {
/**
* 查询分页会议室增值服务列表
*/
@SaCheckPermission("property:attach:list")
@SaCheckPermission("property:conferenceAddServices:list")
@GetMapping("/list")
public TableDataInfo<MeetAttachVo> pageList(MeetAttachBo bo, PageQuery pageQuery) {
return meetAttachService.queryPageList(bo, pageQuery);
@ -57,7 +57,7 @@ public class MeetAttachController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("property:attach:query")
@SaCheckPermission("property:conferenceAddServices:query")
@GetMapping("/{id}")
public R<MeetAttachVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
@ -67,7 +67,7 @@ public class MeetAttachController extends BaseController {
/**
* 新增会议室增值服务
*/
@SaCheckPermission("property:attach:add")
@SaCheckPermission("property:conferenceAddServices:add")
@Log(title = "会议室增值服务", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@ -78,7 +78,7 @@ public class MeetAttachController extends BaseController {
/**
* 修改会议室增值服务
*/
@SaCheckPermission("property:attach:edit")
@SaCheckPermission("property:conferenceAddServices:edit")
@Log(title = "会议室增值服务", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@ -91,7 +91,7 @@ public class MeetAttachController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("property:attach:remove")
@SaCheckPermission("property:conferenceAddServices:remove")
@Log(title = "会议室增值服务", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

2
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbVisitorManagementController.java
View File

@ -152,7 +152,7 @@ public class TbVisitorManagementController extends BaseController {
/**
* pc端新增访客管理
*/
@SaCheckPermission("property:visitorManagement::addVisitorManagement")
@SaCheckPermission("property:visitorManagement:addVisitorManagement")
@Log(title = "访客管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping

2
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/mobile/MServiceWorkOrdersController.java
View File

@ -45,7 +45,7 @@ public class MServiceWorkOrdersController extends BaseController {
*/
@GetMapping("/list")
public TableDataInfo<ServiceWorkOrdersVo> list(ServiceWorkOrdersBo bo, PageQuery pageQuery) {
return serviceWorkOrdersService.queryPageList(bo, pageQuery);
return serviceWorkOrdersService.queryMobilePageList(bo, pageQuery);
}
/**
* 修改【工单处理】

4
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CostHouseChargeVo.java
View File

@ -46,6 +46,10 @@ public class CostHouseChargeVo implements Serializable {
* 业主
*/
private Long personId;
/**
* 业主
*/
private String personName;
/**
* 收费项目
*/

2
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/InspectionPointVo.java
View File

@ -41,7 +41,7 @@ public class InspectionPointVo implements Serializable {
* 巡检项目id
*/
@ExcelProperty(value = "巡检项目id")
private Long itemName;
private String itemName;
/**
* 巡检点名称

8
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IServiceWorkOrdersService.java
View File

@ -94,4 +94,12 @@ public interface IServiceWorkOrdersService {
* @return
*/
List<Map<Object, Object>> getServiceWorkOrdersHandler(String type);
/**
* 分页查询【工单处理】列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 【工单处理】分页列表
*/
TableDataInfo<ServiceWorkOrdersVo> queryMobilePageList(ServiceWorkOrdersBo bo, PageQuery pageQuery);
}

20
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostCarChargeServiceImpl.java
View File

@ -1,5 +1,6 @@
package org.dromara.property.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.RandomUtil;
@ -16,15 +17,13 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.property.domain.CostCarCharge;
import org.dromara.property.domain.CostPayFeeAudit;
import org.dromara.property.domain.CostReturnPayFee;
import org.dromara.property.domain.ResidentPerson;
import org.dromara.property.domain.bo.CostCarChargeBo;
import org.dromara.property.domain.bo.CostChargeReturnFeeBo;
import org.dromara.property.domain.enums.ChargeStatusEnum;
import org.dromara.property.domain.vo.CostCarChargeVo;
import org.dromara.property.domain.vo.CostItemsVo;
import org.dromara.property.mapper.CostCarChargeMapper;
import org.dromara.property.mapper.CostItemsMapper;
import org.dromara.property.mapper.CostPayFeeAuditMapper;
import org.dromara.property.mapper.CostReturnPayFeeMapper;
import org.dromara.property.mapper.*;
import org.dromara.property.service.ICostCarChargeService;
import org.dromara.system.api.RemoteUserService;
import org.dromara.system.api.domain.vo.RemoteUserVo;
@ -55,6 +54,7 @@ public class CostCarChargeServiceImpl implements ICostCarChargeService {
private final CostReturnPayFeeMapper costReturnPayFeeMapper;
@DubboReference
private RemoteUserService remoteUserService;
private final ResidentPersonMapper residentPersonMapper;
/**
@ -79,11 +79,15 @@ public class CostCarChargeServiceImpl implements ICostCarChargeService {
public TableDataInfo<CostCarChargeVo> queryPageList(CostCarChargeBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<CostCarCharge> lqw = buildQueryWrapper(bo);
Page<CostCarChargeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
List<Long> residentPersonIdList = result.getRecords().stream().map(vo -> vo.getPersonId()).distinct().collect(Collectors.toList());
List<RemoteUserVo> remoteUserVos = remoteUserService.selectListByIds(residentPersonIdList);
// List<Long> residentPersonIdList = result.getRecords().stream().map(vo -> vo.getPersonId()).distinct().collect(Collectors.toList());
// List<RemoteUserVo> remoteUserVos = remoteUserService.selectListByIds(residentPersonIdList);
List<ResidentPerson> residentPeoplelist = residentPersonMapper.selectList();
result.getRecords().stream().forEach(s -> {
RemoteUserVo remoteUserVo = remoteUserVos.stream().filter(vo -> vo.getUserId() != null && vo.getUserId().equals(s.getPersonId())).findFirst().orElse(null);
s.setPersonName(Objects.nonNull(remoteUserVo) ? remoteUserVo.getNickName() : null);
if (CollUtil.isNotEmpty(residentPeoplelist)) {
ResidentPerson residentPerson = residentPeoplelist.stream()
.filter(vo -> vo.getId() != null && vo.getId().equals(s.getPersonId())).findFirst().orElse(null);
s.setPersonName(ObjectUtil.isNotEmpty(residentPerson)?residentPerson.getUserName():null);
}
});
return TableDataInfo.build(result);
}

16
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostHouseChargeServiceImpl.java
View File

@ -1,6 +1,7 @@
package org.dromara.property.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.RandomUtil;
@ -16,6 +17,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.property.domain.CostPayFeeAudit;
import org.dromara.property.domain.CostReturnPayFee;
import org.dromara.property.domain.ResidentPerson;
import org.dromara.property.domain.bo.CostChargeReturnFeeBo;
import org.dromara.property.domain.enums.ChargeStatusEnum;
import org.dromara.property.domain.vo.*;
@ -67,9 +69,9 @@ public class CostHouseChargeServiceImpl implements ICostHouseChargeService {
costHouseChargeDetailVo.setCostItemsVo(ObjectUtil.isNotEmpty(costItemsVo)?costItemsVo:null);
TbRoomVo tbRoomVo = tbRoomMapper.selectVoById(costHouseChargeDetailVo.getRoomId());
costHouseChargeDetailVo.setRoomVo(ObjectUtil.isNotEmpty(tbRoomVo)?tbRoomVo:null);
// ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(costHouseChargeVo.getPersonId());
RemoteUserVo userInfo = remoteUserService.getUserInfoById(costHouseChargeVo.getPersonId());
costHouseChargeDetailVo.setPersonName(ObjectUtil.isNotEmpty(userInfo)?userInfo.getUserName():null);
ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(costHouseChargeVo.getPersonId());
//RemoteUserVo userInfo = remoteUserService.getUserInfoById(costHouseChargeVo.getPersonId());
costHouseChargeDetailVo.setPersonName(ObjectUtil.isNotEmpty(residentPersonVo)?residentPersonVo.getUserName():null);
return costHouseChargeDetailVo;
}
@ -83,7 +85,15 @@ public class CostHouseChargeServiceImpl implements ICostHouseChargeService {
@Override
public TableDataInfo<CostHouseChargeVo> queryPageList(CostHouseChargeBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<CostHouseCharge> lqw = buildQueryWrapper(bo);
List<ResidentPerson> residentPeoplelist = residentPersonMapper.selectList();
Page<CostHouseChargeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
result.getRecords().stream().forEach(s -> {
if (CollUtil.isNotEmpty(residentPeoplelist)) {
ResidentPerson residentPerson = residentPeoplelist.stream()
.filter(vo -> vo.getId() != null && vo.getId().equals(s.getPersonId())).findFirst().orElse(null);
s.setPersonName(ObjectUtil.isNotEmpty(residentPerson)?residentPerson.getUserName():null);
}
});
return TableDataInfo.build(result);
}

36
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerFeedbacksServiceImpl.java
View File

@ -64,10 +64,10 @@ public class CustomerFeedbacksServiceImpl implements ICustomerFeedbacksService {
* @return 客户服务-意见反馈
*/
@Override
public CustomerFeedbacksVo queryById(Long id){
public CustomerFeedbacksVo queryById(Long id) {
CustomerFeedbacksVo customerFeedbacksVo = baseMapper.selectVoById(id);
ServiceWorkOrdersType serviceWorkOrdersType = serviceWorkOrdersTypeMapper.selectById(customerFeedbacksVo.getFeedbackType());
customerFeedbacksVo.setFeedbackTypeName(StringUtils.isNotBlank(serviceWorkOrdersType.getOrderTypeName())?serviceWorkOrdersType.getOrderTypeName():null);
customerFeedbacksVo.setFeedbackTypeName(StringUtils.isNotBlank(serviceWorkOrdersType.getOrderTypeName()) ? serviceWorkOrdersType.getOrderTypeName() : null);
String nikName = remoteUserService.selectNicknameById(customerFeedbacksVo.getFeedbackPersion());
customerFeedbacksVo.setFeedbackPersionName(nikName);
return customerFeedbacksVo;
@ -100,28 +100,29 @@ public class CustomerFeedbacksServiceImpl implements ICustomerFeedbacksService {
.collect(Collectors.toList());
List<RemoteUserVo> remoteUserVos = remoteUserService.selectListByIds(uerIds);
result.getRecords().stream().forEach(s -> {
assembly(s,serviceWorkOrdersTypes,remoteUserVos);
});
assembly(s, serviceWorkOrdersTypes, remoteUserVos);
});
}
return TableDataInfo.build(result);
}
/**
*
* @param customerFeedbacksVo 意见反馈返回信息
*
*/
private void assembly(CustomerFeedbacksVo customerFeedbacksVo,List<ServiceWorkOrdersType> serviceWorkOrdersTypes,List<RemoteUserVo> remoteUserVos){
if(CollUtil.isNotEmpty(remoteUserVos)){
RemoteUserVo remoteUserVo = remoteUserVos.stream()
.filter(vo -> vo.getUserId() != null && vo.getUserId().equals(customerFeedbacksVo.getFeedbackPersion())).findFirst().orElse(null);
customerFeedbacksVo.setFeedbackPersionName(StringUtils.isNotBlank(remoteUserVo.getNickName())?remoteUserVo.getNickName():null);
}
private void assembly(CustomerFeedbacksVo customerFeedbacksVo, List<ServiceWorkOrdersType> serviceWorkOrdersTypes, List<RemoteUserVo> remoteUserVos) {
if (CollUtil.isNotEmpty(remoteUserVos)) {
RemoteUserVo remoteUserVo = remoteUserVos.stream()
.filter(vo -> vo.getUserId() != null && vo.getUserId().equals(customerFeedbacksVo.getFeedbackPersion())).findFirst().orElse(null);
customerFeedbacksVo.setFeedbackPersionName(ObjectUtil.isNotNull(remoteUserVo) ? remoteUserVo.getNickName() : null);
}
if (CollUtil.isNotEmpty(serviceWorkOrdersTypes)) {
ServiceWorkOrdersType serviceWorkOrdersType = serviceWorkOrdersTypes.stream().filter(vo -> vo.getId() != null && vo.getId().equals(customerFeedbacksVo.getFeedbackType())).findFirst().orElse(null);
customerFeedbacksVo.setFeedbackTypeName(StringUtils.isNotBlank(serviceWorkOrdersType.getOrderTypeName())?serviceWorkOrdersType.getOrderTypeName():null);
customerFeedbacksVo.setFeedbackTypeName(ObjectUtil.isNotNull(serviceWorkOrdersType) ? serviceWorkOrdersType.getOrderTypeName() : null);
}
}
/**
* 查询符合条件的客户服务-意见反馈列表
*
@ -179,22 +180,23 @@ public class CustomerFeedbacksServiceImpl implements ICustomerFeedbacksService {
@Transactional(rollbackFor = Exception.class)
public Boolean updateByBo(CustomerFeedbacksBo bo) {
CustomerFeedbacks update = MapstructUtils.convert(bo, CustomerFeedbacks.class);
validEntityBeforeUpdate(update);
validEntityBeforeUpdate(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(CustomerFeedbacks entity){
private void validEntityBeforeSave(CustomerFeedbacks entity) {
//TODO 做一些数据校验,如唯一约束
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeUpdate(CustomerFeedbacks entity){
private void validEntityBeforeUpdate(CustomerFeedbacks entity) {
//TODO 做一些数据校验,如唯一约束
if(entity.getIsWorkOrder().equals("0")&& ObjectUtil.isEmpty(entity.getOrderId())){
if (entity.getIsWorkOrder().equals("0") && ObjectUtil.isEmpty(entity.getOrderId())) {
ServiceWorkOrders serviceWorkOrders = new ServiceWorkOrders();
serviceWorkOrders.setOrderName("意见反馈转工单");
LoginUser user = LoginHelper.getLoginUser();
@ -226,7 +228,7 @@ public class CustomerFeedbacksServiceImpl implements ICustomerFeedbacksService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;

12
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPointServiceImpl.java
View File

@ -12,8 +12,10 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.property.domain.InspectionPoint;
import org.dromara.property.domain.bo.InspectionPointBo;
import org.dromara.property.domain.vo.InspectionItemVo;
import org.dromara.property.domain.vo.InspectionPlanVo;
import org.dromara.property.domain.vo.InspectionPointVo;
import org.dromara.property.mapper.InspectionItemMapper;
import org.dromara.property.mapper.InspectionPlanMapper;
import org.dromara.property.mapper.InspectionPointMapper;
import org.dromara.property.service.IInspectionPointService;
@ -39,6 +41,7 @@ public class InspectionPointServiceImpl implements IInspectionPointService {
private final InspectionPointMapper baseMapper;
private final InspectionPlanMapper inspectionPlanMapper;
private final InspectionItemMapper inspectionItemMapper;
/**
* 查询巡检点
@ -62,6 +65,8 @@ public class InspectionPointServiceImpl implements IInspectionPointService {
public TableDataInfo<InspectionPointVo> queryPageList(InspectionPointBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<InspectionPoint> lqw = buildQueryWrapper(bo);
Page<InspectionPointVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
//收集巡检项目id
if (CollectionUtil.isEmpty(result.getRecords())) {
return TableDataInfo.build(result);
}
@ -69,8 +74,11 @@ public class InspectionPointServiceImpl implements IInspectionPointService {
.map(vo -> vo.getItemId())
.distinct()
.collect(Collectors.toList());
List<InspectionPlanVo> inspectionPlanVos = inspectionPlanMapper.selectVoByIds(itemIdList);
List<InspectionItemVo> inspectionItemVos = inspectionItemMapper.selectVoByIds(itemIdList);
result.getRecords().stream().forEach(s->{
InspectionItemVo inspectionItemVo = inspectionItemVos.stream().filter(vo -> vo.getId() != null && vo.getId().equals(s.getItemId())).findFirst().orElse(null);
s.setItemName(inspectionItemVo.getItemName());
});
return TableDataInfo.build(result);
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java
View File

@ -134,7 +134,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
if (CollUtil.isNotEmpty(residentUnitVolist)) {
ResidentUnitVo residentUnitVo = residentUnitVolist.stream()
.filter(vo -> vo.getId() != null && String.valueOf(vo.getId()).equals(s.getUnit())).findFirst().orElse(null);
s.setUnitName(residentUnitVo.getName());
s.setUnitName(ObjectUtil.isNotEmpty(residentUnitVo) ?residentUnitVo.getName():null);
}
if (CollUtil.isNotEmpty(remoteUserVos)) {
RemoteUserVo remoteUserVo = remoteUserVos.stream()

39
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java
View File

@ -108,12 +108,6 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
*/
@Override
public TableDataInfo<ServiceWorkOrdersVo> queryPageList(ServiceWorkOrdersBo bo, PageQuery pageQuery) {
//当前登录用户
LoginUser loginUser = LoginHelper.getLoginUser();
if (!LoginHelper.isSuperAdmin(loginUser.getUserId())) {
bo.setHandler(loginUser.getUserId());
}
LambdaQueryWrapper<ServiceWorkOrders> lqw = buildQueryWrapper(bo);
Page<ServiceWorkOrdersVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
if (ObjectUtil.isEmpty(result.getRecords())) {
@ -550,5 +544,38 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
};
}
/**
* 分页查询【工单处理】列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 【工单处理】分页列表
*/
@Override
public TableDataInfo<ServiceWorkOrdersVo> queryMobilePageList(ServiceWorkOrdersBo bo, PageQuery pageQuery) {
//当前登录用户
LoginUser loginUser = LoginHelper.getLoginUser();
if (!LoginHelper.isSuperAdmin(loginUser.getUserId())) {
bo.setHandler(loginUser.getUserId());
}
LambdaQueryWrapper<ServiceWorkOrders> lqw = buildQueryWrapper(bo);
Page<ServiceWorkOrdersVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
if (ObjectUtil.isEmpty(result.getRecords())) {
return TableDataInfo.build(result);
}
List<Long> typeList = result.getRecords().stream().map(vo -> vo.getType()).distinct().collect(Collectors.toList());
List<ServiceWorkOrdersTypeVo> serviceWorkOrdersTypeVoList = typesMapper.selectVoByIds(typeList);
if (ObjectUtil.isEmpty(serviceWorkOrdersTypeVoList)) {
return TableDataInfo.build(result);
}
List<ServiceWorkOrdersVo> serviceWorkOrdersVoList = new ArrayList<>();
result.getRecords().stream().forEach(s -> {
ServiceWorkOrdersTypeVo serviceWorkOrdersTypeVo = serviceWorkOrdersTypeVoList.stream().filter(vo -> vo.getId() != null && vo.getId().equals(s.getType())).findFirst().orElse(null);
s.setTypeName(ObjectUtil.isNotNull(serviceWorkOrdersTypeVo) ? serviceWorkOrdersTypeVo.getOrderTypeName() : null);
serviceWorkOrdersVoList.add(s);
});
return TableDataInfo.build(new Page<ServiceWorkOrdersVo>().setRecords(serviceWorkOrdersVoList).setTotal(result.getTotal()));
}
}