From 2a143bb147da7edde4a4842fbae66f2062aa9b22 Mon Sep 17 00:00:00 2001 From: yuyongle <1150359267@qq.com> Date: Thu, 21 Aug 2025 17:35:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=B7=A5=E5=8D=95bu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApplicationController.java | 2 +- .../controller/CostItemsController.java | 12 ++--- .../controller/CostMeterWaterController.java | 12 ++--- .../controller/EnumFetcherController.java | 11 +++++ .../controller/InspectionItemController.java | 12 ++--- .../controller/InspectionPointController.java | 12 ++--- .../TbVisitorManagementController.java | 2 + .../mobile/MServiceWorkOrdersController.java | 10 ++++ .../property/service/EnumFetcherService.java | 8 +++ .../service/impl/EnumFetcherServiceImpl.java | 49 ++++++++++++++++--- .../service/impl/MeetBookingServiceImpl.java | 43 +++++++++------- .../property/tasks/ServiceWorkOrderTasks.java | 24 ++++----- 12 files changed, 135 insertions(+), 62 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ApplicationController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ApplicationController.java index 038e46f0..3dd86602 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ApplicationController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ApplicationController.java @@ -62,7 +62,7 @@ public class ApplicationController extends BaseController { * * @param id 主键 */ - //@SaCheckPermission("property:application:query") + @SaCheckPermission("property:application:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CostItemsController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CostItemsController.java index b18ac483..0741d792 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CostItemsController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CostItemsController.java @@ -40,7 +40,7 @@ public class CostItemsController extends BaseController { /** * 查询费用项设置列表 */ - @SaCheckPermission("property:costItems:list") + @SaCheckPermission("property:costItemSetting:list") @GetMapping("/list") public TableDataInfo list(CostItemsBo bo, PageQuery pageQuery) { return costItemsService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class CostItemsController extends BaseController { /** * 导出费用项设置列表 */ - @SaCheckPermission("property:costItems:export") + @SaCheckPermission("property:costItemSetting:export") @Log(title = "费用项设置", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(CostItemsBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class CostItemsController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("property:costItems:query") + @SaCheckPermission("property:costItemSetting:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -72,7 +72,7 @@ public class CostItemsController extends BaseController { /** * 新增费用项设置 */ - @SaCheckPermission("property:costItems:add") + @SaCheckPermission("property:costItemSetting:add") @Log(title = "费用项设置", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +83,7 @@ public class CostItemsController extends BaseController { /** * 修改费用项设置 */ - @SaCheckPermission("property:costItems:edit") + @SaCheckPermission("property:costItemSetting:edit") @Log(title = "费用项设置", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -96,7 +96,7 @@ public class CostItemsController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("property:costItems:remove") + @SaCheckPermission("property:costItemSetting:remove") @Log(title = "费用项设置", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CostMeterWaterController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CostMeterWaterController.java index 9cd89f4f..c218d8f1 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CostMeterWaterController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CostMeterWaterController.java @@ -40,7 +40,7 @@ public class CostMeterWaterController extends BaseController { /** * 查询费用-水电抄列表 */ - @SaCheckPermission("system:meterWater:list") + @SaCheckPermission("property:costMeterWater:list") @GetMapping("/list") public TableDataInfo list(CostMeterWaterBo bo, PageQuery pageQuery) { return costMeterWaterService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class CostMeterWaterController extends BaseController { /** * 导出费用-水电抄列表 */ - @SaCheckPermission("system:meterWater:export") + @SaCheckPermission("property:costMeterWater:export") @Log(title = "费用-水电抄", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(CostMeterWaterBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class CostMeterWaterController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("system:meterWater:query") + @SaCheckPermission("property:costMeterWater:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -82,7 +82,7 @@ public class CostMeterWaterController extends BaseController { /** * 新增费用-水电抄 */ - @SaCheckPermission("system:meterWater:add") + @SaCheckPermission("property:costMeterWater:add") @Log(title = "费用-水电抄", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -93,7 +93,7 @@ public class CostMeterWaterController extends BaseController { /** * 修改费用-水电抄 */ - @SaCheckPermission("system:meterWater:edit") + @SaCheckPermission("property:costMeterWater:edit") @Log(title = "费用-水电抄", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -106,7 +106,7 @@ public class CostMeterWaterController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("system:meterWater:remove") + @SaCheckPermission("property:costMeterWater:remove") @Log(title = "费用-水电抄", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/EnumFetcherController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/EnumFetcherController.java index f9ce45d0..14215362 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/EnumFetcherController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/EnumFetcherController.java @@ -33,4 +33,15 @@ public class EnumFetcherController { List> map = enumFetcherService.getEnumValues(name); return R.ok(map); } + + /** + * 根据工单类型或部门下的排班人员 + * @param type + * @return + */ + @GetMapping("/enum-getShiftScheduler/{type}") + public R>> getShiftScheduler(@PathVariable("type") String type) { + List> map = enumFetcherService.getShiftScheduler(type); + return R.ok(map); + } } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionItemController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionItemController.java index 5bf5a833..9c1d0b0f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionItemController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionItemController.java @@ -40,7 +40,7 @@ public class InspectionItemController extends BaseController { /** * 查询巡检项目列表 */ - @SaCheckPermission("system:item:list") + @SaCheckPermission("property:inspectionItem:list") @GetMapping("/list") public TableDataInfo list(InspectionItemBo bo, PageQuery pageQuery) { return inspectionItemService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class InspectionItemController extends BaseController { /** * 导出巡检项目列表 */ - @SaCheckPermission("system:item:export") + @SaCheckPermission("property:inspectionItem:export") @Log(title = "巡检项目", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(InspectionItemBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class InspectionItemController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("system:item:query") + @SaCheckPermission("property:inspectionItem:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -72,7 +72,7 @@ public class InspectionItemController extends BaseController { /** * 新增巡检项目 */ - @SaCheckPermission("system:item:add") + @SaCheckPermission("property:inspectionItem:add") @Log(title = "巡检项目", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +83,7 @@ public class InspectionItemController extends BaseController { /** * 修改巡检项目 */ - @SaCheckPermission("system:item:edit") + @SaCheckPermission("property:inspectionItem:edit") @Log(title = "巡检项目", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -96,7 +96,7 @@ public class InspectionItemController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("system:item:remove") + @SaCheckPermission("property:inspectionItem:remove") @Log(title = "巡检项目", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionPointController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionPointController.java index 586b4eb1..b8dafe78 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionPointController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionPointController.java @@ -40,7 +40,7 @@ public class InspectionPointController extends BaseController { /** * 查询巡检点列表 */ - @SaCheckPermission("system:point:list") + @SaCheckPermission("property:inspectionPoint:list") @GetMapping("/list") public TableDataInfo list(InspectionPointBo bo, PageQuery pageQuery) { return inspectionPointService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class InspectionPointController extends BaseController { /** * 导出巡检点列表 */ - @SaCheckPermission("system:point:export") + @SaCheckPermission("property:inspectionPoint:export") @Log(title = "巡检点", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(InspectionPointBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class InspectionPointController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("system:point:query") + @SaCheckPermission("property:inspectionPoint:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -72,7 +72,7 @@ public class InspectionPointController extends BaseController { /** * 新增巡检点 */ - @SaCheckPermission("system:point:add") + @SaCheckPermission("property:inspectionPoint:add") @Log(title = "巡检点", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +83,7 @@ public class InspectionPointController extends BaseController { /** * 修改巡检点 */ - @SaCheckPermission("system:point:edit") + @SaCheckPermission("property:inspectionPoint:edit") @Log(title = "巡检点", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -96,7 +96,7 @@ public class InspectionPointController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("system:point:remove") + @SaCheckPermission("property:inspectionPoint:remove") @Log(title = "巡检点", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbVisitorManagementController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbVisitorManagementController.java index 42da562b..71cbd677 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbVisitorManagementController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbVisitorManagementController.java @@ -145,6 +145,7 @@ public class TbVisitorManagementController extends BaseController { if (info==null){ return R.fail("请确认Qr码有效"); } + bo.setType(0); return toAjax(tbVisitorManagementService.insertByBo(bo)); } @@ -156,6 +157,7 @@ public class TbVisitorManagementController extends BaseController { @RepeatSubmit() @PostMapping public R addVistorManagement(@Validated(AddGroup.class) @RequestBody TbVisitorManagementBo bo) { + bo.setType(1); return toAjax(tbVisitorManagementService.insertVistorManagementByBo(bo)); } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/mobile/MServiceWorkOrdersController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/mobile/MServiceWorkOrdersController.java index 94ce085d..4961fa12 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/mobile/MServiceWorkOrdersController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/mobile/MServiceWorkOrdersController.java @@ -3,6 +3,7 @@ package org.dromara.property.controller.mobile; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; @@ -46,4 +47,13 @@ public class MServiceWorkOrdersController extends BaseController { public TableDataInfo list(ServiceWorkOrdersBo bo, PageQuery pageQuery) { return serviceWorkOrdersService.queryPageList(bo, pageQuery); } + /** + * 修改【工单处理】 + */ + @Log(title = "【工单处理】", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ServiceWorkOrdersBo bo) { + return toAjax(serviceWorkOrdersService.updateByBo(bo)); + } } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/EnumFetcherService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/EnumFetcherService.java index 0662c638..62d22893 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/EnumFetcherService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/EnumFetcherService.java @@ -15,4 +15,12 @@ public interface EnumFetcherService { * @return */ List> getEnumValues(String type); + + /** + * 获取排班信息人员下拉 + * @param type + * @return + */ + + List> getShiftScheduler(String type); } 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 bf7b650a..fe6b63bd 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 @@ -1,17 +1,25 @@ package org.dromara.property.service.impl; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.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.attendanceMapper.AttendanceUserGroupMapper; import org.dromara.property.service.*; import org.dromara.system.api.RemoteUserService; import org.dromara.system.api.domain.vo.RemoteUserVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.time.LocalDate; import java.util.*; import java.util.stream.Collectors; @@ -34,6 +42,11 @@ public class EnumFetcherServiceImpl implements EnumFetcherService { @DubboReference private RemoteUserService remoteUserService; + @Autowired + private ServiceWorkOrdersTypeMapper serviceWorkOrdersTypeMapper; + @Autowired + private AttendanceUserGroupMapper attendanceUserGroupMapper; + @Override public List> getEnumValues(String type) { switch (type) { @@ -57,15 +70,15 @@ public class EnumFetcherServiceImpl implements EnumFetcherService { return getMeetBookingStatus(); case "getServiceWorkOrdersHandler": return serviceWorkOrdersService.getServiceWorkOrdersHandler(type); - case "getAccount": - return getAccount(); default: throw new IllegalArgumentException("Unknown type: " + type); } } -/** - * 获取会议室状态枚举接口 - */ + + + /** + * 获取会议室状态枚举接口 + */ List> getMeetStatus() { return Arrays.stream(MeetStatusEnum.values()) .map(e -> { @@ -110,15 +123,35 @@ public class EnumFetcherServiceImpl implements EnumFetcherService { }) .collect(Collectors.toList()); } + + + @Override + public List> getShiftScheduler(String type) { + ServiceWorkOrdersType serviceWorkOrdersType = serviceWorkOrdersTypeMapper.selectById(type); + LocalDate today = LocalDate.now(); + List attendanceUserGroups = attendanceUserGroupMapper.selectList( + new LambdaQueryWrapper() + //查询今天上班的人员 + .eq(AttendanceUserGroup::getStartDate, today) + .eq(ObjectUtil.isNotNull(serviceWorkOrdersType),AttendanceUserGroup::getDeptId, serviceWorkOrdersType.getCreateDept()) + ); + if (CollUtil.isEmpty(attendanceUserGroups)) { + return List.of(); + } + // 收集用户id + List userIdList = attendanceUserGroups.stream().map(AttendanceUserGroup::getEmployeeId).toList(); + return getAccount(userIdList); + } + /** * 获取账户信息 */ - List> getAccount() { - List remoteUserVos = remoteUserService.selectUserList(new ArrayList<>()); + List> getAccount(List userIdList) { + List remoteUserVos = remoteUserService.selectUserList(userIdList); return remoteUserVos.stream() .map(e -> { Map map = new HashMap<>(); - map.put("value", e.getUserName()); + map.put("value", e.getUserId()); map.put("name", e.getNickName()); return map; }) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java index 99ff5043..4ff42cec 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.dubbo.config.annotation.DubboReference; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; @@ -19,6 +20,8 @@ import org.dromara.property.domain.bo.MeetBookingBo; import org.dromara.property.domain.vo.*; import org.dromara.property.mapper.*; import org.dromara.property.service.IMeetBookingService; +import org.dromara.system.api.RemoteUserService; +import org.dromara.system.api.domain.vo.RemoteUserVo; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -46,6 +49,8 @@ public class MeetBookingServiceImpl implements IMeetBookingService { private final TbRoomMapper roomMapper; private final MeetMapper meetMapper; private final ResidentUnitMapper residentUnitMapper; + @DubboReference + private RemoteUserService remoteUserService; /** * 查询会议预约 @@ -80,8 +85,8 @@ public class MeetBookingServiceImpl implements IMeetBookingService { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); List residentUnitVolist = residentUnitMapper.selectVoList(); - List residentPersonsVolist = residentPersonMapper.selectVoList(); - + List userId = result.getRecords().stream().map(vo -> vo.getPerson()).distinct().map(Long::parseLong).collect(Collectors.toList()); + List remoteUserVos = remoteUserService.selectListByIds(userId); List meetBookingVoList = new ArrayList<>(); result.getRecords().stream().forEach(s -> { if (CollUtil.isNotEmpty(residentUnitVolist)) { @@ -89,11 +94,11 @@ public class MeetBookingServiceImpl implements IMeetBookingService { .filter(vo -> vo.getId() != null && String.valueOf(vo.getId()).equals(s.getUnit())).findFirst().orElse(null); s.setUnitName(ObjectUtil.isNotEmpty(residentUnitVo) ? residentUnitVo.getName() : null); } - if (CollUtil.isNotEmpty(residentPersonsVolist)) { - ResidentPersonVo residentPersonVo = residentPersonsVolist.stream() - .filter(vo -> vo.getId() != null && String.valueOf(vo.getId()).equals(s.getPerson())).findFirst().orElse(null); - s.setPersonName(ObjectUtil.isNotEmpty(residentPersonVo) ? residentPersonVo.getUserName() : null); - s.setPhone(ObjectUtil.isNotEmpty(residentPersonVo) ? residentPersonVo.getPhone() : null); + if (CollUtil.isNotEmpty(remoteUserVos)) { + RemoteUserVo remoteUserVo = remoteUserVos.stream() + .filter(vo -> vo.getUserId() != null && String.valueOf(vo.getUserId()).equals(s.getPerson())).findFirst().orElse(null); + s.setPersonName(ObjectUtil.isNotEmpty(remoteUserVo) ? remoteUserVo.getNickName() : null); + s.setPhone(ObjectUtil.isNotEmpty(remoteUserVo) ? remoteUserVo.getPhonenumber() : null); } meetBookingVoList.add(s); }); @@ -122,7 +127,8 @@ public class MeetBookingServiceImpl implements IMeetBookingService { List meetBookingAppointmentVoList = BeanUtil.copyToList(meetBookings, MeetBookingAppointmentVo.class); SimpleDateFormat df = new SimpleDateFormat("HH"); List residentUnitVolist = residentUnitMapper.selectVoList(); - List residentPersonsVolist = residentPersonMapper.selectVoList(); + List userId = meetBookingAppointmentVoList.stream().map(vo -> vo.getPerson()).distinct().map(Long::parseLong).collect(Collectors.toList()); + List remoteUserVos = remoteUserService.selectListByIds(userId); meetBookingAppointmentVoList.stream().forEach( s -> { if (CollUtil.isNotEmpty(residentUnitVolist)) { @@ -130,11 +136,11 @@ public class MeetBookingServiceImpl implements IMeetBookingService { .filter(vo -> vo.getId() != null && String.valueOf(vo.getId()).equals(s.getUnit())).findFirst().orElse(null); s.setUnitName(residentUnitVo.getName()); } - if (CollUtil.isNotEmpty(residentPersonsVolist)) { - ResidentPersonVo residentPersonVo = residentPersonsVolist.stream() - .filter(vo -> vo.getId() != null && String.valueOf(vo.getId()).equals(s.getPerson())).findFirst().orElse(null); - s.setPersonName(residentPersonVo.getUserName()); - s.setPhone(residentPersonVo.getPhone()); + if (CollUtil.isNotEmpty(remoteUserVos)) { + RemoteUserVo remoteUserVo = remoteUserVos.stream() + .filter(vo -> vo.getUserId() != null && String.valueOf(vo.getUserId()).equals(s.getPerson())).findFirst().orElse(null); + s.setPersonName(ObjectUtil.isNotEmpty(remoteUserVo) ? remoteUserVo.getNickName() : null); + s.setPhone(ObjectUtil.isNotEmpty(remoteUserVo) ? remoteUserVo.getPhonenumber() : null); } String str = df.format(s.getScheduledStarttime()); int a = Integer.parseInt(str); @@ -181,17 +187,18 @@ public class MeetBookingServiceImpl implements IMeetBookingService { List meetBookingWeekList = new ArrayList<>(); SimpleDateFormat df = new SimpleDateFormat("HH"); List residentUnitVolist = residentUnitMapper.selectVoList(); - List residentPersonsVolist = residentPersonMapper.selectVoList(); + List userId = meetBookingWeekVoList.stream().map(vo -> vo.getPerson()).distinct().map(Long::parseLong).collect(Collectors.toList()); + List remoteUserVos = remoteUserService.selectListByIds(userId); meetBookingWeekVoList.stream().forEach(s -> { 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()); } - if (CollUtil.isNotEmpty(residentPersonsVolist)) { - ResidentPersonVo residentPersonVo = residentPersonsVolist.stream() - .filter(vo -> vo.getId() != null && String.valueOf(vo.getId()).equals(s.getPerson())).findFirst().orElse(null); - s.setPersonName(residentPersonVo.getUserName()); + if (CollUtil.isNotEmpty(remoteUserVos)) { + RemoteUserVo remoteUserVo = remoteUserVos.stream() + .filter(vo -> vo.getUserId() != null && String.valueOf(vo.getUserId()).equals(s.getPerson())).findFirst().orElse(null); + s.setPersonName(ObjectUtil.isNotEmpty(remoteUserVo) ? remoteUserVo.getNickName() : null); } //设置指定的Date对象不设置默认返回当天的星期 calendar.setTime(s.getScheduledStarttime()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/tasks/ServiceWorkOrderTasks.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/tasks/ServiceWorkOrderTasks.java index dbc80433..9f7614b8 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/tasks/ServiceWorkOrderTasks.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/tasks/ServiceWorkOrderTasks.java @@ -21,6 +21,8 @@ import org.springframework.scheduling.annotation.Scheduled; import java.time.LocalDate; import java.util.Date; import java.util.List; + +import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -31,12 +33,12 @@ import org.springframework.web.bind.annotation.RestController; * @Description:自动派单 **/ @Slf4j -//@Component -//@RequiredArgsConstructor - +@Component @RequiredArgsConstructor -@RestController -@RequestMapping("/serviceWorkOrderTasks") + +//@RequiredArgsConstructor +//@RestController +//@RequestMapping("/serviceWorkOrderTasks") public class ServiceWorkOrderTasks { private ServiceWorkOrdersMapper workOrdersMapper; private ServiceWorkOrdersRecordMapper workOrdersRecordMapper; @@ -53,13 +55,13 @@ public class ServiceWorkOrderTasks { new LambdaQueryWrapper() .eq(ServiceWorkOrders::getStatus, WorkOrderStatusEnum.CREATE_ORDER.getValue())); if(CollUtil.isNotEmpty(serviceWorkOrderList)){ + LocalDate today = LocalDate.now(); + List attendanceUserGroups = attendanceUserGroupMapper.selectList( + new LambdaQueryWrapper() + //查询今天上班的人员 + .eq(AttendanceUserGroup::getStartDate, today) + ); serviceWorkOrderList.stream().forEach(s->{ - //查询今天上班的人员 - LocalDate today = LocalDate.now(); - List attendanceUserGroups = attendanceUserGroupMapper.selectList( - new LambdaQueryWrapper() - .eq(AttendanceUserGroup::getStartDate, today) - ); if(CollUtil.isNotEmpty(attendanceUserGroups)){ attendanceUserGroups.stream().forEach(s1->{ ServiceWorkOrdersRecord serviceWorkOrdersRecord = new ServiceWorkOrdersRecord();