|
@@ -6675,6 +6675,27 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
|
|
|
|
|
|
|
|
PageResult<AdminUserRespDTO> pageResult = new PageResult<>();
|
|
PageResult<AdminUserRespDTO> pageResult = new PageResult<>();
|
|
|
|
|
|
|
|
|
|
+ // 电站锅炉记录校核人为角色 power_plant_boiler_inspector
|
|
|
|
|
+ if (pageReqVO.getOrderItemId() != null) {
|
|
|
|
|
+ BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(pageReqVO.getOrderItemId());
|
|
|
|
|
+ if (itemDO != null && "1".equals(itemDO.getBoilerType())) {
|
|
|
|
|
+ try {
|
|
|
|
|
+ List<AdminUserRespDTO> roleUsers = adminUserApi.getUserListByRoleCode("power_plant_boiler_inspector").getCheckedData();
|
|
|
|
|
+ if (roleUsers != null) {
|
|
|
|
|
+ if (pageReqVO.getNickName() != null) {
|
|
|
|
|
+ roleUsers = roleUsers.stream()
|
|
|
|
|
+ .filter(user -> user.getNickname() != null && user.getNickname().contains(pageReqVO.getNickName()))
|
|
|
|
|
+ .toList();
|
|
|
|
|
+ }
|
|
|
|
|
+ pageResult.setList(new ArrayList<>(roleUsers));
|
|
|
|
|
+ pageResult.setTotal((long) roleUsers.size());
|
|
|
|
|
+ }
|
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
|
+ log.warn("获取电站锅炉校核人(power_plant_boiler_inspector)角色用户失败, orderId: {}", pageReqVO.getOrderId(), e);
|
|
|
|
|
+ }
|
|
|
|
|
+ return pageResult;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
List<BoilerTaskOrderUserDO> orderUserDOList = boilerTaskOrderUserMapper.selectList(new LambdaQueryWrapperX<BoilerTaskOrderUserDO>().
|
|
List<BoilerTaskOrderUserDO> orderUserDOList = boilerTaskOrderUserMapper.selectList(new LambdaQueryWrapperX<BoilerTaskOrderUserDO>().
|
|
|
eq(BoilerTaskOrderUserDO::getOrderId, pageReqVO.getOrderId()));
|
|
eq(BoilerTaskOrderUserDO::getOrderId, pageReqVO.getOrderId()));
|
|
|
|
|
|