From 1d8ad14ebc20428a2eae97ddd55a0213adf2835e Mon Sep 17 00:00:00 2001 From: mocheng <3057647414@qq.com> Date: Fri, 22 Aug 2025 11:51:23 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3nacos=E9=85=8D=E7=BD=AEpo?= =?UTF-8?q?m=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b9215065..e7419138 100644 --- a/pom.xml +++ b/pom.xml @@ -101,13 +101,17 @@ prod prod - 10.20.1.185:8848 - 10.20.1.185:4560 + 127.0.0.1:8848 + 127.0.0.1:4560 DEFAULT_GROUP DEFAULT_GROUP nacos nacos + + + true + From a36667e599bc6f6c2ea67967fdbebdf162d21071 Mon Sep 17 00:00:00 2001 From: mocheng <3057647414@qq.com> Date: Fri, 22 Aug 2025 12:16:51 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3nacos=E9=85=8D=E7=BD=AEpo?= =?UTF-8?q?m=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e7419138..8902ec93 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ prod - prod + dev 127.0.0.1:8848 127.0.0.1:4560 DEFAULT_GROUP From 359a3809379ad177371e4504b0e390d6fc32b2dd Mon Sep 17 00:00:00 2001 From: mocheng <3057647414@qq.com> Date: Fri, 22 Aug 2025 13:51:40 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3nacos=E9=85=8D=E7=BD=AEpo?= =?UTF-8?q?m=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 8902ec93..98677c70 100644 --- a/pom.xml +++ b/pom.xml @@ -69,6 +69,23 @@ + + local + + + dev + 10.20.1.65:8848 + 10.20.1.65:4560 + DEFAULT_GROUP + DEFAULT_GROUP + nacos + nacos + + + + true + + dev @@ -100,7 +117,7 @@ prod - dev + prod 127.0.0.1:8848 127.0.0.1:4560 DEFAULT_GROUP @@ -108,10 +125,6 @@ nacos nacos - - - true - From 3c144d00e566f16485ad2c53abb250deb7964456 Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Fri, 22 Aug 2025 14:48:31 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=B8=8D=E4=BC=A0?= =?UTF-8?q?=E9=9B=86=E5=90=88=E6=97=B6=E7=8A=B6=E6=80=81=E6=94=B9=E4=B8=8D?= =?UTF-8?q?=E4=BA=86=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/attendanceImpl/AttendanceGroupServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceGroupServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceGroupServiceImpl.java index 9daa09fc..4c7a72e7 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceGroupServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceGroupServiceImpl.java @@ -264,6 +264,9 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService { //1.固定班制 //取出考勤组id Long groupId = update.getId(); + if(bo.getWeekSetList() == null || bo.getWeekSetList().isEmpty()){ + return baseMapper.updateById(update) > 0; + } bo.getWeekSetList().forEach( weekSet -> { //1.固定班制，修改考勤周期表中的数据 From d0ccd668fa9ad8ebbb57ad716b58290602794ca5 Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Fri, 22 Aug 2025 16:29:37 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E4=B8=8D=E8=BF=94=E5=9B=9E=E8=AE=BE=E5=A4=87bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/attendanceVo/AttendanceAreaDeviceVo.java | 3 +++ .../attendanceImpl/AttendanceAreaServiceImpl.java | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceAreaDeviceVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceAreaDeviceVo.java index 3dec0c99..4440af3c 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceAreaDeviceVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceAreaDeviceVo.java @@ -9,6 +9,7 @@ import org.dromara.sis.api.domain.RemoteSisDeviceManage; import java.io.Serial; import java.io.Serializable; +import java.util.List; /** @@ -45,4 +46,6 @@ public class AttendanceAreaDeviceVo implements Serializable { private RemoteSisDeviceManage remoteSisDeviceManage; + + private List areaDevice; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceAreaServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceAreaServiceImpl.java index 412fb53c..0cfc55a0 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceAreaServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceAreaServiceImpl.java @@ -54,7 +54,19 @@ public class AttendanceAreaServiceImpl implements IAttendanceAreaService { */ @Override public AttendanceAreaVo queryById(Long id) { - return baseMapper.selectVoById(id); + + AttendanceAreaVo attendanceAreaVo = baseMapper.selectVoById(id); + //根据id查询中间表数据 + List attendanceAreaDeviceList = areaDeviceMapper.selectVoList(Wrappers.lambdaQuery().eq(AttendanceAreaDevice::getAreaId, id)); + //根据设备id集合查询设备数据 + attendanceAreaDeviceList.forEach(item -> { + //根据deviceManageId查询设备数据 + RemoteSisDeviceManage remoteSisDeviceManage = remoteDeviceService.queryDeviceById(item.getDeviceManageId()); + item.setRemoteSisDeviceManage(remoteSisDeviceManage); + attendanceAreaVo.setAreaDevice(attendanceAreaDeviceList); + }); + + return attendanceAreaVo; } /** From 1aa576a9aebd9ef41d31431996a4f3e14408d00b Mon Sep 17 00:00:00 2001 From: yuyongle <1150359267@qq.com> Date: Fri, 22 Aug 2025 17:33:25 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=9D=83?= =?UTF-8?q?=E9=99=90bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CapitalApplicationController.java | 14 +++--- .../controller/CostPayFeeAuditController.java | 12 ++--- .../CostReturnPayFeeController.java | 14 +++--- .../controller/InspectionRouteController.java | 12 ++--- .../MachineMaintainPlanController.java | 12 ++--- .../MachineMaintainTaskDetailController.java | 14 +++--- .../controller/MeetAttachController.java | 8 +-- .../controller/MeetBookingController.java | 9 ++-- .../property/controller/MeetController.java | 4 +- .../ServiceWorkOrdersTypeController.java | 14 +++--- .../bo/mobile/MServiceWorkOrdersBo.java | 7 ++- .../property/domain/vo/CostCarChargeVo.java | 5 ++ .../impl/CostCarChargeServiceImpl.java | 50 +++++++++++-------- .../impl/CostHouseChargeServiceImpl.java | 14 ++++-- .../impl/CostPayFeeAuditServiceImpl.java | 6 +++ .../CustomerContingenPlanServiceImpl.java | 1 + .../service/impl/EnumFetcherServiceImpl.java | 21 ++++++-- .../service/impl/MeetBookingServiceImpl.java | 41 ++++++++------- .../impl/ServiceWorkOrdersServiceImpl.java | 6 +++ .../property/tasks/ServiceWorkOrderTasks.java | 3 +- 20 files changed, 161 insertions(+), 106 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CapitalApplicationController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CapitalApplicationController.java index 30ea5c89..56654434 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CapitalApplicationController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CapitalApplicationController.java @@ -24,7 +24,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; /** * 资产申请 - * 前端访问路由地址为:/domain/application + * 前端访问路由地址为:/domain/procurementApplication * * @author mocheng * @date 2025-07-25 @@ -40,7 +40,7 @@ public class CapitalApplicationController extends BaseController { /** * 查询资产申请列表 */ - // @SaCheckPermission("domain:application:list") + @SaCheckPermission("domain:procurementApplication:list") @GetMapping("/list") public TableDataInfo list(CapitalApplicationBo bo, PageQuery pageQuery) { return capitalApplicationService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class CapitalApplicationController extends BaseController { /** * 导出资产申请列表 */ - @SaCheckPermission("domain:application:export") + @SaCheckPermission("domain:procurementApplication:export") @Log(title = "资产申请", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(CapitalApplicationBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class CapitalApplicationController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("domain:application:query") + @SaCheckPermission("domain:procurementApplication:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -72,7 +72,7 @@ public class CapitalApplicationController extends BaseController { /** * 新增资产申请 */ - // @SaCheckPermission("domain:application:add") + // @SaCheckPermission("domain:procurementApplication:add") @Log(title = "资产申请", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +83,7 @@ public class CapitalApplicationController extends BaseController { /** * 修改资产申请 */ - @SaCheckPermission("domain:application:edit") + @SaCheckPermission("domain:procurementApplication:edit") @Log(title = "资产申请", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -96,7 +96,7 @@ public class CapitalApplicationController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("domain:application:remove") + @SaCheckPermission("domain:procurementApplication: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/CostPayFeeAuditController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CostPayFeeAuditController.java index 338c4702..c920771a 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CostPayFeeAuditController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CostPayFeeAuditController.java @@ -40,7 +40,7 @@ public class CostPayFeeAuditController extends BaseController { /** * 查询费用-缴费审核列表 */ - // @SaCheckPermission("system:payFeeAudit:list") + @SaCheckPermission("property:payFeeAudit:list") @GetMapping("/list") public TableDataInfo list(CostPayFeeAuditBo bo, PageQuery pageQuery) { return costPayFeeAuditService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class CostPayFeeAuditController extends BaseController { /** * 导出费用-缴费审核列表 */ - @SaCheckPermission("system:payFeeAudit:export") + @SaCheckPermission("property:payFeeAudit:export") @Log(title = "费用-缴费审核", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(CostPayFeeAuditBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class CostPayFeeAuditController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("system:payFeeAudit:query") + @SaCheckPermission("property:payFeeAudit:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -72,7 +72,7 @@ public class CostPayFeeAuditController extends BaseController { /** * 新增费用-缴费审核 */ - @SaCheckPermission("system:payFeeAudit:add") + @SaCheckPermission("property:payFeeAudit:add") @Log(title = "费用-缴费审核", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +83,7 @@ public class CostPayFeeAuditController extends BaseController { /** * 修改费用-缴费审核 */ - @SaCheckPermission("system:payFeeAudit:edit") + @SaCheckPermission("property:payFeeAudit:edit") @Log(title = "费用-缴费审核", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -96,7 +96,7 @@ public class CostPayFeeAuditController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("system:payFeeAudit:remove") + @SaCheckPermission("property:payFeeAudit: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/CostReturnPayFeeController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CostReturnPayFeeController.java index 956f94b6..7972d02f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CostReturnPayFeeController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CostReturnPayFeeController.java @@ -24,7 +24,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; /** * 费用-抄类型 - * 前端访问路由地址为:/system/returnPayFee + * 前端访问路由地址为:/property/returnPayFee * * @author mocheng * @date 2025-07-17 @@ -40,7 +40,7 @@ public class CostReturnPayFeeController extends BaseController { /** * 查询费用-抄类型列表 */ - //@SaCheckPermission("system:returnPayFee:list") + @SaCheckPermission("property:returnPayFee:list") @GetMapping("/list") public TableDataInfo list(CostReturnPayFeeBo bo, PageQuery pageQuery) { return costReturnPayFeeService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class CostReturnPayFeeController extends BaseController { /** * 导出费用-抄类型列表 */ - @SaCheckPermission("system:returnPayFee:export") + @SaCheckPermission("property:returnPayFee:export") @Log(title = "费用-抄类型", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(CostReturnPayFeeBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class CostReturnPayFeeController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("system:returnPayFee:query") + @SaCheckPermission("property:returnPayFee:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -72,7 +72,7 @@ public class CostReturnPayFeeController extends BaseController { /** * 新增费用-抄类型 */ - @SaCheckPermission("system:returnPayFee:add") + @SaCheckPermission("property:returnPayFee:add") @Log(title = "费用-抄类型", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +83,7 @@ public class CostReturnPayFeeController extends BaseController { /** * 修改费用-抄类型 */ - @SaCheckPermission("system:returnPayFee:edit") + @SaCheckPermission("property:returnPayFee:edit") @Log(title = "费用-抄类型", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -96,7 +96,7 @@ public class CostReturnPayFeeController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("system:returnPayFee:remove") + @SaCheckPermission("property:returnPayFee: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/InspectionRouteController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionRouteController.java index 49a64be6..14b01122 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionRouteController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionRouteController.java @@ -40,7 +40,7 @@ public class InspectionRouteController extends BaseController { /** * 查询巡检路线列表 */ - //@SaCheckPermission("system:route:list") + @SaCheckPermission("property:route:list") @GetMapping("/list") public TableDataInfo list(InspectionRouteBo bo, PageQuery pageQuery) { return inspectionRouteService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class InspectionRouteController extends BaseController { /** * 导出巡检路线列表 */ - @SaCheckPermission("system:route:export") + @SaCheckPermission("property:route: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("system:route:query") + @SaCheckPermission("property:route:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -72,7 +72,7 @@ public class InspectionRouteController extends BaseController { /** * 新增巡检路线 */ - @SaCheckPermission("system:route:add") + @SaCheckPermission("property:route:add") @Log(title = "巡检路线", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +83,7 @@ public class InspectionRouteController extends BaseController { /** * 修改巡检路线 */ - @SaCheckPermission("system:route:edit") + @SaCheckPermission("property:route:edit") @Log(title = "巡检路线", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -96,7 +96,7 @@ public class InspectionRouteController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("system:route:remove") + @SaCheckPermission("property:route: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/MachineMaintainPlanController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MachineMaintainPlanController.java index 4adf34e0..4b7948b5 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MachineMaintainPlanController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MachineMaintainPlanController.java @@ -40,7 +40,7 @@ public class MachineMaintainPlanController extends BaseController { /** * 查询设备保养计划列表 */ - @SaCheckPermission("system:maintainPlan:list") + @SaCheckPermission("property:maintainPlan:list") @GetMapping("/list") public TableDataInfo list(MachineMaintainPlanBo bo, PageQuery pageQuery) { return machineMaintainPlanService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class MachineMaintainPlanController extends BaseController { /** * 导出设备保养计划列表 */ - @SaCheckPermission("system:maintainPlan:export") + @SaCheckPermission("property:maintainPlan:export") @Log(title = "设备保养计划", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(MachineMaintainPlanBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class MachineMaintainPlanController extends BaseController { * * @param id 主键 */ - //@SaCheckPermission("system:maintainPlan:query") + @SaCheckPermission("property:maintainPlan:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -72,7 +72,7 @@ public class MachineMaintainPlanController extends BaseController { /** * 新增设备保养计划 */ - @SaCheckPermission("system:maintainPlan:add") + @SaCheckPermission("property:maintainPlan:add") @Log(title = "设备保养计划", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +83,7 @@ public class MachineMaintainPlanController extends BaseController { /** * 修改设备保养计划 */ - @SaCheckPermission("system:maintainPlan:edit") + @SaCheckPermission("property:maintainPlan:edit") @Log(title = "设备保养计划", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -96,7 +96,7 @@ public class MachineMaintainPlanController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("system:maintainPlan:remove") + @SaCheckPermission("property:maintainPlan: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/MachineMaintainTaskDetailController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MachineMaintainTaskDetailController.java index 085319e6..69a80a54 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MachineMaintainTaskDetailController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MachineMaintainTaskDetailController.java @@ -24,7 +24,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; /** * 设备保养任务明细 - * 前端访问路由地址为:/domain/maintainTaskDetail + * 前端访问路由地址为:/property/maintainTaskDetail * * @author mocheng * @date 2025-07-16 @@ -40,7 +40,7 @@ public class MachineMaintainTaskDetailController extends BaseController { /** * 查询设备保养任务明细列表 */ - @SaCheckPermission("domain:maintainTaskDetail:list") + @SaCheckPermission("property:maintainTaskDetail:list") @GetMapping("/list") public TableDataInfo list(MachineMaintainTaskDetailBo bo, PageQuery pageQuery) { return machineMaintainTaskDetailService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class MachineMaintainTaskDetailController extends BaseController { /** * 导出设备保养任务明细列表 */ - @SaCheckPermission("domain:maintainTaskDetail:export") + @SaCheckPermission("property:maintainTaskDetail:export") @Log(title = "设备保养任务明细", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(MachineMaintainTaskDetailBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class MachineMaintainTaskDetailController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("domain:maintainTaskDetail:query") + @SaCheckPermission("property:maintainTaskDetail:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -72,7 +72,7 @@ public class MachineMaintainTaskDetailController extends BaseController { /** * 新增设备保养任务明细 */ - @SaCheckPermission("domain:maintainTaskDetail:add") + @SaCheckPermission("property:maintainTaskDetail:add") @Log(title = "设备保养任务明细", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +83,7 @@ public class MachineMaintainTaskDetailController extends BaseController { /** * 修改设备保养任务明细 */ - @SaCheckPermission("domain:maintainTaskDetail:edit") + @SaCheckPermission("property:maintainTaskDetail:edit") @Log(title = "设备保养任务明细", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -96,7 +96,7 @@ public class MachineMaintainTaskDetailController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("domain:maintainTaskDetail:remove") + @SaCheckPermission("property:maintainTaskDetail: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/MeetAttachController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetAttachController.java index 9ac00cd3..ffa91146 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetAttachController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetAttachController.java @@ -40,7 +40,7 @@ public class MeetAttachController extends BaseController { /** * 查询分页会议室增值服务列表 */ - // @SaCheckPermission("property:attach:list") + @SaCheckPermission("property:attach:list") @GetMapping("/list") public TableDataInfo 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:attach:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -78,7 +78,7 @@ public class MeetAttachController extends BaseController { /** * 修改会议室增值服务 */ - // @SaCheckPermission("property:attach:edit") + @SaCheckPermission("property:attach: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:attach: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/MeetBookingController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetBookingController.java index 68ab35e1..d2edb3c3 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetBookingController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetBookingController.java @@ -1,5 +1,6 @@ package org.dromara.property.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; @@ -40,7 +41,7 @@ public class MeetBookingController extends BaseController { /** * 查询会议预约记录列表 */ - //@SaCheckPermission("property:meetbooking:list") + @SaCheckPermission("property:meetbooking:list") @GetMapping("/list") public TableDataInfo list(MeetBookingBo bo, PageQuery pageQuery) { return meetBookingService.queryPageList(bo, pageQuery); @@ -64,7 +65,7 @@ public class MeetBookingController extends BaseController { * * @param id 主键 */ - //@SaCheckPermission("property:meetbooking:query") + @SaCheckPermission("property:meetbooking:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -74,7 +75,7 @@ public class MeetBookingController extends BaseController { /** * 新增会议预约 */ - //@SaCheckPermission("property:meetbooking:add") + @SaCheckPermission("property:meetbooking:add") @Log(title = "会议预约", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -85,7 +86,7 @@ public class MeetBookingController extends BaseController { /** * 修改会议预约 */ - // @SaCheckPermission("property:meetbooking:edit") + @SaCheckPermission("property:meetbooking:edit") @Log(title = "会议预约", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetController.java index 09855f67..8bd11bb6 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetController.java @@ -43,7 +43,7 @@ public class MeetController extends BaseController { /** * 查询会议室管理列表 */ - // @SaCheckPermission("property:meet:list") + @SaCheckPermission("property:meet:list") @Operation @GetMapping("/list") public TableDataInfo list(MeetBo bo, PageQuery pageQuery) { @@ -66,7 +66,7 @@ public class MeetController extends BaseController { * * @param id 主键 */ - //@SaCheckPermission("property:meet:query") + @SaCheckPermission("property:meet:query") @Operation @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ServiceWorkOrdersTypeController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ServiceWorkOrdersTypeController.java index 82d06c3c..f7f1bc92 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ServiceWorkOrdersTypeController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ServiceWorkOrdersTypeController.java @@ -24,7 +24,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; /** * 【工单类型】 - * 前端访问路由地址为:/system/workOrdersType + * 前端访问路由地址为:/property/workOrdersType * * @author mocheng * @date 2025-07-09 @@ -40,7 +40,7 @@ public class ServiceWorkOrdersTypeController extends BaseController { /** * 查询【工单类型】列表 */ - @SaCheckPermission("system:workOrdersType:list") + @SaCheckPermission("property:workOrdersType:list") @GetMapping("/list") public TableDataInfo list(ServiceWorkOrdersTypeBo bo, PageQuery pageQuery) { return serviceWorkOrdersTypeService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class ServiceWorkOrdersTypeController extends BaseController { /** * 导出【工单类型】列表 */ - @SaCheckPermission("system:workOrdersType:export") + @SaCheckPermission("property:workOrdersType:export") @Log(title = "【导出工单类型】", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(ServiceWorkOrdersTypeBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class ServiceWorkOrdersTypeController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("system:workOrdersType:query") + @SaCheckPermission("property:workOrdersType:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -72,7 +72,7 @@ public class ServiceWorkOrdersTypeController extends BaseController { /** * 新增【工单类型】 */ - @SaCheckPermission("system:workOrdersType:add") + @SaCheckPermission("property:workOrdersType:add") @Log(title = "【新增工单类型】", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +83,7 @@ public class ServiceWorkOrdersTypeController extends BaseController { /** * 修改【工单类型】 */ - @SaCheckPermission("system:workOrdersType:edit") + @SaCheckPermission("property:workOrdersType:edit") @Log(title = "【工单类型】", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -96,7 +96,7 @@ public class ServiceWorkOrdersTypeController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("system:workOrdersType:remove") + @SaCheckPermission("property:workOrdersType: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/domain/bo/mobile/MServiceWorkOrdersBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/mobile/MServiceWorkOrdersBo.java index 747806b4..d1e8799d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/mobile/MServiceWorkOrdersBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/mobile/MServiceWorkOrdersBo.java @@ -3,6 +3,7 @@ package org.dromara.property.domain.bo.mobile; import cn.idev.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; @@ -28,7 +29,11 @@ public class MServiceWorkOrdersBo extends BaseEntity { */ @NotNull(message = "id不能为空", groups = { EditGroup.class }) private Long id; - + /** + * 工单名称 + */ + @NotBlank(message = "工单名称不能为空", groups = { EditGroup.class }) + private String orderName; /** * 工单编号 */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CostCarChargeVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CostCarChargeVo.java index 8734ef72..e3688d0e 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CostCarChargeVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CostCarChargeVo.java @@ -48,6 +48,11 @@ public class CostCarChargeVo implements Serializable { */ @ExcelProperty(value = "业主") private Long personId; + /** + * 业主姓名 + */ + @ExcelProperty(value = "业主姓名") + private String personName; /** * 楼层 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostCarChargeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostCarChargeServiceImpl.java index 05dbd42c..f7fd951d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostCarChargeServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostCarChargeServiceImpl.java @@ -1,40 +1,42 @@ package org.dromara.property.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.dromara.property.domain.CostHouseCharge; +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; +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.bo.CostCarChargeBo; import org.dromara.property.domain.bo.CostChargeReturnFeeBo; import org.dromara.property.domain.enums.ChargeStatusEnum; -import org.dromara.property.domain.vo.CostHouseChargeVo; +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.springframework.stereotype.Service; -import org.dromara.property.domain.bo.CostCarChargeBo; -import org.dromara.property.domain.vo.CostCarChargeVo; -import org.dromara.property.domain.CostCarCharge; -import org.dromara.property.mapper.CostCarChargeMapper; import org.dromara.property.service.ICostCarChargeService; +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; import java.math.BigDecimal; +import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Collection; +import java.util.Objects; +import java.util.stream.Collectors; /** * 费用-车辆收费Service业务层处理 @@ -51,6 +53,8 @@ public class CostCarChargeServiceImpl implements ICostCarChargeService { private final CostItemsMapper costItemsMapper; private final CostPayFeeAuditMapper costPayFeeAuditMapper; private final CostReturnPayFeeMapper costReturnPayFeeMapper; + @DubboReference + private RemoteUserService remoteUserService; /** @@ -60,7 +64,7 @@ public class CostCarChargeServiceImpl implements ICostCarChargeService { * @return 费用-车辆收费 */ @Override - public CostCarChargeVo queryById(Long id){ + public CostCarChargeVo queryById(Long id) { return baseMapper.selectVoById(id); } @@ -75,6 +79,12 @@ public class CostCarChargeServiceImpl implements ICostCarChargeService { public TableDataInfo queryPageList(CostCarChargeBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + List residentPersonIdList = result.getRecords().stream().map(vo -> vo.getPersonId()).distinct().collect(Collectors.toList()); + List remoteUserVos = remoteUserService.selectListByIds(residentPersonIdList); + 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); + }); return TableDataInfo.build(result); } @@ -142,6 +152,7 @@ public class CostCarChargeServiceImpl implements ICostCarChargeService { /** * 车辆退费 + * * @param bo * @return */ @@ -149,7 +160,7 @@ public class CostCarChargeServiceImpl implements ICostCarChargeService { @Transactional(rollbackFor = Exception.class) public Boolean returnFree(CostChargeReturnFeeBo bo) { CostCarCharge costCarCharge = baseMapper.selectById(bo.getId()); - Assert.isTrue(ObjectUtil.isNotEmpty(costCarCharge),"该费用不存在"); + Assert.isTrue(ObjectUtil.isNotEmpty(costCarCharge), "该费用不存在"); var CostReturnPayFee = new CostReturnPayFee() .setChargeId(costCarCharge.getId()) .setChargeType("2") @@ -159,8 +170,7 @@ public class CostCarChargeServiceImpl implements ICostCarChargeService { .setUserId(costCarCharge.getPersonId()) .setPayNo(costCarCharge.getId().toString()) .setPayAcount(costCarCharge.getAmountReceivable()) - .setState("0") - ; + .setState("0"); costReturnPayFeeMapper.insert(CostReturnPayFee); costCarCharge.setChargeStatus(ChargeStatusEnum.REFUND_PENDING_REVIEW.getValue()); return baseMapper.updateById(costCarCharge) > 0; @@ -183,7 +193,7 @@ public class CostCarChargeServiceImpl implements ICostCarChargeService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(CostCarCharge entity){ + private void validEntityBeforeSave(CostCarCharge entity) { //TODO 做一些数据校验,如唯一约束 } @@ -197,7 +207,7 @@ public class CostCarChargeServiceImpl implements ICostCarChargeService { @Override @Transactional(rollbackFor = Exception.class) public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteByIds(ids) > 0; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostHouseChargeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostHouseChargeServiceImpl.java index dd7050e0..acadc285 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostHouseChargeServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostHouseChargeServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; +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.TableDataInfo; @@ -19,6 +20,8 @@ import org.dromara.property.domain.bo.CostChargeReturnFeeBo; import org.dromara.property.domain.enums.ChargeStatusEnum; import org.dromara.property.domain.vo.*; import org.dromara.property.mapper.*; +import org.dromara.system.api.RemoteUserService; +import org.dromara.system.api.domain.vo.RemoteUserVo; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.CostHouseChargeBo; import org.dromara.property.domain.CostHouseCharge; @@ -48,6 +51,8 @@ public class CostHouseChargeServiceImpl implements ICostHouseChargeService { private final CostPayFeeAuditMapper costPayFeeAuditMapper; private final CostReturnPayFeeMapper costReturnPayFeeMapper; private final ResidentPersonMapper residentPersonMapper; + @DubboReference + private RemoteUserService remoteUserService; /** * 查询房屋收费 * @@ -59,11 +64,12 @@ public class CostHouseChargeServiceImpl implements ICostHouseChargeService { CostHouseChargeVo costHouseChargeVo = baseMapper.selectVoById(id); CostHouseChargeDetailVo costHouseChargeDetailVo = BeanUtil.copyProperties(costHouseChargeVo, CostHouseChargeDetailVo.class); CostItemsVo costItemsVo = costItemsMapper.selectVoById(costHouseChargeDetailVo.getCostItemsId()); - costHouseChargeDetailVo.setCostItemsVo(costItemsVo); + costHouseChargeDetailVo.setCostItemsVo(ObjectUtil.isNotEmpty(costItemsVo)?costItemsVo:null); TbRoomVo tbRoomVo = tbRoomMapper.selectVoById(costHouseChargeDetailVo.getRoomId()); - costHouseChargeDetailVo.setRoomVo(tbRoomVo); - ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(costHouseChargeVo.getPersonId()); - costHouseChargeDetailVo.setPersonName(residentPersonVo.getUserName()); + 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); return costHouseChargeDetailVo; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostPayFeeAuditServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostPayFeeAuditServiceImpl.java index 8c9611cd..6062d170 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostPayFeeAuditServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostPayFeeAuditServiceImpl.java @@ -1,6 +1,7 @@ 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 org.checkerframework.checker.units.qual.C; import org.dromara.common.core.utils.MapstructUtils; @@ -176,11 +177,14 @@ public class CostPayFeeAuditServiceImpl implements ICostPayFeeAuditService { if (entity.getState().equals("1")) { if (entity.getChargeType().equals("1")) { CostHouseCharge costHouseCharge = coinHouseChargeMapper.selectById(entity.getChargeId()); + Assert.isTrue(ObjectUtil.isNotEmpty(costHouseCharge), "该房屋收费项不存在!"); costHouseCharge.setChargeStatus(ChargeStatusEnum.THE_PAYMENT_WAS_APPROVED.getValue()); coinHouseChargeMapper.updateById(costHouseCharge); } if (entity.getChargeType().equals("2")) { + CostCarCharge costCarCharge = costCarChargeMapper.selectById(entity.getChargeId()); + Assert.isTrue(ObjectUtil.isNotEmpty(costCarCharge), "该车辆收费项为空"); costCarCharge.setChargeStatus(ChargeStatusEnum.THE_PAYMENT_WAS_APPROVED.getValue()); costCarChargeMapper.updateById(costCarCharge); } @@ -188,11 +192,13 @@ public class CostPayFeeAuditServiceImpl implements ICostPayFeeAuditService { if (entity.getState().equals("2")) { if (entity.getChargeType().equals("1")) { CostHouseCharge costHouseCharge = coinHouseChargeMapper.selectById(entity.getChargeId()); + Assert.isTrue(ObjectUtil.isNotEmpty(costHouseCharge), "该房屋收费项为空"); costHouseCharge.setChargeStatus(ChargeStatusEnum.THE_PAYMENT_REVIEW_FAILED.getValue()); coinHouseChargeMapper.updateById(costHouseCharge); } if (entity.getChargeType().equals("2")) { CostCarCharge costCarCharge = costCarChargeMapper.selectById(entity.getChargeId()); + Assert.isTrue(ObjectUtil.isNotEmpty(costCarCharge), "该车辆收费项为空"); costCarCharge.setChargeStatus(ChargeStatusEnum.THE_PAYMENT_REVIEW_FAILED.getValue()); costCarChargeMapper.updateById(costCarCharge); } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerContingenPlanServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerContingenPlanServiceImpl.java index 8e57177d..53822805 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerContingenPlanServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerContingenPlanServiceImpl.java @@ -138,6 +138,7 @@ public class CustomerContingenPlanServiceImpl implements ICustomerContingenPlanS bo.setId(add.getId()); CustomerContingenPlanRecord customerContingenPlanRecord = new CustomerContingenPlanRecord(); customerContingenPlanRecord.setStatus(add.getStatus()); + customerContingenPlanRecord.setStatus("0"); customerContingenPlanRecord.setContingenPlanId(add.getId()); customerContingenPlanRecord.setDutyPersion(add.getDutyPersion()); customerContingenPlanRecordMapper.insert(customerContingenPlanRecord); 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 fe6b63bd..5e0a865b 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 @@ -20,6 +20,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; import java.util.*; import java.util.stream.Collectors; @@ -68,6 +70,8 @@ public class EnumFetcherServiceImpl implements EnumFetcherService { return getMeetBookingPayStatus(); case "getMeetBookingStatus": return getMeetBookingStatus(); + case "getAccount": + return getAccount(new ArrayList<>()); case "getServiceWorkOrdersHandler": return serviceWorkOrdersService.getServiceWorkOrdersHandler(type); default: @@ -128,18 +132,25 @@ public class EnumFetcherServiceImpl implements EnumFetcherService { @Override public List> getShiftScheduler(String type) { ServiceWorkOrdersType serviceWorkOrdersType = serviceWorkOrdersTypeMapper.selectById(type); + if (serviceWorkOrdersType == null) { + return List.of(); + } LocalDate today = LocalDate.now(); List attendanceUserGroups = attendanceUserGroupMapper.selectList( new LambdaQueryWrapper() - //查询今天上班的人员 - .eq(AttendanceUserGroup::getStartDate, today) - .eq(ObjectUtil.isNotNull(serviceWorkOrdersType),AttendanceUserGroup::getDeptId, serviceWorkOrdersType.getCreateDept()) + .le(AttendanceUserGroup::getStartDate, today) + .ge(AttendanceUserGroup::getEndDate, today) + .eq(AttendanceUserGroup::getDeptId, serviceWorkOrdersType.getCreateDept()) ); + if (CollUtil.isEmpty(attendanceUserGroups)) { return List.of(); } - // 收集用户id - List userIdList = attendanceUserGroups.stream().map(AttendanceUserGroup::getEmployeeId).toList(); + + List userIdList = attendanceUserGroups.stream() + .map(AttendanceUserGroup::getEmployeeId) + .toList(); + return getAccount(userIdList); } 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 4ff42cec..6ab9c33e 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 @@ -64,12 +64,12 @@ public class MeetBookingServiceImpl implements IMeetBookingService { MeetBookingDetailVo meetBookingDetailVo = BeanUtil.copyProperties(meetBookingVo, MeetBookingDetailVo.class); MeetVo meetVo = meetMapper.selectVoById(meetBookingDetailVo.getMeetId()); String locationName = roomMapper.queryRoomName(Long.valueOf(meetVo.getLocation())); - meetBookingDetailVo.setLocationName(ObjectUtil.isNotEmpty(locationName)?locationName:null); - ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(Long.valueOf(meetBookingVo.getPerson())); - meetBookingDetailVo.setPersonName(ObjectUtil.isNotEmpty(residentPersonVo)?residentPersonVo.getUserName():null); - meetBookingDetailVo.setPhone(ObjectUtil.isNotEmpty(residentPersonVo)?residentPersonVo.getPhone():null); + meetBookingDetailVo.setLocationName(ObjectUtil.isNotEmpty(locationName) ? locationName : null); + RemoteUserVo userInfo = remoteUserService.getUserInfoById(Long.valueOf(meetBookingVo.getPerson())); + meetBookingDetailVo.setPersonName(ObjectUtil.isNotEmpty(userInfo) ? userInfo.getNickName() : null); + meetBookingDetailVo.setPhone(ObjectUtil.isNotEmpty(userInfo) ? userInfo.getPhonenumber() : null); ResidentUnitVo residentUnitVo = residentUnitMapper.selectVoById(Long.valueOf(meetBookingVo.getUnit())); - meetBookingDetailVo.setUnitName(ObjectUtil.isNotEmpty(residentPersonVo)?residentUnitVo.getName():null); + meetBookingDetailVo.setUnitName(ObjectUtil.isNotNull(residentUnitVo) ? residentUnitVo.getName() : null); return meetBookingDetailVo; } @@ -216,6 +216,9 @@ public class MeetBookingServiceImpl implements IMeetBookingService { private LambdaQueryWrapper buildQueryWrapper(MeetBookingBo bo) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByAsc(MeetBooking::getId); + lqw.eq(ObjectUtil.isNotEmpty(bo.getPayState()), MeetBooking::getPayState, bo.getPayState()); + lqw.eq(ObjectUtil.isNotEmpty(bo.getState()), MeetBooking::getState, bo.getState()); + lqw.eq(ObjectUtil.isNotEmpty(bo.getPerson()), MeetBooking::getPerson, bo.getPerson()); lqw.like(StringUtils.isNotBlank(bo.getName()), MeetBooking::getName, bo.getName()); lqw.eq(bo.getMeetId() != null, MeetBooking::getMeetId, bo.getMeetId()); return lqw; @@ -291,21 +294,21 @@ public class MeetBookingServiceImpl implements IMeetBookingService { @Override public List> getMeetBooking(String type) { - return switch (type) { - case "getMeetBookingPerson" -> getList().stream() - .map(MeetBooking::getPerson) - .filter(Objects::nonNull) - .distinct() - .map(person -> { - Map map = new HashMap<>(); - map.put("value", person); - map.put("name", person); - return map; - }) - .collect(Collectors.toList()); + return switch (type) { + case "getMeetBookingPerson" -> getList().stream() + .map(MeetBooking::getPerson) + .filter(Objects::nonNull) + .distinct() + .map(person -> { + Map map = new HashMap<>(); + map.put("value", person); + map.put("name", person); + return map; + }) + .collect(Collectors.toList()); - default -> throw new IllegalArgumentException("Unknown type: " + type); - }; + default -> throw new IllegalArgumentException("Unknown type: " + type); + }; } public List getList() { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java index 562d5407..77d4175a 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java @@ -108,6 +108,12 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService { */ @Override public TableDataInfo queryPageList(ServiceWorkOrdersBo bo, PageQuery pageQuery) { + + //当前登录用户 + LoginUser loginUser = LoginHelper.getLoginUser(); + if (!LoginHelper.isSuperAdmin(loginUser.getUserId())) { + bo.setHandler(loginUser.getUserId()); + } LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); if (ObjectUtil.isEmpty(result.getRecords())) { 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 9f7614b8..206a798c 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 @@ -59,7 +59,8 @@ public class ServiceWorkOrderTasks { List attendanceUserGroups = attendanceUserGroupMapper.selectList( new LambdaQueryWrapper() //查询今天上班的人员 - .eq(AttendanceUserGroup::getStartDate, today) + .le(AttendanceUserGroup::getStartDate, today) + .ge(AttendanceUserGroup::getEndDate, today) ); serviceWorkOrderList.stream().forEach(s->{ if(CollUtil.isNotEmpty(attendanceUserGroups)){