Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

pom.xml

@@ -69,6 +69,23 @@
     </properties>
 
     <profiles>
+        <profile>
+            <id>local</id>
+            <properties>
+                <!-- 环境标识，需要与配置文件的名称相对应 -->
+                <profiles.active>dev</profiles.active>
+                <nacos.server>10.20.1.65:8848</nacos.server>
+                <logstash.address>10.20.1.65:4560</logstash.address>
+                <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
+                <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
+                <nacos.username>nacos</nacos.username>
+                <nacos.password>nacos</nacos.password>
+            </properties>
+            <activation>
+                <!-- 默认环境 -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
         <profile>
             <id>dev</id>
             <properties>
@@ -101,8 +118,8 @@
             <id>prod</id>
             <properties>
                 <profiles.active>prod</profiles.active>
-                <nacos.server>10.20.1.185:8848</nacos.server>
+                <nacos.server>127.0.0.1:8848</nacos.server>
-                <logstash.address>10.20.1.185:4560</logstash.address>
+                <logstash.address>127.0.0.1:4560</logstash.address>
                 <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
                 <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
                 <nacos.username>nacos</nacos.username>

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<CapitalApplicationVo> 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<CapitalApplicationVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")

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<CostPayFeeAuditVo> 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<CostPayFeeAuditVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")

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<CostReturnPayFeeVo> 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<CostReturnPayFeeVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")

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<InspectionRouteVo> 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<InspectionRouteVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")

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<MachineMaintainPlanVo> 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<MachineMaintainPlanVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")

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<MachineMaintainTaskDetailVo> 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<MachineMaintainTaskDetailVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")

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<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:attach:query")
     @GetMapping("/{id}")
     public R<MeetAttachVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")

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<MeetBookingVo> 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<MeetBookingDetailVo> 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()

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<MeetVo> 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<MeetVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) {

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<ServiceWorkOrdersTypeVo> 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<ServiceWorkOrdersTypeVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")

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;
     /**
      * 工单编号
      */

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;
 
     /**
      * 楼层

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<AttendanceAreaDevice> areaDevice;
 }

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<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);
+        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<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;

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);
+        costHouseChargeDetailVo.setRoomVo(ObjectUtil.isNotEmpty(tbRoomVo)?tbRoomVo:null);
-        ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(costHouseChargeVo.getPersonId());
+//        ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(costHouseChargeVo.getPersonId());
-        costHouseChargeDetailVo.setPersonName(residentPersonVo.getUserName());
+        RemoteUserVo userInfo = remoteUserService.getUserInfoById(costHouseChargeVo.getPersonId());
+        costHouseChargeDetailVo.setPersonName(ObjectUtil.isNotEmpty(userInfo)?userInfo.getUserName():null);
         return costHouseChargeDetailVo;
     }
 

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);
             }

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);

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<Map<Object, Object>> getShiftScheduler(String type) {
         ServiceWorkOrdersType serviceWorkOrdersType = serviceWorkOrdersTypeMapper.selectById(type);
+        if (serviceWorkOrdersType == null) {
+            return List.of();
+        }
         LocalDate today = LocalDate.now();
         List<AttendanceUserGroup> attendanceUserGroups = attendanceUserGroupMapper.selectList(
             new LambdaQueryWrapper<AttendanceUserGroup>()
-                //查询今天上班的人员
+                .le(AttendanceUserGroup::getStartDate, today)
-                .eq(AttendanceUserGroup::getStartDate, today)
+                .ge(AttendanceUserGroup::getEndDate, today)
-                .eq(ObjectUtil.isNotNull(serviceWorkOrdersType),AttendanceUserGroup::getDeptId, serviceWorkOrdersType.getCreateDept())
+                .eq(AttendanceUserGroup::getDeptId, serviceWorkOrdersType.getCreateDept())
         );
+
         if (CollUtil.isEmpty(attendanceUserGroups)) {
             return List.of();
         }
-        // 收集用户id
+
-        List<Long> userIdList = attendanceUserGroups.stream().map(AttendanceUserGroup::getEmployeeId).toList();
+        List<Long> userIdList = attendanceUserGroups.stream()
+            .map(AttendanceUserGroup::getEmployeeId)
+            .toList();
+
         return getAccount(userIdList);
     }
 

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);
+        meetBookingDetailVo.setLocationName(ObjectUtil.isNotEmpty(locationName) ? locationName : null);
-        ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(Long.valueOf(meetBookingVo.getPerson()));
+        RemoteUserVo userInfo = remoteUserService.getUserInfoById(Long.valueOf(meetBookingVo.getPerson()));
-        meetBookingDetailVo.setPersonName(ObjectUtil.isNotEmpty(residentPersonVo)?residentPersonVo.getUserName():null);
+        meetBookingDetailVo.setPersonName(ObjectUtil.isNotEmpty(userInfo) ? userInfo.getNickName() : null);
-        meetBookingDetailVo.setPhone(ObjectUtil.isNotEmpty(residentPersonVo)?residentPersonVo.getPhone():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<MeetBooking> buildQueryWrapper(MeetBookingBo bo) {
         LambdaQueryWrapper<MeetBooking> 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<Map<Object, Object>> getMeetBooking(String type) {
-            return switch (type) {
+        return switch (type) {
-                case "getMeetBookingPerson" -> getList().stream()
+            case "getMeetBookingPerson" -> getList().stream()
-                    .map(MeetBooking::getPerson)
+                .map(MeetBooking::getPerson)
-                    .filter(Objects::nonNull)
+                .filter(Objects::nonNull)
-                    .distinct()
+                .distinct()
-                    .map(person -> {
+                .map(person -> {
-                        Map<Object, Object> map = new HashMap<>();
+                    Map<Object, Object> map = new HashMap<>();
-                        map.put("value", person);
+                    map.put("value", person);
-                        map.put("name", person);
+                    map.put("name", person);
-                        return map;
+                    return map;
-                    })
+                })
-                    .collect(Collectors.toList());
+                .collect(Collectors.toList());
 
-                default -> throw new IllegalArgumentException("Unknown type: " + type);
+            default -> throw new IllegalArgumentException("Unknown type: " + type);
-            };
+        };
     }
 
     public List<MeetBooking> getList() {

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<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())) {

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<AttendanceAreaDeviceVo> attendanceAreaDeviceList = areaDeviceMapper.selectVoList(Wrappers.<AttendanceAreaDevice>lambdaQuery().eq(AttendanceAreaDevice::getAreaId, id));
+        //根据设备id集合查询设备数据
+        attendanceAreaDeviceList.forEach(item -> {
+            //根据deviceManageId查询设备数据
+            RemoteSisDeviceManage remoteSisDeviceManage = remoteDeviceService.queryDeviceById(item.getDeviceManageId());
+            item.setRemoteSisDeviceManage(remoteSisDeviceManage);
+            attendanceAreaVo.setAreaDevice(attendanceAreaDeviceList);
+        });
+
+        return attendanceAreaVo;
     }
 
     /**

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.固定班制，修改考勤周期表中的数据

ruoyi-modules/Property/src/main/java/org/dromara/property/tasks/ServiceWorkOrderTasks.java

@@ -59,7 +59,8 @@ public class ServiceWorkOrderTasks {
             List<AttendanceUserGroup> attendanceUserGroups = attendanceUserGroupMapper.selectList(
                 new LambdaQueryWrapper<AttendanceUserGroup>()
                     //查询今天上班的人员
-                    .eq(AttendanceUserGroup::getStartDate, today)
+                    .le(AttendanceUserGroup::getStartDate, today)
+                    .ge(AttendanceUserGroup::getEndDate, today)
             );
             serviceWorkOrderList.stream().forEach(s->{
                 if(CollUtil.isNotEmpty(attendanceUserGroups)){