增加人员聚集，停车消费者

- 在 queryMeterInfoTree 方法中添加 isMeter 参数，用于控制是否返回仪表信息
- 修改 getMeterStatus 方法，增加 meterType 参数，用于指定水电气类型
- 优化 TbMeterInfoController 中的路由设计，使用 query 参数替代路径参数- 在获取仪表状态时增加异常处理，确保数据获取失败时能够返回所有数据并设置通信状态为 0
- 在 HttpUtil.post 方法中增加超时设置，提高请求稳定性

.gitea/workflows/master.yml

@@ -15,7 +15,7 @@ jobs:
       - name: 拉取代码
         uses: http://git.missmoc.top/mocheng/checkout@v4
         with:
-          fetch-depth: 1
+          fetch-depth: 0
 
       - name: 使用Maven构建项目
         run: |
@@ -87,8 +87,8 @@ jobs:
           echo "===== 清理操作 ====="
           docker system prune -f
           echo "===== 所有操作完成 ===="
-     
+
       - name: 重启服务
         run: |
           kubectl rollout restart deployment sis -n smartparks
-          kubectl rollout restart deployment property -n smartparks
+          kubectl rollout restart deployment property -n smartparks

ruoyi-api/property-api/src/main/java/org/dromara/property/api/RemoteAttendanceService.java

@@ -18,6 +18,15 @@ public interface RemoteAttendanceService {
      * @param date 查询时间
      * @return 返回排班人员信息
      */
-    public List<RemoteAttendanceUserGroupVo> queryAttendPersonInfo(Date date);
+    List<RemoteAttendanceUserGroupVo> queryAttendPersonInfo(Date date);
+
+    /**
+     * 根据时间和设备ip查询当前设备所处区域的排班人员信息
+     *
+     * @param date     查询时间
+     * @param deviceIp 设备ip
+     * @return 返回排班人员信息
+     */
+    List<RemoteAttendanceUserGroupVo> queryAttendByCurrDateAndDeviceIp(Date date, String deviceIp);
 
 }

ruoyi-api/property-api/src/main/java/org/dromara/property/api/domain/vo/RemoteAttendanceUserGroupVo.java

@@ -49,5 +49,4 @@ public class RemoteAttendanceUserGroupVo implements Serializable {
      */
     private LocalDate endDate;
 
-
 }

ruoyi-modules/Property/pom.xml

@@ -125,6 +125,11 @@
             <artifactId>ruoyi-common-websocket</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-spring-boot-starter</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

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

@@ -13,6 +13,7 @@ import org.dromara.common.web.core.BaseController;
 import org.dromara.property.domain.bo.ServiceWorkOrdersBo;
 import org.dromara.property.domain.bo.mobile.MServiceWorkOrdersBo;
 import org.dromara.property.domain.vo.ServiceWorkOrdersVo;
+import org.dromara.property.domain.vo.mobile.MServiceWorkOrdersVo;
 import org.dromara.property.service.IServiceWorkOrdersService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -35,7 +36,6 @@ public class MServiceWorkOrdersController extends BaseController {
      * 小程序新增【工单处理】
      */
     @Log(title = "【小程序新增工单处理】", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody MServiceWorkOrdersBo bo) {
         return toAjax(serviceWorkOrdersService.insertMServiceWorkOrdersBo(bo));
@@ -44,7 +44,7 @@ public class MServiceWorkOrdersController extends BaseController {
      * 小程序查询【工单处理】
      */
     @GetMapping("/list")
-    public TableDataInfo<ServiceWorkOrdersVo> list(ServiceWorkOrdersBo bo, PageQuery pageQuery) {
+    public TableDataInfo<MServiceWorkOrdersVo> list(ServiceWorkOrdersBo bo, PageQuery pageQuery) {
         return serviceWorkOrdersService.queryMobilePageList(bo, pageQuery);
     }
     /**

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/smartDevicesController/TbMeterInfoController.java

@@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.common.core.domain.TreeNode;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -27,7 +28,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
  * 前端访问路由地址为:/property/meterInfo
  *
  * @author lsm
- * @date 2025-07-19
+ * @since 2025-07-19
  */
 @Validated
 @RequiredArgsConstructor
@@ -65,7 +66,7 @@ public class TbMeterInfoController extends BaseController {
     @SaCheckPermission("property:meterInfo:query")
     @GetMapping("/{id}")
     public R<TbMeterInfoVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable("id") Long id) {
+                                    @PathVariable("id") Long id) {
         return R.ok(tbMeterInfoService.queryById(id));
     }
 
@@ -103,4 +104,28 @@ public class TbMeterInfoController extends BaseController {
                           @PathVariable("ids") Long[] ids) {
         return toAjax(tbMeterInfoService.deleteWithValidByIds(List.of(ids), true));
     }
+
+    /**
+     * 生成 社区/建组/单元/楼栋/(水电气表)树结构
+     *
+     * @param meterType 水电气类型
+     * @param isMeter   是否返回仪表
+     * @return (水电气表)树结构
+     */
+    @GetMapping("/tree")
+    public R<List<TreeNode<Long>>> queryMeterInfoTree(@RequestParam Long meterType, @RequestParam Boolean isMeter) {
+        return R.ok(tbMeterInfoService.queryMeterInfoTree(meterType, isMeter));
+    }
+
+    /**
+     * 获取水/电/气表当前读数/状态
+     *
+     * @param meterType 水电气类型
+     * @param floorId   楼栋id
+     */
+    @GetMapping("/currentReading")
+    public R<List<TbMeterInfoVo>> currentReading(@RequestParam Long meterType, @RequestParam Long floorId) {
+        return R.ok(tbMeterInfoService.getMeterStatus(meterType, floorId));
+    }
+
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/smartDevicesController/TbMeterRecordController.java

@@ -1,6 +1,7 @@
 package org.dromara.property.controller.smartDevicesController;
 
 import java.util.List;
+import java.util.Map;
 
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
@@ -65,7 +66,7 @@ public class TbMeterRecordController extends BaseController {
     @SaCheckPermission("property:meterRecord:query")
     @GetMapping("/{id}")
     public R<TbMeterRecordVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable("id") Long id) {
+                                      @PathVariable("id") Long id) {
         return R.ok(tbMeterRecordService.queryById(id));
     }
 
@@ -103,4 +104,25 @@ public class TbMeterRecordController extends BaseController {
                           @PathVariable("ids") Long[] ids) {
         return toAjax(tbMeterRecordService.deleteWithValidByIds(List.of(ids), true));
     }
+
+    /**
+     * 获取用电/水/气趋势分析数据
+     *
+     * @param floorId   楼层id
+     * @param meterId   仪表id
+     * @param meterType 仪表类型
+     * @param day       日期
+     * @param month     月份
+     * @param year      年份
+     */
+    @GetMapping("/trend")
+    public R<Map<String, Object>> getEnergyTrend(@RequestParam(required = false) String floorId,
+                                  @RequestParam(required = false) String meterId,
+                                  @RequestParam Long meterType,
+                                  @RequestParam String day,
+                                  @RequestParam String month,
+                                  @RequestParam String year) {
+        Map<String, Object> resultMap = tbMeterRecordService.getEnergyTrend(floorId, meterId, meterType, day, month, year);
+        return R.ok(resultMap);
+    }
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServiceWorkOrdersType.java

@@ -41,6 +41,10 @@ public class ServiceWorkOrdersType extends TenantEntity {
      * 运作模式(0派单+抢单,1派单,2自动派单)
      */
     private String operationMode;
+    /**
+     *部门id
+     */
+    private Long deptId;
 
     /**
      * 排序值

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ServiceWorkOrdersBo.java

@@ -107,10 +107,6 @@ public class ServiceWorkOrdersBo extends BaseEntity {
      * 图片
      */
     private String imgUrl;
-    /**
-     * 工单图片
-     */
-    private String orderImgUrl;
     /**
      * 备注
      */

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ServiceWorkOrdersTypeBo.java

@@ -36,7 +36,11 @@ public class ServiceWorkOrdersTypeBo extends BaseEntity {
      */
     @NotNull(message = "工单类型名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String orderTypeName;
-
+    /**
+     *部门id
+     */
+    @NotNull(message = "部门id", groups = { EditGroup.class })
+    private Long deptId;
     /**
      * 运作模式
      */

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/mobile/MServiceWorkOrdersBo.java

@@ -105,6 +105,10 @@ public class MServiceWorkOrdersBo extends BaseEntity {
      * 工单图片
      */
     private String orderImgUrl;
+    /**
+     * 问题描述
+     */
+    private String issueDesc;
     /**
      * 备注
      */

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbLightInfoBo.java

@@ -47,7 +47,7 @@ public class TbLightInfoBo extends BaseEntity {
     /**
      * 楼层ID
      */
-    @NotNull(message = "层ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotNull(message = "楼层ID不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long floorId;
 
     /**

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterInfoBo.java

@@ -9,6 +9,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 
+import java.math.BigDecimal;
+
 /**
  * 水电气业务对象 tb_meter_info
  *
@@ -23,7 +25,7 @@ public class TbMeterInfoBo extends BaseEntity {
     /**
      * 主键id
      */
-    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    @NotNull(message = "主键id不能为空", groups = {EditGroup.class})
     private Long id;
 
     /**
@@ -44,15 +46,42 @@ public class TbMeterInfoBo extends BaseEntity {
     /**
      * 设备类型(1-电表，2-水表，3-气表)
      */
-    @NotNull(message = "设备类型(1-电表，2-水表，3-气表)不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "设备类型(1-电表，2-水表，3-气表)不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long meterType;
 
     /**
      * 计量单位(1-度，2-吨，3-立方米)
      */
-    @NotNull(message = "计量单位(1-度，2-吨，3-立方米)不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "计量单位(1-度，2-吨，3-立方米)不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long meterUnit;
 
+    /**
+     * 采集器IP
+     */
+    @NotNull(message = "采集器IP不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String hostIp;
+
+    /**
+     * 楼层ID
+     */
+    @NotNull(message = "楼层ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long floorId;
+
+    /**
+     * 园区编码
+     */
+    private Long communityId;
+
+    /**
+     * 建筑名称
+     */
+    private Long buildingId;
+
+    /**
+     * 单元编码
+     */
+    private Long unitId;
+
     /**
      * 安装位置
      */
@@ -61,12 +90,12 @@ public class TbMeterInfoBo extends BaseEntity {
     /**
      * 初始读数
      */
-    private Long initReading;
+    private BigDecimal initReading;
 
     /**
      * 最大量程
      */
-    private Long maxRang;
+    private BigDecimal maxRang;
 
     /**
      * 通信状态

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/smartDevicesBo/TbMeterRecordBo.java

@@ -32,8 +32,8 @@ public class TbMeterRecordBo extends BaseEntity {
     /**
      * 仪表编号
      */
-    @NotBlank(message = "仪表编号不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String meterId;
+    @NotNull(message = "仪表编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long meterId;
 
     /**
      * 设备类型(1-电表，2-水表，3-气表)

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/entity/smartDevices/TbMeterInfo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
+import java.math.BigDecimal;
 
 /**
  * 水电气对象 tb_meter_info
@@ -60,12 +61,12 @@ public class TbMeterInfo extends TenantEntity {
     /**
      * 初始读数
      */
-    private Long initReading;
+    private BigDecimal initReading;
 
     /**
      * 最大量程
      */
-    private Long maxRang;
+    private BigDecimal maxRang;
 
     /**
      * 通信状态
@@ -82,5 +83,30 @@ public class TbMeterInfo extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 园区编码
+     */
+    private Long communityId;
+
+    /**
+     * 建筑名称
+     */
+    private Long buildingId;
+
+    /**
+     * 单元编码
+     */
+    private Long unitId;
+
+    /**
+     * 所属楼层ID
+     */
+    private Long floorId;
+
+    /**
+     * 采集器IP
+     */
+    private String hostIp;
+
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/entity/smartDevices/TbMeterRecord.java

@@ -33,7 +33,7 @@ public class TbMeterRecord extends TenantEntity {
     /**
      * 仪表编号
      */
-    private String meterId;
+    private Long meterId;
 
     /**
      * 设备类型(1-电表，2-水表，3-气表)

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/enums/ChargeTypeEnum.java

@@ -0,0 +1,30 @@
+package org.dromara.property.domain.enums;
+
+/**
+ * 收费类型枚举
+ */
+public enum ChargeTypeEnum {
+    /**
+     * 房屋收费
+     */
+    HOUS_CHARGES("房屋收费", "1"),
+    /**
+     * 车辆收费
+     */
+    CARD_CHARGES("车辆收费", "2");
+    private final String name;
+    private final String value;
+
+    ChargeTypeEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/enums/MeterRecordTypeEnum.java

@@ -0,0 +1,33 @@
+package org.dromara.property.domain.enums;
+
+import lombok.Getter;
+
+/**
+ * @author lsm
+ * @apiNote MeterRecordTypeEnum
+ * @since 2025/8/27
+ */
+@Getter
+public enum MeterRecordTypeEnum {
+
+    /**
+     * 手动上报
+     */
+    MANUAL_RECORD(1L),
+
+    /**
+     * 自动上报
+     */
+    AUTO_RECORD(2L),
+
+    /**
+     * 用户上报
+     */
+    USER_RECORD(3L);
+
+    private final Long code;
+
+    MeterRecordTypeEnum(Long code) {
+        this.code = code;
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CostPayFeeAuditVo.java

@@ -53,8 +53,12 @@ public class CostPayFeeAuditVo implements Serializable {
     /**
      * 房间号(如101,202)
      */
-    @ExcelProperty(value = "房间号(如101,202)")
+    @ExcelProperty(value = "房间号")
     private String roomNumber;
+    /**
+     * 车牌号
+     */
+    private String carNumber;
 
     /**
      * 费用项目id

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersTypeVo.java

@@ -44,6 +44,14 @@ public class ServiceWorkOrdersTypeVo implements Serializable {
      */
     @ExcelProperty(value = "工单类型名称")
     private String orderTypeName;
+    /**
+     *部门id
+     */
+    private Long deptId;
+    /**
+     *部门名称
+     */
+    private String deptName;
 
     /**
      * 运作模式

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersVo.java

@@ -146,6 +146,7 @@ public class ServiceWorkOrdersVo implements Serializable {
      * 图片
      */
     private String imgUrl;
+
     /**
      * 备注
      */

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/mobile/MServiceWorkOrdersRecordVo.java

@@ -0,0 +1,61 @@
+package org.dromara.property.domain.vo.mobile;
+
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.property.domain.ServiceWorkOrdersRecord;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author yuyongle
+ * @version 1.0
+ * @description: TODO
+ * @date 2025/8/26 13:53
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ServiceWorkOrdersRecord.class)
+public class MServiceWorkOrdersRecordVo implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ExcelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 工单id
+     */
+    @ExcelProperty(value = "工单id")
+    private String orderId;
+
+    /**
+     * 状态(0创建工单,1已派单2已抢单3处理中,4已完成)
+     */
+    @ExcelProperty(value = "状态(0创建工单,1已派单2已抢单3处理中,4已完成)")
+    private String status;
+
+    /**
+     * 处理人
+     */
+    @ExcelProperty(value = "处理人")
+    private Long handler;
+    /**
+     * 处理人
+     */
+    @ExcelProperty(value = "处理人")
+    private String handlerName;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/mobile/MServiceWorkOrdersVo.java

@@ -0,0 +1,166 @@
+package org.dromara.property.domain.vo.mobile;
+
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.property.domain.ServiceWorkOrders;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author yuyongle
+ * @version 1.0
+ * @description: TODO
+ * @date 2025/8/26 13:52
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ServiceWorkOrders.class)
+public class MServiceWorkOrdersVo implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ExcelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 工单编号
+     */
+    @ExcelProperty(value = "工单编号")
+    private String orderNo;
+    /**
+     * 权重
+     */
+    @ExcelProperty(value = "权重")
+    private String processingWeight;
+
+    /**
+     * 工单名称
+     */
+    @ExcelProperty(value = "工单名称")
+    private String orderName;
+
+    /**
+     * 工单类型
+     */
+    @ExcelProperty(value = "工单类型")
+    private Long type;
+    /**
+     * 上报类型
+     */
+    private String reportingType;
+    /**
+     * 工单类型名称
+     */
+    @ExcelProperty(value = "工单类型名称")
+    private String typeName;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty(value = "状态(0创建工单,1已派单2已抢单3处理中,4已完成,5已评价)")
+    private String status;
+
+    /**
+     * 派单时间
+     */
+    @ExcelProperty(value = "派单时间")
+    private Date dispatchTime;
+    /**
+     * 运作模式(0派单+抢单,1派单,2自动派单)
+     */
+    private String operationMode;
+    /**
+     * 发起人
+     */
+    private String initiatorPeople;
+
+    /**
+     * 处理人姓名
+     */
+    private long handler;
+    /**
+     * 抄送人
+     */
+    private long ccPeople;
+    /**
+     * 发起人手机号
+     */
+    @ExcelProperty(value = "发起人手机号")
+    private String initiatorPhone;
+    /**
+     * 处理人姓名文本
+     */
+    @ExcelProperty(value = "处理人姓名文本")
+    private String handlerText;
+
+    /**
+     * 处理人姓名文本
+     */
+    @ExcelProperty(value = "处理人电话")
+    private String handlerPhone;
+
+    /**
+     * 地址
+     */
+    @ExcelProperty(value = "地址")
+    private String location;
+
+    /**
+     * 计划完成时间
+     */
+    @ExcelProperty(value = "计划完成时间")
+    private Date planCompleTime;
+
+    /**
+     * 完成时间
+     */
+    @ExcelProperty(value = "完成时间")
+    private Date compleTime;
+
+    /**
+     * 评价
+     */
+    @ExcelProperty(value = "评价")
+    private Integer serviceEvalua;
+
+    /**
+     * 是否超时
+     */
+    @ExcelProperty(value = "是否超时")
+    private String isTimeOut;
+
+    /**
+     * 评价文本
+     */
+    private String serviceEvaluaText;
+    /**
+     * 工单图片
+     */
+    private String orderImgUrl;
+    /**
+     * 图片
+     */
+    private String imgUrl;
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 工单记录
+     */
+    List<MServiceWorkOrdersRecordVo> recordVoList;
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterInfoVo.java

@@ -10,7 +10,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-
+import java.math.BigDecimal;
 
 
 /**
@@ -54,7 +54,7 @@ public class TbMeterInfoVo implements Serializable {
     /**
      * 设备类型(1-电表，2-水表，3-气表)
      */
-    @ExcelProperty(value = "设备类型(1-电表，2-水表，3-气表)" ,converter = ExcelDictConvert.class)
+    @ExcelProperty(value = "设备类型(1-电表，2-水表，3-气表)", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "meter_type")
     private Long meterType;
 
@@ -75,13 +75,13 @@ public class TbMeterInfoVo implements Serializable {
      * 初始读数
      */
     @ExcelProperty(value = "初始读数")
-    private Long initReading;
+    private BigDecimal initReading;
 
     /**
      * 最大量程
      */
     @ExcelProperty(value = "最大量程")
-    private Long maxRang;
+    private BigDecimal maxRang;
 
     /**
      * 通信状态
@@ -97,6 +97,47 @@ public class TbMeterInfoVo implements Serializable {
     @ExcelDictFormat(dictType = "sis_device_status")
     private Long runningState;
 
+    /**
+     * 园区编码
+     */
+    @ExcelProperty(value = "园区编码")
+    private Long communityId;
+
+    /**
+     * 建筑名称
+     */
+    @ExcelProperty(value = "建筑名称")
+    private Long buildingId;
+
+    /**
+     * 单元编码
+     */
+    @ExcelProperty(value = "单元编码")
+    private Long unitId;
+
+    /**
+     * 楼层ID
+     */
+    @ExcelProperty(value = "楼层ID")
+    private Long floorId;
+
+    /**
+     * 楼层
+     */
+    @ExcelProperty(value = "楼层")
+    private String floorName;
+
+    /**
+     * 采集器IP
+     */
+    @ExcelProperty(value = "采集器IP")
+    private String hostIp;
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 备注
      */

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterRecordVo.java

@@ -37,7 +37,7 @@ public class TbMeterRecordVo implements Serializable {
      * 仪表编号
      */
     @ExcelProperty(value = "仪表编号")
-    private String meterId;
+    private Long meterId;
 
     /**
      * 设备类型(1-电表，2-水表，3-气表)

ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteAttendanceServiceImpl.java

@@ -6,7 +6,9 @@ import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.dromara.property.api.RemoteAttendanceService;
 import org.dromara.property.api.domain.vo.RemoteAttendanceUserGroupVo;
+import org.dromara.property.domain.vo.attendanceVo.AttendanceAreaDeviceVo;
 import org.dromara.property.domain.vo.attendanceVo.AttendanceUserGroupVo;
+import org.dromara.property.service.attendanceService.IAttendanceAreaDeviceService;
 import org.dromara.property.service.attendanceService.IAttendanceUserGroupService;
 
 import java.util.Date;
@@ -23,6 +25,7 @@ public class RemoteAttendanceServiceImpl implements RemoteAttendanceService {
 
 
     private final IAttendanceUserGroupService attendanceUserGroupService;
+    private final IAttendanceAreaDeviceService attendanceAreaDeviceService;
 
 
     public List<RemoteAttendanceUserGroupVo> queryAttendPersonInfo(Date date) {
@@ -33,4 +36,12 @@ public class RemoteAttendanceServiceImpl implements RemoteAttendanceService {
         return null;
     }
 
+    @Override
+    public List<RemoteAttendanceUserGroupVo> queryAttendByCurrDateAndDeviceIp(Date date, String deviceIp) {
+        List<AttendanceUserGroupVo> ls = attendanceUserGroupService.queryAttendByCurrDateAndDeviceIp(date, deviceIp);
+        if (CollUtil.isNotEmpty(ls)) {
+            return BeanUtil.copyToList(ls, RemoteAttendanceUserGroupVo.class);
+        }
+        return null;
+    }
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsPlanProductMapper.java

@@ -17,6 +17,7 @@ import java.util.List;
 public interface PlantsPlanProductMapper extends BaseMapperPlus<PlantsPlanProduct, PlantsPlanProductVo> {
 
     void deleteByPlanId(Long planId);
+    void deleteByPlanIds(List<Long> planIds);
 
     List<PlantsPlanProductVo> queryProductsInfo(Long planId);
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceUserGroupMapper.java

@@ -1,8 +1,12 @@
 package org.dromara.property.mapper.attendanceMapper;
 
+import org.apache.ibatis.annotations.Param;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.property.domain.AttendanceUserGroup;
 import org.dromara.property.domain.vo.attendanceVo.AttendanceUserGroupVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * 排班明细Mapper接口
@@ -12,4 +16,12 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 public interface AttendanceUserGroupMapper extends BaseMapperPlus<AttendanceUserGroup, AttendanceUserGroupVo> {
 
+    /**
+     * 根据日期和设备ip 查询当前设备所在区域的排班人员信息
+     *
+     * @param date     查询日期
+     * @param deviceIp 设备ip
+     * @return 返回排班人员列表
+     */
+    List<AttendanceUserGroupVo> queryAttendByCurrDateAndDeviceIp(@Param("currDate") Date currDate, @Param("deviceIp") String deviceIp);
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterInfoMapper.java

@@ -1,5 +1,6 @@
 package org.dromara.property.mapper.smartDevicesMapper;
 
+import org.apache.ibatis.annotations.Mapper;
 import org.dromara.property.domain.entity.smartDevices.TbMeterInfo;
 import org.dromara.property.domain.vo.smartDevicesVo.TbMeterInfoVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -8,8 +9,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  * 水电气Mapper接口
  *
  * @author lsm
- * @date 2025-07-19
+ * @since 2025-07-19
  */
+@Mapper
 public interface TbMeterInfoMapper extends BaseMapperPlus<TbMeterInfo, TbMeterInfoVo> {
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterRecordMapper.java

@@ -1,10 +1,14 @@
 package org.dromara.property.mapper.smartDevicesMapper;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.dromara.property.domain.entity.smartDevices.TbMeterRecord;
 import org.dromara.property.domain.vo.smartDevicesVo.TbMeterRecordVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 抄记录Mapper接口
  *
@@ -14,4 +18,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 @Mapper
 public interface TbMeterRecordMapper extends BaseMapperPlus<TbMeterRecord, TbMeterRecordVo> {
 
+    List<Map<String, Object>> getHourTrend(@Param("floorId") Long floorId, @Param("meterId") Long meterId, @Param("meterType") Long meterType, @Param("day") String day);
+
+    List<Map<String, Object>> getDayTrend(@Param("floorId") Long floorId, @Param("meterId") Long meterId, @Param("meterType") Long meterType, @Param("year") String year, @Param("month") String month);
+
+    List<Map<String, Object>> getMonthTrend(@Param("floorId") Long floorId, @Param("meterId") Long meterId, @Param("meterType") Long meterType, @Param("year") String year);
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/rocketmq/RocketMqConstants.java

@@ -0,0 +1,18 @@
+package org.dromara.property.rocketmq;
+
+/**
+ * @author lsm
+ * @apiNote RocketMqConstants
+ * @since 2025/8/25
+ */
+public interface RocketMqConstants {
+    // mq topic
+    String TOPIC = "SmartParks";
+
+    // mq GROUP
+    String METER_GROUP = "METER_GROUP";
+
+    /*-----------------------------------消息tag------------------------------------*/
+    String METER_RECORD = "METER_RECORD_TAG";
+
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/rocketmq/consumer/MeterRecordConsumer.java

@@ -0,0 +1,45 @@
+package org.dromara.property.rocketmq.consumer;
+
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.common.message.MessageExt;
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.dromara.property.rocketmq.RocketMqConstants;
+import org.dromara.property.rocketmq.domain.MeterResult;
+import org.dromara.property.service.smartDevicesService.ITbMeterRecordService;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author lsm
+ * @apiNote MeterRecordConsumer
+ * @since 2025/8/25
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+@RocketMQMessageListener(
+    topic = RocketMqConstants.TOPIC,
+    consumerGroup = RocketMqConstants.METER_GROUP,
+    selectorExpression = RocketMqConstants.METER_RECORD
+)
+public class MeterRecordConsumer implements RocketMQListener<MessageExt> {
+
+    private final ITbMeterRecordService meterRecordService;
+
+    @Override
+    public void onMessage(MessageExt ext) {
+        log.info("消费仪表上报数据，数据长度={}", ext.getBody().length);
+        try {
+            List<MeterResult> meterResults = JSONUtil.toList(new String(ext.getBody()), MeterResult.class);
+            meterRecordService.autoWriteMeterRecord(meterResults);
+        } catch (Exception e) {
+            log.error("消费仪表上报数据处理失败，", e);
+        }
+
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/rocketmq/domain/MeterResult.java

@@ -0,0 +1,20 @@
+package org.dromara.property.rocketmq.domain;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author lsm
+ * @apiNote MeterResult
+ * @since 2025/8/27
+ */
+@Data
+public class MeterResult {
+
+    private String ip;
+
+    private String recordTime;
+
+    private List<Float> collectionValue;
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/IPlantsPlanProductService.java

@@ -67,6 +67,12 @@ public interface IPlantsPlanProductService {
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
+    /**
+     * 根据方案id删除方案产品
+     * @param ids
+     */
+    void deleteByPlanIds(List<Long> ids);
+
     /**
      * 批量保存租赁方案植物
      *

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

@@ -8,6 +8,7 @@ import org.dromara.property.domain.bo.mobile.MServiceWorkOrdersBo;
 import org.dromara.property.domain.vo.ServiceWorkOrderAnalysisVo;
 import org.dromara.property.domain.vo.ServiceWorkOrdersInfoVo;
 import org.dromara.property.domain.vo.ServiceWorkOrdersVo;
+import org.dromara.property.domain.vo.mobile.MServiceWorkOrdersVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -101,5 +102,5 @@ public interface IServiceWorkOrdersService {
      * @param pageQuery 分页参数
      * @return 【工单处理】分页列表
      */
-    TableDataInfo<ServiceWorkOrdersVo> queryMobilePageList(ServiceWorkOrdersBo bo, PageQuery pageQuery);
+    TableDataInfo<MServiceWorkOrdersVo> queryMobilePageList(ServiceWorkOrdersBo bo, PageQuery pageQuery);
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceAreaDeviceService.java

@@ -6,6 +6,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -65,4 +66,5 @@ public interface IAttendanceAreaDeviceService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceUserGroupService.java

@@ -75,6 +75,15 @@ public interface IAttendanceUserGroupService {
      */
     List<AttendanceUserGroupVo> queryAttendPersonInfo(Date date);
 
+
     TableDataInfo<AttendanceUserGroupVo> queryScheduleView(AttendanceUserGroupBo bo, PageQuery pageQuery);
 
+    /**
+     * 根据日期和设备ip 查询当前设备所在区域的排班人员信息
+     *
+     * @param date     查询日期
+     * @param deviceIp 设备ip
+     * @return 返回排班人员列表
+     */
+    List<AttendanceUserGroupVo> queryAttendByCurrDateAndDeviceIp(Date date, String deviceIp);
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AppFunListServiceImpl.java

@@ -46,7 +46,7 @@ public class AppFunListServiceImpl implements IAppFunListService {
      * @return APP功能列表
      */
     @Override
-    public AppFunListVo queryById(Long id){
+    public AppFunListVo queryById(Long id) {
         return baseMapper.selectVoById(id);
     }
 
@@ -80,7 +80,8 @@ public class AppFunListServiceImpl implements IAppFunListService {
     private LambdaQueryWrapper<AppFunList> buildQueryWrapper(AppFunListBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<AppFunList> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(AppFunList::getId);
+        lqw.orderByDesc(AppFunList::getCreateTime)
+            .orderByDesc(AppFunList::getUpdateTime);
         lqw.eq(bo.getRoleid() != null, AppFunList::getRoleid, bo.getRoleid());
         lqw.like(StringUtils.isNotBlank(bo.getName()), AppFunList::getName, bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getIcon()), AppFunList::getIcon, bo.getIcon());
@@ -121,7 +122,7 @@ public class AppFunListServiceImpl implements IAppFunListService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(AppFunList entity){
+    private void validEntityBeforeSave(AppFunList entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -134,7 +135,7 @@ public class AppFunListServiceImpl implements IAppFunListService {
      */
     @Override
     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/ApplicationServiceImpl.java

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.property.domain.AppFunList;
 import org.dromara.property.domain.Asset;
 import org.dromara.property.domain.DepotLog;
 import org.dromara.property.domain.vo.AssetVo;
@@ -134,7 +135,8 @@ public class ApplicationServiceImpl implements IApplicationService {
     private LambdaQueryWrapper<Application> buildQueryWrapper(ApplicationBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<Application> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(Application::getId);
+        lqw.orderByDesc(Application::getCreateTime)
+            .orderByDesc(Application::getUpdateTime);
         lqw.eq(bo.getAssetId() != null, Application::getAssetId, bo.getAssetId());
         lqw.eq(bo.getUserId() != null, Application::getUserId, bo.getUserId());
         lqw.eq(bo.getNumber() != null, Application::getNumber, bo.getNumber());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AssetServiceImpl.java

@@ -9,16 +9,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.property.domain.AssetType;
-import org.dromara.property.domain.Depot;
-import org.dromara.property.domain.Suppliers;
+import org.dromara.property.domain.*;
 import org.dromara.property.mapper.AssetTypeMapper;
 import org.dromara.property.mapper.DepotMapper;
 import org.dromara.property.mapper.SuppliersMapper;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.AssetBo;
 import org.dromara.property.domain.vo.AssetVo;
-import org.dromara.property.domain.Asset;
 import org.dromara.property.mapper.AssetMapper;
 import org.dromara.property.service.IAssetService;
 
@@ -114,7 +111,8 @@ public class AssetServiceImpl implements IAssetService {
     private LambdaQueryWrapper<Asset> buildQueryWrapper(AssetBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<Asset> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(Asset::getId);
+        lqw.orderByDesc(Asset::getCreateTime)
+            .orderByDesc(Asset::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getName()), Asset::getName, bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getModel()), Asset::getModel, bo.getModel());
         lqw.eq(StringUtils.isNotBlank(bo.getSpecs()), Asset::getSpecs, bo.getSpecs());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AssetTypeServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.Asset;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.AssetTypeBo;
 import org.dromara.property.domain.vo.AssetTypeVo;
@@ -73,7 +74,8 @@ public class AssetTypeServiceImpl implements IAssetTypeService {
     private LambdaQueryWrapper<AssetType> buildQueryWrapper(AssetTypeBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<AssetType> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(AssetType::getSort);
+        lqw.orderByDesc(AssetType::getCreateTime)
+            .orderByDesc(AssetType::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getAssetTypeName()), AssetType::getAssetTypeName, bo.getAssetTypeName());
         lqw.eq(bo.getSort() != null, AssetType::getSort, bo.getSort());
         return lqw;

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CapitalApplicationServiceImpl.java

@@ -115,7 +115,8 @@ public class CapitalApplicationServiceImpl implements ICapitalApplicationService
     private LambdaQueryWrapper<CapitalApplication> buildQueryWrapper(CapitalApplicationBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<CapitalApplication> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(CapitalApplication::getId);
+        lqw.orderByDesc(CapitalApplication::getCreateTime)
+            .orderByDesc(CapitalApplication::getUpdateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), CapitalApplication::getTitle, bo.getTitle());
         lqw.eq(bo.getApplicat() != null, CapitalApplication::getApplicat, bo.getApplicat());
         lqw.eq(StringUtils.isNotBlank(bo.getPhone()), CapitalApplication::getPhone, bo.getPhone());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CarInfoServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.CapitalApplication;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.CarInfoBo;
 import org.dromara.property.domain.vo.CarInfoVo;
@@ -73,7 +74,8 @@ public class CarInfoServiceImpl implements ICarInfoService {
     private LambdaQueryWrapper<CarInfo> buildQueryWrapper(CarInfoBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<CarInfo> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(CarInfo::getId);
+        lqw.orderByDesc(CarInfo::getCreateTime)
+            .orderByDesc(CarInfo::getUpdateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getCarNumber()), CarInfo::getCarNumber, bo.getCarNumber());
         lqw.eq(StringUtils.isNotBlank(bo.getCarFrameNumber()), CarInfo::getCarFrameNumber, bo.getCarFrameNumber());
         lqw.eq(StringUtils.isNotBlank(bo.getCarColour()), CarInfo::getCarColour, bo.getCarColour());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CarTypeServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.CarInfo;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.CarTypeBo;
 import org.dromara.property.domain.vo.CarTypeVo;
@@ -73,7 +74,8 @@ public class CarTypeServiceImpl implements ICarTypeService {
     private LambdaQueryWrapper<CarType> buildQueryWrapper(CarTypeBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<CarType> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(CarType::getId);
+        lqw.orderByDesc(CarType::getCreateTime)
+            .orderByDesc(CarType::getUpdateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getCarTypeNumber()), CarType::getCarTypeNumber, bo.getCarTypeNumber());
         lqw.like(StringUtils.isNotBlank(bo.getCarTypeName()), CarType::getCarTypeName, bo.getCarTypeName());
         return lqw;

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ConteactServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.CarType;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.ConteactBo;
 import org.dromara.property.domain.vo.ConteactVo;
@@ -73,7 +74,8 @@ public class ConteactServiceImpl implements IConteactService {
     private LambdaQueryWrapper<Conteact> buildQueryWrapper(ConteactBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<Conteact> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(Conteact::getId);
+        lqw.orderByDesc(Conteact::getCreateTime)
+            .orderByDesc(Conteact::getUpdateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getContract()), Conteact::getContract, bo.getContract());
         lqw.like(StringUtils.isNotBlank(bo.getName()), Conteact::getName, bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getMsg()), Conteact::getMsg, bo.getMsg());

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

@@ -14,10 +14,7 @@ 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.ResidentPerson;
+import org.dromara.property.domain.*;
 import org.dromara.property.domain.bo.CostCarChargeBo;
 import org.dromara.property.domain.bo.CostChargeReturnFeeBo;
 import org.dromara.property.domain.enums.ChargeStatusEnum;
@@ -81,8 +78,9 @@ public class CostCarChargeServiceImpl implements ICostCarChargeService {
         Page<CostCarChargeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
 //        List<Long> residentPersonIdList = result.getRecords().stream().map(vo -> vo.getPersonId()).distinct().collect(Collectors.toList());
 //        List<RemoteUserVo> remoteUserVos = remoteUserService.selectListByIds(residentPersonIdList);
+
         List<ResidentPerson> residentPeoplelist = residentPersonMapper.selectList();
-        List<String> roomNames = roomService.queryRoomNameList(idList);
+//        List<String> roomNames = roomService.queryRoomNameList(idList);
         result.getRecords().stream().forEach(s -> {
             if (CollUtil.isNotEmpty(residentPeoplelist)) {
                 ResidentPerson residentPerson = residentPeoplelist.stream()
@@ -108,7 +106,8 @@ public class CostCarChargeServiceImpl implements ICostCarChargeService {
     private LambdaQueryWrapper<CostCarCharge> buildQueryWrapper(CostCarChargeBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<CostCarCharge> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(CostCarCharge::getId);
+        lqw.orderByDesc(CostCarCharge::getCreateTime)
+            .orderByDesc(CostCarCharge::getUpdateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getCarNumber()), CostCarCharge::getCarNumber, bo.getCarNumber());
         lqw.eq(bo.getPersonId() != null, CostCarCharge::getPersonId, bo.getPersonId());
         lqw.eq(bo.getFloorId() != null, CostCarCharge::getFloorId, bo.getFloorId());

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

@@ -15,9 +15,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.property.domain.CostPayFeeAudit;
-import org.dromara.property.domain.CostReturnPayFee;
-import org.dromara.property.domain.ResidentPerson;
+import org.dromara.property.domain.*;
 import org.dromara.property.domain.bo.CostChargeReturnFeeBo;
 import org.dromara.property.domain.enums.ChargeStatusEnum;
 import org.dromara.property.domain.vo.*;
@@ -26,7 +24,6 @@ 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;
 import org.dromara.property.service.ICostHouseChargeService;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -117,7 +114,8 @@ public class CostHouseChargeServiceImpl implements ICostHouseChargeService {
     private LambdaQueryWrapper<CostHouseCharge> buildQueryWrapper(CostHouseChargeBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<CostHouseCharge> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(CostHouseCharge::getId);
+        lqw.orderByDesc(CostHouseCharge::getCreateTime)
+            .orderByDesc(CostHouseCharge::getUpdateTime);
         lqw.eq(bo.getRoomId() != null, CostHouseCharge::getRoomId, bo.getRoomId());
         lqw.eq(bo.getCostItemsId() != null, CostHouseCharge::getCostItemsId, bo.getCostItemsId());
         lqw.eq(StringUtils.isNotBlank(bo.getChargeCycle()), CostHouseCharge::getChargeCycle, bo.getChargeCycle());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostItemsServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.CostHouseCharge;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.CostItemsBo;
 import org.dromara.property.domain.vo.CostItemsVo;
@@ -75,7 +76,8 @@ public class CostItemsServiceImpl implements ICostItemsService {
     private LambdaQueryWrapper<CostItems> buildQueryWrapper(CostItemsBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<CostItems> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(CostItems::getId);
+        lqw.orderByDesc(CostItems::getCreateTime)
+            .orderByDesc(CostItems::getUpdateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getCostType()), CostItems::getCostType, bo.getCostType());
         lqw.eq(StringUtils.isNotBlank(bo.getChargeItem()), CostItems::getChargeItem, bo.getChargeItem());
         lqw.eq(StringUtils.isNotBlank(bo.getChargeNo()), CostItems::getChargeNo, bo.getChargeNo());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostMeterTypeServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.CostItems;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.CostMeterTypeBo;
 import org.dromara.property.domain.vo.CostMeterTypeVo;
@@ -74,7 +75,8 @@ public class CostMeterTypeServiceImpl implements ICostMeterTypeService {
     private LambdaQueryWrapper<CostMeterType> buildQueryWrapper(CostMeterTypeBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<CostMeterType> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(CostMeterType::getId);
+        lqw.orderByDesc(CostMeterType::getCreateTime)
+            .orderByDesc(CostMeterType::getUpdateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getMeterType()), CostMeterType::getMeterType, bo.getMeterType());
         lqw.like(StringUtils.isNotBlank(bo.getName()), CostMeterType::getName, bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), CostMeterType::getSearchValue, bo.getSearchValue());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostMeterWaterServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.CostMeterType;
 import org.dromara.property.domain.vo.CostMeterTypeVo;
 import org.dromara.property.mapper.CostMeterTypeMapper;
 import org.springframework.stereotype.Service;
@@ -91,7 +92,8 @@ public class CostMeterWaterServiceImpl implements ICostMeterWaterService {
     private LambdaQueryWrapper<CostMeterWater> buildQueryWrapper(CostMeterWaterBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<CostMeterWater> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(CostMeterWater::getId);
+        lqw.orderByDesc(CostMeterWater::getCreateTime)
+            .orderByDesc(CostMeterWater::getUpdateTime);
         lqw.eq(bo.getItemId() != null, CostMeterWater::getItemId, bo.getItemId());
         lqw.eq(bo.getMeterTypeId() != null, CostMeterWater::getMeterTypeId, bo.getMeterTypeId());
         lqw.eq(StringUtils.isNotBlank(bo.getCostType()), CostMeterWater::getCostType, bo.getCostType());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostPayFeeAuditServiceImpl.java

@@ -15,9 +15,11 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.property.domain.CostCarCharge;
 import org.dromara.property.domain.CostHouseCharge;
+import org.dromara.property.domain.CostMeterWater;
 import org.dromara.property.domain.CostPayFeeAudit;
 import org.dromara.property.domain.bo.CostPayFeeAuditBo;
 import org.dromara.property.domain.enums.ChargeStatusEnum;
+import org.dromara.property.domain.enums.ChargeTypeEnum;
 import org.dromara.property.domain.vo.*;
 import org.dromara.property.mapper.*;
 import org.dromara.property.service.ICostPayFeeAuditService;
@@ -59,7 +61,18 @@ public class CostPayFeeAuditServiceImpl implements ICostPayFeeAuditService {
         CostItemsVo costItemsVo = costItemsMapper.selectVoById(costPayFeeAuditVo.getItemId());
         costPayFeeAuditVo.setChargeItem(ObjectUtil.isNotEmpty(costItemsVo) ? costItemsVo.getChargeItem() : null);
         costPayFeeAuditVo.setChargeCycle(ObjectUtil.isNotEmpty(costItemsVo) ? costItemsVo.getChargeCycle() : null);
-        //TbRoomVo roomVo  = roomMapper.selectVoById(costPayFeeAuditVo.getChargeId());
+        if (costPayFeeAuditVo.getChargeType().equals(ChargeTypeEnum.HOUS_CHARGES.getValue())) {
+            CostHouseCharge costHouseCharge = coinHouseChargeMapper.selectById(costPayFeeAuditVo.getChargeId());
+            if (ObjectUtil.isNotEmpty(costHouseCharge)) {
+                String queryRoomName = roomMapper.queryRoomName(costHouseCharge.getRoomId());
+                costPayFeeAuditVo.setRoomNumber(ObjectUtil.isNotEmpty(queryRoomName) ? queryRoomName : null);
+            }
+        }
+        if (costPayFeeAuditVo.getChargeType().equals(ChargeTypeEnum.CARD_CHARGES.getValue())) {
+            CostCarCharge costCarCharge = costCarChargeMapper.selectById(costPayFeeAuditVo.getChargeId());
+            costPayFeeAuditVo.setCarNumber(ObjectUtil.isNotEmpty(costCarCharge) ? costCarCharge.getCarNumber() : null);
+        }
+        // TbRoomVo roomVo  = roomMapper.selectVoById(costPayFeeAuditVo.getChargeId());
         //costPayFeeAuditVo.setRoomNumber(ObjectUtil.isNotEmpty(roomVo)? roomVo.getRoomNumber() :null );
         return costPayFeeAuditVo;
     }
@@ -118,7 +131,8 @@ public class CostPayFeeAuditServiceImpl implements ICostPayFeeAuditService {
     private LambdaQueryWrapper<CostPayFeeAudit> buildQueryWrapper(CostPayFeeAuditBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<CostPayFeeAudit> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(CostPayFeeAudit::getId);
+        lqw.orderByDesc(CostPayFeeAudit::getCreateTime)
+            .orderByDesc(CostPayFeeAudit::getUpdateTime);
         lqw.eq(bo.getChargeId() != null, CostPayFeeAudit::getChargeId, bo.getChargeId());
         lqw.eq(bo.getItemId() != null, CostPayFeeAudit::getItemId, bo.getItemId());
         lqw.eq(bo.getStartTime() != null, CostPayFeeAudit::getStartTime, bo.getStartTime());
@@ -175,13 +189,13 @@ public class CostPayFeeAuditServiceImpl implements ICostPayFeeAuditService {
     private void validEntityBeforeUpdate(CostPayFeeAudit entity) {
         //TODO 做一些数据校验,如唯一约束
         if (entity.getState().equals("1")) {
-            if (entity.getChargeType().equals("1")) {
+            if (entity.getChargeType().equals(ChargeTypeEnum.HOUS_CHARGES.getValue())) {
                 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")) {
+            if (entity.getChargeType().equals(ChargeTypeEnum.CARD_CHARGES.getValue())) {
 
                 CostCarCharge costCarCharge = costCarChargeMapper.selectById(entity.getChargeId());
                 Assert.isTrue(ObjectUtil.isNotEmpty(costCarCharge), "该车辆收费项为空");
@@ -190,13 +204,13 @@ public class CostPayFeeAuditServiceImpl implements ICostPayFeeAuditService {
             }
         }
         if (entity.getState().equals("2")) {
-            if (entity.getChargeType().equals("1")) {
+            if (entity.getChargeType().equals(ChargeTypeEnum.HOUS_CHARGES.getValue())) {
                 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")) {
+            if (entity.getChargeType().equals(ChargeTypeEnum.CARD_CHARGES.getValue())) {
                 CostCarCharge costCarCharge = costCarChargeMapper.selectById(entity.getChargeId());
                 Assert.isTrue(ObjectUtil.isNotEmpty(costCarCharge), "该车辆收费项为空");
                 costCarCharge.setChargeStatus(ChargeStatusEnum.THE_PAYMENT_REVIEW_FAILED.getValue());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostReturnPayFeeServiceImpl.java

@@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.property.domain.CostCarCharge;
 import org.dromara.property.domain.CostHouseCharge;
+import org.dromara.property.domain.CostPayFeeAudit;
 import org.dromara.property.domain.CostReturnPayFee;
 import org.dromara.property.domain.bo.CostReturnPayFeeBo;
 import org.dromara.property.domain.enums.ChargeStatusEnum;
@@ -81,7 +82,8 @@ public class CostReturnPayFeeServiceImpl implements ICostReturnPayFeeService {
     private LambdaQueryWrapper<CostReturnPayFee> buildQueryWrapper(CostReturnPayFeeBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<CostReturnPayFee> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(CostReturnPayFee::getId);
+        lqw.orderByDesc(CostReturnPayFee::getCreateTime)
+            .orderByDesc(CostReturnPayFee::getUpdateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getReturnNo()), CostReturnPayFee::getReturnNo, bo.getReturnNo());
         lqw.eq(StringUtils.isNotBlank(bo.getPayNo()), CostReturnPayFee::getPayNo, bo.getPayNo());
         lqw.eq(StringUtils.isNotBlank(bo.getReason()), CostReturnPayFee::getReason, bo.getReason());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerContingenPlanServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.translation.annotation.Translation;
+import org.dromara.property.domain.CostReturnPayFee;
 import org.dromara.property.domain.CustomerContingenPlan;
 import org.dromara.property.domain.CustomerContingenPlanRecord;
 import org.dromara.property.domain.ResidentPerson;
@@ -110,7 +111,8 @@ public class CustomerContingenPlanServiceImpl implements ICustomerContingenPlanS
     private LambdaQueryWrapper<CustomerContingenPlan> buildQueryWrapper(CustomerContingenPlanBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<CustomerContingenPlan> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(CustomerContingenPlan::getId);
+        lqw.orderByDesc(CustomerContingenPlan::getCreateTime)
+            .orderByDesc(CustomerContingenPlan::getUpdateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getContingenPlanType()), CustomerContingenPlan::getContingenPlanType, bo.getContingenPlanType());
         lqw.eq(ObjectUtil.isNotEmpty(bo.getDutyPersion()), CustomerContingenPlan::getDutyPersion, bo.getDutyPersion());
         lqw.like(StringUtils.isNotBlank(bo.getContingenPlanName()), CustomerContingenPlan::getContingenPlanName, bo.getContingenPlanName());

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

@@ -14,10 +14,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.property.domain.CustomerFeedbacks;
-import org.dromara.property.domain.ServiceWorkOrders;
-import org.dromara.property.domain.ServiceWorkOrdersRecord;
-import org.dromara.property.domain.ServiceWorkOrdersType;
+import org.dromara.property.domain.*;
 import org.dromara.property.domain.bo.CustomerFeedbacksBo;
 import org.dromara.property.domain.bo.ServiceWorkOrdersBo;
 import org.dromara.property.domain.vo.CustomerFeedbacksVo;
@@ -67,8 +64,8 @@ public class CustomerFeedbacksServiceImpl implements ICustomerFeedbacksService {
     public CustomerFeedbacksVo queryById(Long id) {
         CustomerFeedbacksVo customerFeedbacksVo = baseMapper.selectVoById(id);
         ServiceWorkOrdersType serviceWorkOrdersType = serviceWorkOrdersTypeMapper.selectById(customerFeedbacksVo.getFeedbackType());
-        customerFeedbacksVo.setFeedbackTypeName(StringUtils.isNotBlank(serviceWorkOrdersType.getOrderTypeName()) ? serviceWorkOrdersType.getOrderTypeName() : null);
-        String nikName = remoteUserService.selectNicknameById(customerFeedbacksVo.getFeedbackPersion());
+        customerFeedbacksVo.setFeedbackTypeName(ObjectUtil.isNotEmpty(serviceWorkOrdersType) ? serviceWorkOrdersType.getOrderTypeName() : null);
+        String nikName = remoteUserService.selectNicknameById(ObjectUtil.isNotEmpty(customerFeedbacksVo) ?customerFeedbacksVo.getFeedbackPersion():null);
         customerFeedbacksVo.setFeedbackPersionName(nikName);
         return customerFeedbacksVo;
     }
@@ -115,11 +112,11 @@ public class CustomerFeedbacksServiceImpl implements ICustomerFeedbacksService {
         if (CollUtil.isNotEmpty(remoteUserVos)) {
             RemoteUserVo remoteUserVo = remoteUserVos.stream()
                 .filter(vo -> vo.getUserId() != null && vo.getUserId().equals(customerFeedbacksVo.getFeedbackPersion())).findFirst().orElse(null);
-            customerFeedbacksVo.setFeedbackPersionName(ObjectUtil.isNotNull(remoteUserVo) ? remoteUserVo.getNickName() : null);
+            customerFeedbacksVo.setFeedbackPersionName(ObjectUtil.isNotEmpty(remoteUserVo) ? remoteUserVo.getNickName() : null);
         }
         if (CollUtil.isNotEmpty(serviceWorkOrdersTypes)) {
             ServiceWorkOrdersType serviceWorkOrdersType = serviceWorkOrdersTypes.stream().filter(vo -> vo.getId() != null && vo.getId().equals(customerFeedbacksVo.getFeedbackType())).findFirst().orElse(null);
-            customerFeedbacksVo.setFeedbackTypeName(ObjectUtil.isNotNull(serviceWorkOrdersType) ? serviceWorkOrdersType.getOrderTypeName() : null);
+            customerFeedbacksVo.setFeedbackTypeName(ObjectUtil.isNotEmpty(serviceWorkOrdersType) ? serviceWorkOrdersType.getOrderTypeName() : null);
         }
     }
 
@@ -138,7 +135,8 @@ public class CustomerFeedbacksServiceImpl implements ICustomerFeedbacksService {
     private LambdaQueryWrapper<CustomerFeedbacks> buildQueryWrapper(CustomerFeedbacksBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<CustomerFeedbacks> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(CustomerFeedbacks::getId);
+        lqw.orderByDesc(CustomerFeedbacks::getCreateTime)
+            .orderByDesc(CustomerFeedbacks::getUpdateTime);
         lqw.eq(ObjectUtil.isNotNull(bo.getFeedbackType()), CustomerFeedbacks::getFeedbackType, bo.getFeedbackType());
         lqw.eq(bo.getFeedbackPersion() != null, CustomerFeedbacks::getFeedbackPersion, bo.getFeedbackPersion());
         lqw.eq(StringUtils.isNotBlank(bo.getFeedbackPersionPhone()), CustomerFeedbacks::getFeedbackPersionPhone, bo.getFeedbackPersionPhone());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerNoticesServiceImpl.java

@@ -13,6 +13,7 @@ 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.common.satoken.utils.LoginHelper;
+import org.dromara.property.domain.CustomerFeedbacks;
 import org.dromara.property.domain.CustomerNotices;
 import org.dromara.property.domain.bo.CustomerNoticesBo;
 import org.dromara.property.domain.vo.CustomerNoticesVo;
@@ -153,7 +154,8 @@ public class CustomerNoticesServiceImpl implements ICustomerNoticesService {
     private LambdaQueryWrapper<CustomerNotices> buildQueryWrapper(CustomerNoticesBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<CustomerNotices> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(CustomerNotices::getId);
+        lqw.orderByDesc(CustomerNotices::getCreateTime)
+            .orderByDesc(CustomerNotices::getUpdateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), CustomerNotices::getTitle, bo.getTitle());
         lqw.eq(StringUtils.isNotBlank(bo.getType()), CustomerNotices::getType, bo.getType());
         lqw.eq(StringUtils.isNotBlank(bo.getIsAll()), CustomerNotices::getIsAll, bo.getIsAll());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/DepotLogServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.property.domain.Asset;
+import org.dromara.property.domain.CustomerNotices;
 import org.dromara.property.domain.Depot;
 import org.dromara.property.mapper.AssetMapper;
 import org.dromara.property.mapper.DepotMapper;
@@ -119,7 +120,8 @@ public class DepotLogServiceImpl implements IDepotLogService {
     private LambdaQueryWrapper<DepotLog> buildQueryWrapper(DepotLogBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<DepotLog> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(DepotLog::getId);
+        lqw.orderByDesc(DepotLog::getCreateTime)
+            .orderByDesc(DepotLog::getUpdateTime);
         lqw.eq(bo.getDepotId() != null, DepotLog::getDepotId, bo.getDepotId());
         lqw.eq(bo.getAssetId() != null, DepotLog::getAssetId, bo.getAssetId());
         lqw.eq(bo.getType() != null, DepotLog::getType, bo.getType());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/DepotServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.DepotLog;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.DepotBo;
 import org.dromara.property.domain.vo.DepotVo;
@@ -73,7 +74,8 @@ public class DepotServiceImpl implements IDepotService {
     private LambdaQueryWrapper<Depot> buildQueryWrapper(DepotBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<Depot> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(Depot::getId);
+        lqw.orderByDesc(Depot::getCreateTime)
+            .orderByDesc(Depot::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getDepotName()), Depot::getDepotName, bo.getDepotName());
         lqw.eq(StringUtils.isNotBlank(bo.getMsg()), Depot::getMsg, bo.getMsg());
         lqw.eq(StringUtils.isNotBlank(bo.getModelType()), Depot::getModelType, bo.getModelType());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/FaqManagementServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.Depot;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.FaqManagementBo;
 import org.dromara.property.domain.vo.FaqManagementVo;
@@ -73,7 +74,8 @@ public class FaqManagementServiceImpl implements IFaqManagementService {
     private LambdaQueryWrapper<FaqManagement> buildQueryWrapper(FaqManagementBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<FaqManagement> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(FaqManagement::getId);
+        lqw.orderByDesc(FaqManagement::getCreateTime)
+            .orderByDesc(FaqManagement::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getHead()), FaqManagement::getHead, bo.getHead());
         lqw.eq(StringUtils.isNotBlank(bo.getType()), FaqManagement::getType, bo.getType());
         lqw.eq(bo.getPageView() != null, FaqManagement::getPageView, bo.getPageView());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionItemServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.FaqManagement;
 import org.dromara.property.domain.InspectionItem;
 import org.dromara.property.domain.bo.InspectionItemBo;
 import org.dromara.property.domain.vo.InspectionItemVo;
@@ -74,7 +75,8 @@ public class InspectionItemServiceImpl implements IInspectionItemService {
     private LambdaQueryWrapper<InspectionItem> buildQueryWrapper(InspectionItemBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<InspectionItem> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(InspectionItem::getId);
+        lqw.orderByDesc(InspectionItem::getCreateTime)
+            .orderByDesc(InspectionItem::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getItemName()), InspectionItem::getItemName, bo.getItemName());
         lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), InspectionItem::getSearchValue, bo.getSearchValue());
         return lqw;

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPlanServiceImpl.java

@@ -17,10 +17,7 @@ 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.InspectionPlan;
-import org.dromara.property.domain.InspectionPlanStaff;
-import org.dromara.property.domain.InspectionRoute;
-import org.dromara.property.domain.MachineMaintainPlanStaff;
+import org.dromara.property.domain.*;
 import org.dromara.property.domain.bo.InspectionPlanBo;
 import org.dromara.property.domain.bo.InspectionPlanStaffBo;
 import org.dromara.property.domain.bo.MachineMaintainPlanBo;
@@ -128,7 +125,8 @@ public class InspectionPlanServiceImpl implements IInspectionPlanService {
     private LambdaQueryWrapper<InspectionPlan> buildQueryWrapper(InspectionPlanBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<InspectionPlan> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(InspectionPlan::getId);
+        lqw.orderByDesc(InspectionPlan::getCreateTime)
+            .orderByDesc(InspectionPlan::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getPlanName()), InspectionPlan::getPlanName, bo.getPlanName());
         lqw.eq(bo.getInspectionRouteId() != null, InspectionPlan::getInspectionRouteId, bo.getInspectionRouteId());
         lqw.eq(StringUtils.isNotBlank(bo.getInspectionPlanPeriod()), InspectionPlan::getInspectionPlanPeriod, bo.getInspectionPlanPeriod());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPlanStaffServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.InspectionPlan;
 import org.dromara.property.domain.InspectionPlanStaff;
 import org.dromara.property.domain.bo.InspectionPlanStaffBo;
 import org.dromara.property.domain.vo.InspectionPlanStaffVo;
@@ -74,7 +75,8 @@ public class InspectionPlanStaffServiceImpl implements IInspectionPlanStaffServi
     private LambdaQueryWrapper<InspectionPlanStaff> buildQueryWrapper(InspectionPlanStaffBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<InspectionPlanStaff> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(InspectionPlanStaff::getId);
+        lqw.orderByDesc(InspectionPlanStaff::getCreateTime)
+            .orderByDesc(InspectionPlanStaff::getUpdateTime);
         lqw.eq(bo.getUserId() != null, InspectionPlanStaff::getUserId, bo.getUserId());
         lqw.eq(bo.getInspectionPlanId() != null, InspectionPlanStaff::getInspectionPlanId, bo.getInspectionPlanId());
         lqw.eq(bo.getStartTime() != null, InspectionPlanStaff::getStartTime, bo.getStartTime());

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.InspectionPlanStaff;
 import org.dromara.property.domain.InspectionPoint;
 import org.dromara.property.domain.bo.InspectionPointBo;
 import org.dromara.property.domain.vo.InspectionItemVo;
@@ -98,7 +99,8 @@ public class InspectionPointServiceImpl implements IInspectionPointService {
     private LambdaQueryWrapper<InspectionPoint> buildQueryWrapper(InspectionPointBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<InspectionPoint> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(InspectionPoint::getId);
+        lqw.orderByDesc(InspectionPoint::getCreateTime)
+            .orderByDesc(InspectionPoint::getUpdateTime);
         lqw.eq(bo.getItemId() != null, InspectionPoint::getItemId, bo.getItemId());
         lqw.like(StringUtils.isNotBlank(bo.getPointName()), InspectionPoint::getPointName, bo.getPointName());
         lqw.eq(StringUtils.isNotBlank(bo.getPointType()), InspectionPoint::getPointType, bo.getPointType());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionRouteServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.InspectionPoint;
 import org.dromara.property.domain.InspectionRoute;
 import org.dromara.property.domain.InspectionRoutePoint;
 import org.dromara.property.domain.bo.InspectionRouteBo;
@@ -91,7 +92,8 @@ public class InspectionRouteServiceImpl implements IInspectionRouteService {
     private LambdaQueryWrapper<InspectionRoute> buildQueryWrapper(InspectionRouteBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<InspectionRoute> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(InspectionRoute::getId);
+        lqw.orderByDesc(InspectionRoute::getCreateTime)
+            .orderByDesc(InspectionRoute::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getRouteName()), InspectionRoute::getRouteName, bo.getRouteName());
         lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), InspectionRoute::getSearchValue, bo.getSearchValue());
         return lqw;

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionStaffServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.InspectionRoute;
 import org.dromara.property.domain.InspectionStaff;
 import org.dromara.property.domain.bo.InspectionStaffBo;
 import org.dromara.property.domain.vo.InspectionStaffVo;
@@ -74,7 +75,8 @@ public class InspectionStaffServiceImpl implements IInspectionStaffService {
     private LambdaQueryWrapper<InspectionStaff> buildQueryWrapper(InspectionStaffBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<InspectionStaff> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(InspectionStaff::getId);
+        lqw.orderByDesc(InspectionStaff::getCreateTime)
+            .orderByDesc(InspectionStaff::getUpdateTime);
         lqw.eq(bo.getUserId() != null, InspectionStaff::getUserId, bo.getUserId());
         lqw.eq(bo.getInspectionPlanId() != null, InspectionStaff::getInspectionPlanId, bo.getInspectionPlanId());
         lqw.eq(bo.getStartTime() != null, InspectionStaff::getStartTime, bo.getStartTime());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionTaskDetailServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.InspectionStaff;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.InspectionTaskDetailBo;
 import org.dromara.property.domain.vo.InspectionTaskDetailVo;
@@ -73,7 +74,8 @@ public class InspectionTaskDetailServiceImpl implements IInspectionTaskDetailSer
     private LambdaQueryWrapper<InspectionTaskDetail> buildQueryWrapper(InspectionTaskDetailBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<InspectionTaskDetail> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(InspectionTaskDetail::getId);
+        lqw.orderByDesc(InspectionTaskDetail::getCreateTime)
+            .orderByDesc(InspectionTaskDetail::getUpdateTime);
         lqw.eq(bo.getTaskId() != null, InspectionTaskDetail::getTaskId, bo.getTaskId());
         lqw.eq(bo.getRouteId() != null, InspectionTaskDetail::getRouteId, bo.getRouteId());
         lqw.eq(bo.getPlanId() != null, InspectionTaskDetail::getPlanId, bo.getPlanId());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionTaskServiceImpl.java

@@ -11,6 +11,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.property.domain.InspectionPlan;
 import org.dromara.property.domain.InspectionTask;
+import org.dromara.property.domain.InspectionTaskDetail;
 import org.dromara.property.domain.bo.InspectionTaskBo;
 import org.dromara.property.domain.vo.InspectionPlanVo;
 import org.dromara.property.domain.vo.InspectionTaskVo;
@@ -99,7 +100,8 @@ public class InspectionTaskServiceImpl implements IInspectionTaskService {
     private LambdaQueryWrapper<InspectionTask> buildQueryWrapper(InspectionTaskBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<InspectionTask> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(InspectionTask::getId);
+        lqw.orderByDesc(InspectionTask::getCreateTime)
+            .orderByDesc(InspectionTask::getUpdateTime);
         lqw.eq(bo.getInspectionPlanId() != null, InspectionTask::getInspectionPlanId, bo.getInspectionPlanId());
         lqw.eq(bo.getActInsTime() != null, InspectionTask::getActInsTime, bo.getActInsTime());
         lqw.eq(bo.getActUserId() != null, InspectionTask::getActUserId, bo.getActUserId());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineLocationServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.InspectionTask;
 import org.dromara.property.domain.enums.MachineLocationTypeEnum;
 import org.dromara.property.domain.vo.MachineLocationDetailVo;
 import org.dromara.property.mapper.*;
@@ -135,7 +136,8 @@ public class MachineLocationServiceImpl implements IMachineLocationService {
     private LambdaQueryWrapper<MachineLocation> buildQueryWrapper(MachineLocationBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<MachineLocation> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(MachineLocation::getId);
+        lqw.orderByDesc(MachineLocation::getCreateTime)
+            .orderByDesc(MachineLocation::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getLocationName()), MachineLocation::getLocationName, bo.getLocationName());
         lqw.eq(StringUtils.isNotBlank(bo.getLocationCode()), MachineLocation::getLocationCode, bo.getLocationCode());
         lqw.eq(bo.getLocationObjId() != null, MachineLocation::getLocationObjId, bo.getLocationObjId());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineMaintainPlanServiceImpl.java

@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.property.domain.InspectionPlanStaff;
+import org.dromara.property.domain.MachineLocation;
 import org.dromara.property.domain.MachineMaintainPlan;
 import org.dromara.property.domain.MachineMaintainPlanStaff;
 import org.dromara.property.domain.bo.InspectionPlanStaffBo;
@@ -118,7 +119,8 @@ public class MachineMaintainPlanServiceImpl implements IMachineMaintainPlanServi
     private LambdaQueryWrapper<MachineMaintainPlan> buildQueryWrapper(MachineMaintainPlanBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<MachineMaintainPlan> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(MachineMaintainPlan::getId);
+        lqw.orderByDesc(MachineMaintainPlan::getCreateTime)
+            .orderByDesc(MachineMaintainPlan::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getPlanName()), MachineMaintainPlan::getPlanName, bo.getPlanName());
         lqw.eq(StringUtils.isNotBlank(bo.getPlanNo()), MachineMaintainPlan::getPlanNo, bo.getPlanNo());
         lqw.eq(StringUtils.isNotBlank(bo.getPlanPeriod()), MachineMaintainPlan::getPlanPeriod, bo.getPlanPeriod());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineMaintainPlanStaffServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.MachineMaintainPlan;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.MachineMaintainPlanStaffBo;
 import org.dromara.property.domain.vo.MachineMaintainPlanStaffVo;
@@ -73,7 +74,8 @@ public class MachineMaintainPlanStaffServiceImpl implements IMachineMaintainPlan
     private LambdaQueryWrapper<MachineMaintainPlanStaff> buildQueryWrapper(MachineMaintainPlanStaffBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<MachineMaintainPlanStaff> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(MachineMaintainPlanStaff::getId);
+        lqw.orderByDesc(MachineMaintainPlanStaff::getCreateTime)
+            .orderByDesc(MachineMaintainPlanStaff::getUpdateTime);
         lqw.eq(bo.getUserId() != null, MachineMaintainPlanStaff::getUserId, bo.getUserId());
         lqw.eq(bo.getMaintainPlanId() != null, MachineMaintainPlanStaff::getMaintainPlanId, bo.getMaintainPlanId());
         lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), MachineMaintainPlanStaff::getSearchValue, bo.getSearchValue());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineMaintainTaskDetailServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.MachineMaintainPlanStaff;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.MachineMaintainTaskDetailBo;
 import org.dromara.property.domain.vo.MachineMaintainTaskDetailVo;
@@ -73,7 +74,8 @@ public class MachineMaintainTaskDetailServiceImpl implements IMachineMaintainTas
     private LambdaQueryWrapper<MachineMaintainTaskDetail> buildQueryWrapper(MachineMaintainTaskDetailBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<MachineMaintainTaskDetail> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(MachineMaintainTaskDetail::getId);
+        lqw.orderByDesc(MachineMaintainTaskDetail::getCreateTime)
+            .orderByDesc(MachineMaintainTaskDetail::getUpdateTime);
         lqw.eq(bo.getTaskId() != null, MachineMaintainTaskDetail::getTaskId, bo.getTaskId());
         lqw.eq(bo.getMachineId() != null, MachineMaintainTaskDetail::getMachineId, bo.getMachineId());
         lqw.eq(StringUtils.isNotBlank(bo.getSendFlag()), MachineMaintainTaskDetail::getSendFlag, bo.getSendFlag());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineMaintainTaskServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.MachineMaintainTaskDetail;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.MachineMaintainTaskBo;
 import org.dromara.property.domain.vo.MachineMaintainTaskVo;
@@ -73,7 +74,8 @@ public class MachineMaintainTaskServiceImpl implements IMachineMaintainTaskServi
     private LambdaQueryWrapper<MachineMaintainTask> buildQueryWrapper(MachineMaintainTaskBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<MachineMaintainTask> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(MachineMaintainTask::getId);
+        lqw.orderByDesc(MachineMaintainTask::getCreateTime)
+            .orderByDesc(MachineMaintainTask::getUpdateTime);
         lqw.eq(bo.getMaintainPlanId() != null, MachineMaintainTask::getMaintainPlanId, bo.getMaintainPlanId());
         lqw.eq(StringUtils.isNotBlank(bo.getMaintainTaskNo()), MachineMaintainTask::getMaintainTaskNo, bo.getMaintainTaskNo());
         lqw.eq(StringUtils.isNotBlank(bo.getPlanUserId()), MachineMaintainTask::getPlanUserId, bo.getPlanUserId());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.MachineMaintainTask;
 import org.dromara.property.domain.MachineType;
 import org.dromara.property.domain.vo.*;
 import org.dromara.property.mapper.MachineLocationMapper;
@@ -90,7 +91,8 @@ public class MachineServiceImpl implements IMachineService {
     private LambdaQueryWrapper<Machine> buildQueryWrapper(MachineBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<Machine> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(Machine::getId);
+        lqw.orderByDesc(Machine::getCreateTime)
+            .orderByDesc(Machine::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getMachineName()), Machine::getMachineName, bo.getMachineName());
         lqw.eq(StringUtils.isNotBlank(bo.getMachineCode()), Machine::getMachineCode, bo.getMachineCode());
         lqw.eq(StringUtils.isNotBlank(bo.getMachineBrand()), Machine::getMachineBrand, bo.getMachineBrand());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineTypeServiceImpl.java

@@ -11,6 +11,7 @@ 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.Machine;
 import org.dromara.property.domain.MachineType;
 import org.dromara.property.domain.bo.MachineTypeBo;
 import org.dromara.property.domain.vo.MachineTypeTreeVo;
@@ -74,7 +75,8 @@ public class MachineTypeServiceImpl implements IMachineTypeService {
     private LambdaQueryWrapper<MachineType> buildQueryWrapper(MachineTypeBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<MachineType> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(MachineType::getId);
+        lqw.orderByDesc(MachineType::getCreateTime)
+            .orderByDesc(MachineType::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getMachineTypeName()), MachineType::getMachineTypeName, bo.getMachineTypeName());
         lqw.eq(StringUtils.isNotBlank(bo.getMachineTypeCode()), MachineType::getMachineTypeCode, bo.getMachineTypeCode());
         lqw.eq(bo.getParentTypeId() != null, MachineType::getParentTypeId, bo.getParentTypeId());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MaintainKnowledgeServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.MachineType;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.MaintainKnowledgeBo;
 import org.dromara.property.domain.vo.MaintainKnowledgeVo;
@@ -73,7 +74,8 @@ public class MaintainKnowledgeServiceImpl implements IMaintainKnowledgeService {
     private LambdaQueryWrapper<MaintainKnowledge> buildQueryWrapper(MaintainKnowledgeBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<MaintainKnowledge> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(MaintainKnowledge::getId);
+        lqw.orderByDesc(MaintainKnowledge::getCreateTime)
+            .orderByDesc(MaintainKnowledge::getUpdateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), MaintainKnowledge::getTitle, bo.getTitle());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), MaintainKnowledge::getStatus, bo.getStatus());
         lqw.eq(StringUtils.isNotBlank(bo.getCovers()), MaintainKnowledge::getCovers, bo.getCovers());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetAttachServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.MaintainKnowledge;
 import org.dromara.property.domain.Meet;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.MeetAttachBo;
@@ -77,7 +78,8 @@ public class MeetAttachServiceImpl implements IMeetAttachService {
 
     private LambdaQueryWrapper<MeetAttach> buildQueryWrapper(MeetAttachBo bo) {
         LambdaQueryWrapper<MeetAttach> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(MeetAttach::getId);
+        lqw.orderByDesc(MeetAttach::getCreateTime)
+            .orderByDesc(MeetAttach::getUpdateTime);
         lqw.eq(bo.getMeetId() != null, MeetAttach::getMeetId, bo.getMeetId());
         lqw.like(StringUtils.isNotBlank(bo.getProjectName()), MeetAttach::getProjectName, bo.getProjectName());
         lqw.eq(bo.getPrice() != null, MeetAttach::getPrice, bo.getPrice());

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

@@ -14,6 +14,7 @@ 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.MeetAttach;
 import org.dromara.property.domain.MeetAttachOrder;
 import org.dromara.property.domain.MeetBooking;
 import org.dromara.property.domain.bo.MeetBookingBo;
@@ -85,11 +86,13 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
     public TableDataInfo<MeetBookingVo> queryPageList(MeetBookingBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<MeetBooking> lqw = buildQueryWrapper(bo);
         Page<MeetBookingVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        List<MeetBookingVo> meetBookingVoList = new ArrayList<>();
+        if(CollUtil.isNotEmpty(result.getRecords())){
         List<ResidentUnitVo> residentUnitVolist = residentUnitMapper.selectVoList();
         List<Long> userId = result.getRecords().stream().map(vo -> vo.getPerson()).distinct().map(Long::parseLong).collect(Collectors.toList());
         List<ResidentPersonVo> remoteUserVos = residentPersonMapper.selectVoByIds(userId);
       //  List<RemoteUserVo> remoteUserVos = remoteUserService.selectListByIds(userId);
-        List<MeetBookingVo> meetBookingVoList = new ArrayList<>();
+
         result.getRecords().stream().forEach(s -> {
             if (CollUtil.isNotEmpty(residentUnitVolist)) {
                 ResidentUnitVo residentUnitVo = residentUnitVolist.stream()
@@ -104,6 +107,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
             }
             meetBookingVoList.add(s);
         });
+        }
         return TableDataInfo.build(new Page<MeetBookingVo>().setRecords(meetBookingVoList).setTotal(result.getTotal()));
     }
 
@@ -221,7 +225,8 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
 
     private LambdaQueryWrapper<MeetBooking> buildQueryWrapper(MeetBookingBo bo) {
         LambdaQueryWrapper<MeetBooking> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(MeetBooking::getId);
+        lqw.orderByDesc(MeetBooking::getCreateTime)
+            .orderByDesc(MeetBooking::getUpdateTime);
         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());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetServiceImpl.java

@@ -1,8 +1,10 @@
 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.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -12,11 +14,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.MeetAttach;
 import org.dromara.property.domain.MeetBooking;
+import org.dromara.property.domain.vo.MeetAttachVo;
 import org.dromara.property.domain.vo.ResidentPersonVo;
-import org.dromara.property.mapper.MeetBookingMapper;
-import org.dromara.property.mapper.ResidentPersonMapper;
-import org.dromara.property.mapper.TbRoomMapper;
+import org.dromara.property.mapper.*;
 import org.dromara.system.api.RemoteUserService;
 import org.dromara.system.api.domain.vo.RemoteUserVo;
 import org.springframework.stereotype.Service;
@@ -24,7 +26,6 @@ import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.MeetBo;
 import org.dromara.property.domain.vo.MeetVo;
 import org.dromara.property.domain.Meet;
-import org.dromara.property.mapper.MeetMapper;
 import org.dromara.property.service.IMeetService;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -48,6 +49,7 @@ import java.util.stream.Collectors;
 public class MeetServiceImpl implements IMeetService {
 
     private final MeetMapper baseMapper;
+    private final MeetAttachMapper meetAttachMapper;
     private final ResidentPersonMapper residentPersonMapper;
     private final TbRoomMapper roomMapper;
     private final MeetBookingMapper meetbookMapper;
@@ -63,7 +65,7 @@ public class MeetServiceImpl implements IMeetService {
     @Override
     public MeetVo queryById(Long id) {
         MeetVo meetVo = baseMapper.selectVoById(id);
- //       ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(meetVo.getPrincipals());
+        //       ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(meetVo.getPrincipals());
 //        if(ObjectUtil.isNotEmpty(residentPersonVo)){
 //            meetVo.setPrincipalsName(residentPersonVo.getUserName());
 //            meetVo.setPhoneNo(residentPersonVo.getPhone());
@@ -150,7 +152,8 @@ public class MeetServiceImpl implements IMeetService {
     private LambdaQueryWrapper<Meet> buildQueryWrapper(MeetBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<Meet> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(Meet::getId);
+        lqw.orderByDesc(Meet::getCreateTime)
+            .orderByDesc(Meet::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getName()), Meet::getName, bo.getName());
 //        lqw.eq(StringUtils.isNotBlank(bo.getLocation()), Meet::getLocation, bo.getLocation());
         lqw.eq(bo.getPersonNumber() != null, Meet::getPersonNumber, bo.getPersonNumber());
@@ -216,6 +219,10 @@ public class MeetServiceImpl implements IMeetService {
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
+            boolean exists = meetAttachMapper.exists(new LambdaQueryWrapper<MeetAttach>().in(MeetAttach::getMeetId, ids));
+            Assert.isTrue(!exists, "会议室具有增值服务,不允许单独删除");
+            boolean meetbookExists = meetbookMapper.exists(new LambdaQueryWrapper<MeetBooking>().in(MeetBooking::getMeetId, ids));
+            Assert.isTrue(!meetbookExists, "会议室具有预约记录,不允许单独删除");
         }
         return baseMapper.deleteByIds(ids) > 0;
     }

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsOrderChargeServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.Meet;
 import org.dromara.property.domain.PlantsOrderMaintain;
 import org.dromara.property.domain.vo.PlantsRentalOrderVo;
 import org.dromara.property.service.IPlantsRentalOrderService;
@@ -83,7 +84,8 @@ public class PlantsOrderChargeServiceImpl implements IPlantsOrderChargeService {
     private LambdaQueryWrapper<PlantsOrderCharge> buildQueryWrapper(PlantsOrderChargeBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<PlantsOrderCharge> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(PlantsOrderCharge::getId);
+        lqw.orderByDesc(PlantsOrderCharge::getCreateTime)
+            .orderByDesc(PlantsOrderCharge::getUpdateTime);
         lqw.eq(bo.getOrderId() != null, PlantsOrderCharge::getOrderId, bo.getOrderId());
         lqw.eq(bo.getUserId() != null, PlantsOrderCharge::getUserId, bo.getUserId());
         lqw.like(StringUtils.isNotBlank(bo.getUserName()), PlantsOrderCharge::getUserName, bo.getUserName());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsOrderMaintainServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.PlantsOrderCharge;
 import org.dromara.property.domain.vo.PlantsRentalOrderVo;
 import org.dromara.property.service.IPlantsRentalOrderService;
 import org.dromara.property.service.ITbRoomService;
@@ -90,7 +91,8 @@ public class PlantsOrderMaintainServiceImpl implements IPlantsOrderMaintainServi
     private LambdaQueryWrapper<PlantsOrderMaintain> buildQueryWrapper(PlantsOrderMaintainBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<PlantsOrderMaintain> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(PlantsOrderMaintain::getId);
+        lqw.orderByDesc(PlantsOrderMaintain::getCreateTime)
+            .orderByDesc(PlantsOrderMaintain::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getMaintainName()), PlantsOrderMaintain::getMaintainName, bo.getMaintainName());
         lqw.eq(bo.getRoomId() != null, PlantsOrderMaintain::getRoomId, bo.getRoomId());
         lqw.eq(bo.getServeType() != null, PlantsOrderMaintain::getServeType, bo.getServeType());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsPlanProductServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.PlantsOrderMaintain;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.PlantsPlanProductBo;
 import org.dromara.property.domain.vo.PlantsPlanProductVo;
@@ -74,7 +75,8 @@ public class PlantsPlanProductServiceImpl implements IPlantsPlanProductService {
     private LambdaQueryWrapper<PlantsPlanProduct> buildQueryWrapper(PlantsPlanProductBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<PlantsPlanProduct> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(PlantsPlanProduct::getId);
+        lqw.orderByDesc(PlantsPlanProduct::getCreateTime)
+            .orderByDesc(PlantsPlanProduct::getUpdateTime);
         lqw.eq(bo.getPlanId() != null, PlantsPlanProduct::getPlanId, bo.getPlanId());
         lqw.eq(bo.getProductId() != null, PlantsPlanProduct::getProductId, bo.getProductId());
         lqw.in(CollectionUtils.isNotEmpty(bo.getProductIds()), PlantsPlanProduct::getProductId, bo.getProductIds());
@@ -159,6 +161,7 @@ public class PlantsPlanProductServiceImpl implements IPlantsPlanProductService {
 
     /**
      * 查询租赁方案植物数据
+     *
      * @param planId
      * @return
      */
@@ -166,4 +169,17 @@ public class PlantsPlanProductServiceImpl implements IPlantsPlanProductService {
     public List<PlantsPlanProductVo> queryPlanProductsInfo(Long planId) {
         return baseMapper.queryProductsInfo(planId);
     }
+
+    /**
+     * 根据方案id删除方案产品
+     *
+     * @param ids 方案id
+     * @return
+     */
+    @Override
+    public void deleteByPlanIds(List<Long> ids) {
+        if (CollectionUtils.isNotEmpty(ids)) {
+            baseMapper.deleteByPlanIds(ids);
+        }
+    }
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsProductServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.PlantsPlanProduct;
 import org.dromara.property.domain.bo.PlantsPlanProductBo;
 import org.dromara.property.domain.bo.PlantsRentalOrderBo;
 import org.dromara.property.domain.vo.PlantsPlanProductVo;
@@ -90,7 +91,8 @@ public class PlantsProductServiceImpl implements IPlantsProductService {
     private LambdaQueryWrapper<PlantsProduct> buildQueryWrapper(PlantsProductBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<PlantsProduct> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(PlantsProduct::getId);
+        lqw.orderByDesc(PlantsProduct::getCreateTime)
+            .orderByDesc(PlantsProduct::getUpdateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getPlantCode()), PlantsProduct::getPlantCode, bo.getPlantCode());
         lqw.like(StringUtils.isNotBlank(bo.getPlantName()), PlantsProduct::getPlantName, bo.getPlantName());
         lqw.eq(bo.getPlantType() != null, PlantsProduct::getPlantType, bo.getPlantType());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsRentalOrderServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.PlantsProduct;
 import org.dromara.property.domain.bo.PlantsOrderChargeBo;
 import org.dromara.property.domain.bo.PlantsOrderMaintainBo;
 import org.dromara.property.domain.bo.PlantsProductBo;
@@ -108,7 +109,8 @@ public class PlantsRentalOrderServiceImpl implements IPlantsRentalOrderService {
     private LambdaQueryWrapper<PlantsRentalOrder> buildQueryWrapper(PlantsRentalOrderBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<PlantsRentalOrder> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(PlantsRentalOrder::getId);
+        lqw.orderByDesc(PlantsRentalOrder::getCreateTime)
+            .orderByDesc(PlantsRentalOrder::getUpdateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), PlantsRentalOrder::getOrderNo, bo.getOrderNo());
         lqw.like(StringUtils.isNotBlank(bo.getCustomerName()), PlantsRentalOrder::getCustomerName, bo.getCustomerName());
         lqw.eq(bo.getCustomerType() != null, PlantsRentalOrder::getCustomerType, bo.getCustomerType());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsRentalPlanServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.property.domain.PlantsPlanProduct;
+import org.dromara.property.domain.PlantsRentalOrder;
 import org.dromara.property.domain.bo.PlantsPlanProductBo;
 import org.dromara.property.domain.bo.PlantsRentalOrderBo;
 import org.dromara.property.domain.vo.PlantsPlanProductVo;
@@ -25,6 +26,7 @@ import org.dromara.property.domain.vo.PlantsRentalPlanVo;
 import org.dromara.property.domain.PlantsRentalPlan;
 import org.dromara.property.mapper.PlantsRentalPlanMapper;
 import org.dromara.property.service.IPlantsRentalPlanService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
@@ -88,7 +90,8 @@ public class PlantsRentalPlanServiceImpl implements IPlantsRentalPlanService {
     private LambdaQueryWrapper<PlantsRentalPlan> buildQueryWrapper(PlantsRentalPlanBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<PlantsRentalPlan> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(PlantsRentalPlan::getId);
+        lqw.orderByDesc(PlantsRentalPlan::getCreateTime)
+            .orderByDesc(PlantsRentalPlan::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getPlanName()), PlantsRentalPlan::getPlanName, bo.getPlanName());
         lqw.eq(bo.getRentalPeriod() != null, PlantsRentalPlan::getRentalPeriod, bo.getRentalPeriod());
         lqw.eq(StringUtils.isNotBlank(bo.getScene()), PlantsRentalPlan::getScene, bo.getScene());
@@ -166,6 +169,7 @@ public class PlantsRentalPlanServiceImpl implements IPlantsRentalPlanService {
      * @return 是否删除成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
             PlantsRentalOrderBo plantsRentalOrderBo = new PlantsRentalOrderBo();
@@ -174,6 +178,8 @@ public class PlantsRentalPlanServiceImpl implements IPlantsRentalPlanService {
             if(CollectionUtils.isNotEmpty(plantsRentalOrderVos)){
                 throw new ServiceException("当前选中租赁方案不可删除");
             }
+            //删除方案产品数据
+            planProductService.deleteByPlanIds(ids.stream().toList());
         }
         return baseMapper.deleteByIds(ids) > 0;
     }

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PopularActivitiesServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.PlantsRentalPlan;
 import org.dromara.property.domain.enums.ActivitiesStatusEnum;
 import org.dromara.property.domain.vo.CustomerNoticesVo;
 import org.dromara.system.api.RemoteUserService;
@@ -113,7 +114,8 @@ public class PopularActivitiesServiceImpl implements IPopularActivitiesService {
     private LambdaQueryWrapper<PopularActivities> buildQueryWrapper(PopularActivitiesBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<PopularActivities> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(PopularActivities::getId);
+        lqw.orderByDesc(PopularActivities::getCreateTime)
+            .orderByDesc(PopularActivities::getUpdateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), PopularActivities::getTitle, bo.getTitle());
         lqw.eq(bo.getStartTime() != null, PopularActivities::getStartTime, bo.getStartTime());
         lqw.eq(bo.getEndTime() != null, PopularActivities::getEndTime, bo.getEndTime());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/QuestionnaireServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.PopularActivities;
 import org.dromara.property.domain.QuestionnaireQuestion;
 import org.dromara.property.domain.QuestionnaireQuestionItem;
 import org.dromara.property.domain.bo.QuestionnaireQuestionBo;
@@ -106,7 +107,8 @@ public class QuestionnaireServiceImpl implements IQuestionnaireService {
     private LambdaQueryWrapper<Questionnaire> buildQueryWrapper(QuestionnaireBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<Questionnaire> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(Questionnaire::getId);
+        lqw.orderByDesc(Questionnaire::getCreateTime)
+            .orderByDesc(Questionnaire::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getHead()), Questionnaire::getHead, bo.getHead());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), Questionnaire::getStatus, bo.getStatus());
         return lqw;

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ResidentPersonServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.Questionnaire;
 import org.dromara.property.domain.vo.ResidentUnitVo;
 import org.dromara.property.service.IResidentUnitService;
 import org.dromara.sis.api.RemoteSisAuthService;
@@ -90,7 +91,8 @@ public class ResidentPersonServiceImpl implements IResidentPersonService {
     private LambdaQueryWrapper<ResidentPerson> buildQueryWrapper(ResidentPersonBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ResidentPerson> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(ResidentPerson::getId);
+        lqw.orderByDesc(ResidentPerson::getCreateTime)
+            .orderByDesc(ResidentPerson::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getUserName()), ResidentPerson::getUserName, bo.getUserName());
         lqw.eq(StringUtils.isNotBlank(bo.getPhone()), ResidentPerson::getPhone, bo.getPhone());
         lqw.eq(bo.getGender() != null, ResidentPerson::getGender, bo.getGender());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ResidentUnitServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.ResidentPerson;
 import org.dromara.property.service.IResidentPersonService;
 import org.dromara.property.service.ITbRoomService;
 import org.springframework.stereotype.Service;
@@ -100,7 +101,8 @@ public class ResidentUnitServiceImpl implements IResidentUnitService {
     private LambdaQueryWrapper<ResidentUnit> buildQueryWrapper(ResidentUnitBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ResidentUnit> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(ResidentUnit::getId);
+        lqw.orderByDesc(ResidentUnit::getCreateTime)
+            .orderByDesc(ResidentUnit::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getName()), ResidentUnit::getName, bo.getName());
         lqw.eq(bo.getUnitNumber() != null, ResidentUnit::getUnitNumber, bo.getUnitNumber());
         lqw.eq(bo.getType() != null, ResidentUnit::getType, bo.getType());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServerBookingServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.ResidentUnit;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.ServerBookingBo;
 import org.dromara.property.domain.vo.ServerBookingVo;
@@ -73,7 +74,8 @@ public class ServerBookingServiceImpl implements IServerBookingService {
     private LambdaQueryWrapper<ServerBooking> buildQueryWrapper(ServerBookingBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ServerBooking> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(ServerBooking::getId);
+        lqw.orderByDesc(ServerBooking::getCreateTime)
+            .orderByDesc(ServerBooking::getUpdateTime);
         lqw.eq(bo.getServerId() != null, ServerBooking::getServerId, bo.getServerId());
         lqw.eq(bo.getServerNum() != null, ServerBooking::getServerNum, bo.getServerNum());
         lqw.eq(StringUtils.isNotBlank(bo.getBookingType()), ServerBooking::getBookingType, bo.getBookingType());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServerServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.ServerBooking;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.ServerBo;
 import org.dromara.property.domain.vo.ServerVo;
@@ -73,7 +74,8 @@ public class ServerServiceImpl implements IServerService {
     private LambdaQueryWrapper<Server> buildQueryWrapper(ServerBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<Server> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(Server::getId);
+        lqw.orderByDesc(Server::getCreateTime)
+            .orderByDesc(Server::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getServerName()), Server::getServerName, bo.getServerName());
         lqw.eq(bo.getServerType() != null, Server::getServerType, bo.getServerType());
         lqw.eq(bo.getPrice() != null, Server::getPrice, bo.getPrice());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWarningServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.Server;
 import org.dromara.property.domain.ServiceWarning;
 import org.dromara.property.domain.bo.ServiceWarningBo;
 import org.dromara.property.domain.vo.ServiceWarningVo;
@@ -80,7 +81,8 @@ public class ServiceWarningServiceImpl implements IServiceWarningService {
     private LambdaQueryWrapper<ServiceWarning> buildQueryWrapper(ServiceWarningBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ServiceWarning> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(ServiceWarning::getId);
+        lqw.orderByDesc(ServiceWarning::getCreateTime)
+            .orderByDesc(ServiceWarning::getUpdateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getEventNo()), ServiceWarning::getEventNo, bo.getEventNo());
         lqw.eq(bo.getEventType() != null, ServiceWarning::getEventType, bo.getEventType());
         lqw.eq(bo.getAlarmLevel() != null, ServiceWarning::getAlarmLevel, bo.getAlarmLevel());

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

@@ -26,6 +26,8 @@ import org.dromara.property.domain.enums.OrderReportingTypeEnum;
 import org.dromara.property.domain.enums.OrderTypeOperationEnum;
 import org.dromara.property.domain.enums.WorkOrderStatusEnum;
 import org.dromara.property.domain.vo.*;
+import org.dromara.property.domain.vo.mobile.MServiceWorkOrdersRecordVo;
+import org.dromara.property.domain.vo.mobile.MServiceWorkOrdersVo;
 import org.dromara.property.mapper.ResidentPersonMapper;
 import org.dromara.property.mapper.ServiceWorkOrdersMapper;
 import org.dromara.property.mapper.ServiceWorkOrdersRecordMapper;
@@ -119,23 +121,20 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
     public TableDataInfo<ServiceWorkOrdersVo> queryPageList(ServiceWorkOrdersBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<ServiceWorkOrders> lqw = buildQueryWrapper(bo);
         Page<ServiceWorkOrdersVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        if (ObjectUtil.isEmpty(result.getRecords())) {
-            return TableDataInfo.build(result);
+        if (ObjectUtil.isNotEmpty(result.getRecords())) {
+            List<Long> typeList = result.getRecords().stream().map(vo -> vo.getType()).distinct().collect(Collectors.toList());
+            List<ServiceWorkOrdersTypeVo> serviceWorkOrdersTypeVoList = typesMapper.selectVoByIds(typeList);
+            if (ObjectUtil.isNotEmpty(serviceWorkOrdersTypeVoList)) {
+                List<ServiceWorkOrdersVo> serviceWorkOrdersVoList = new ArrayList<>();
+                result.getRecords().stream().forEach(s -> {
+                    ServiceWorkOrdersTypeVo serviceWorkOrdersTypeVo = serviceWorkOrdersTypeVoList.stream().filter(vo -> vo.getId() != null && vo.getId().equals(s.getType())).findFirst().orElse(null);
+                    s.setTypeName(ObjectUtil.isNotNull(serviceWorkOrdersTypeVo) ? serviceWorkOrdersTypeVo.getOrderTypeName() : null);
+                    s.setOperationMode(ObjectUtil.isNotNull(serviceWorkOrdersTypeVo) ? serviceWorkOrdersTypeVo.getOperationMode() : null);
+                    serviceWorkOrdersVoList.add(s);
+                });
+            }
         }
-        List<Long> typeList = result.getRecords().stream().map(vo -> vo.getType()).distinct().collect(Collectors.toList());
-        List<ServiceWorkOrdersTypeVo> serviceWorkOrdersTypeVoList = typesMapper.selectVoByIds(typeList);
-        if (ObjectUtil.isEmpty(serviceWorkOrdersTypeVoList)) {
-            return TableDataInfo.build(result);
-        }
-        List<ServiceWorkOrdersVo> serviceWorkOrdersVoList = new ArrayList<>();
-        result.getRecords().stream().forEach(s -> {
-            ServiceWorkOrdersTypeVo serviceWorkOrdersTypeVo = serviceWorkOrdersTypeVoList.stream().filter(vo -> vo.getId() != null && vo.getId().equals(s.getType())).findFirst().orElse(null);
-
-            s.setTypeName(ObjectUtil.isNotNull(serviceWorkOrdersTypeVo) ? serviceWorkOrdersTypeVo.getOrderTypeName() : null);
-            s.setOperationMode(ObjectUtil.isNotNull(serviceWorkOrdersTypeVo) ? serviceWorkOrdersTypeVo.getOperationMode() : null);
-            serviceWorkOrdersVoList.add(s);
-        });
-        return TableDataInfo.build(new Page<ServiceWorkOrdersVo>().setRecords(serviceWorkOrdersVoList).setTotal(result.getTotal()));
+        return TableDataInfo.build(result);
     }
 
     /**
@@ -182,7 +181,8 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
         }
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ServiceWorkOrders> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(ServiceWorkOrders::getId);
+        lqw.orderByDesc(ServiceWorkOrders::getCreateTime)
+            .orderByDesc(ServiceWorkOrders::getUpdateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), ServiceWorkOrders::getOrderNo, bo.getOrderNo());
         lqw.in(CollUtil.isNotEmpty(statusList), ServiceWorkOrders::getStatus, statusList);
         lqw.like(StringUtils.isNotBlank(bo.getOrderName()), ServiceWorkOrders::getOrderName, bo.getOrderName());
@@ -227,7 +227,7 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
             boolean flags = workOrdersRecordMapper.insert(serviceWorkOrdersRecord) > 0;
             if (flags) {
                 if (serviceWorkOrdersType.getOperationMode().equals(OrderTypeOperationEnum.AUTOMATE_DISPATCH.getValue())) {
-                    handleServiceWorkOrder(add);
+                    handleServiceWorkOrder(add,serviceWorkOrdersType);
                 }
             }
         }
@@ -235,25 +235,27 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
     }
 
     //自动派单
-    private void handleServiceWorkOrder(ServiceWorkOrders serviceWorkOrders) {
+    private void handleServiceWorkOrder(ServiceWorkOrders serviceWorkOrders,ServiceWorkOrdersType serviceWorkOrdersType) {
         LocalDate today = LocalDate.now();
         // 1. 获取今日排班人员（优先查缓存，未命中则查询数据库并缓存）
         List<AttendanceUserGroup> attendanceUserGroups = RedisUtils.getCacheList(DateUtil.today());
-        if (CollUtil.isEmpty(attendanceUserGroups)) {
-            attendanceUserGroups = attendanceUserGroupMapper.selectList(
-                new LambdaQueryWrapper<AttendanceUserGroup>()
-                    .le(AttendanceUserGroup::getStartDate, today)
-                    .ge(AttendanceUserGroup::getEndDate, today)
-                    .orderByAsc(AttendanceUserGroup::getCreateTime)
-            );
-            Assert.isTrue(CollUtil.isNotEmpty(attendanceUserGroups),"暂无排班人员");
+        List<AttendanceUserGroup> attendanceUserGroupList = attendanceUserGroupMapper.selectList(
+            new LambdaQueryWrapper<AttendanceUserGroup>()
+                .le(AttendanceUserGroup::getStartDate, today)
+                .ge(AttendanceUserGroup::getEndDate, today)
+                .eq(AttendanceUserGroup::getDeptId, serviceWorkOrdersType.getDeptId())
+                .orderByAsc(AttendanceUserGroup::getStartDate)
+        );
+        if (CollUtil.isEmpty(attendanceUserGroups)|| attendanceUserGroups.size() != attendanceUserGroupList.size()) {
+            attendanceUserGroups=attendanceUserGroupList;
+            Assert.isTrue(CollUtil.isNotEmpty(attendanceUserGroups), "暂无排班人员");
             // 缓存当天排班数据（假设当天不会变）
-                RedisUtils.setCacheList(DateUtil.today(), attendanceUserGroups);
+            RedisUtils.setCacheList(DateUtil.today(), attendanceUserGroups);
         }
 
         // 2. 获取并更新轮询索引（原子性很重要）
         int currentIndex;
-        Integer lastScheduleId = RedisUtils.getCacheObject(DateUtil.today()+"LastScheduleId");
+        Integer lastScheduleId = RedisUtils.getCacheObject(DateUtil.today() + "LastScheduleId");
         if (lastScheduleId == null || lastScheduleId < 0 || lastScheduleId >= attendanceUserGroups.size()) {
             currentIndex = 0; // 越界或未设置，重置为0
         } else {
@@ -262,7 +264,7 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
                 currentIndex = 0; // 循环轮询
             }
         }
-        RedisUtils.setCacheObject(DateUtil.today()+"LastScheduleId", currentIndex);
+        RedisUtils.setCacheObject(DateUtil.today() + "LastScheduleId", currentIndex);
 
         // 3. 分配处理人
         AttendanceUserGroup assignedGroup = attendanceUserGroups.get(currentIndex);
@@ -589,7 +591,7 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
             boolean flags = workOrdersRecordMapper.insert(serviceWorkOrdersRecord) > 0;
             if (flags) {
                 if (serviceWorkOrdersType.getOperationMode().equals(OrderTypeOperationEnum.AUTOMATE_DISPATCH.getValue())) {
-                    handleServiceWorkOrder(add);
+                    handleServiceWorkOrder(add,serviceWorkOrdersType);
                 }
             }
         }
@@ -631,30 +633,66 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
      * @return 【工单处理】分页列表
      */
     @Override
-    public TableDataInfo<ServiceWorkOrdersVo> queryMobilePageList(ServiceWorkOrdersBo bo, PageQuery pageQuery) {
-
-        //当前登录用户
+    public TableDataInfo<MServiceWorkOrdersVo> queryMobilePageList(ServiceWorkOrdersBo bo, PageQuery pageQuery) {
+        // 当前登录用户
         LoginUser loginUser = LoginHelper.getLoginUser();
         if (!LoginHelper.isSuperAdmin(loginUser.getUserId())) {
             bo.setHandler(loginUser.getUserId());
         }
         LambdaQueryWrapper<ServiceWorkOrders> lqw = buildQueryWrapper(bo);
         Page<ServiceWorkOrdersVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        if (ObjectUtil.isEmpty(result.getRecords())) {
-            return TableDataInfo.build(result);
-        }
-        List<Long> typeList = result.getRecords().stream().map(vo -> vo.getType()).distinct().collect(Collectors.toList());
-        List<ServiceWorkOrdersTypeVo> serviceWorkOrdersTypeVoList = typesMapper.selectVoByIds(typeList);
-        if (ObjectUtil.isEmpty(serviceWorkOrdersTypeVoList)) {
-            return TableDataInfo.build(result);
-        }
-        List<ServiceWorkOrdersVo> serviceWorkOrdersVoList = new ArrayList<>();
-        result.getRecords().stream().forEach(s -> {
-            ServiceWorkOrdersTypeVo serviceWorkOrdersTypeVo = serviceWorkOrdersTypeVoList.stream().filter(vo -> vo.getId() != null && vo.getId().equals(s.getType())).findFirst().orElse(null);
 
-            s.setTypeName(ObjectUtil.isNotNull(serviceWorkOrdersTypeVo) ? serviceWorkOrdersTypeVo.getOrderTypeName() : null);
-            serviceWorkOrdersVoList.add(s);
-        });
-        return TableDataInfo.build(new Page<ServiceWorkOrdersVo>().setRecords(serviceWorkOrdersVoList).setTotal(result.getTotal()));
+        // 转换 VO 类型
+        List<MServiceWorkOrdersVo> mServiceWorkOrdersVos = new ArrayList<>();
+        if (CollUtil.isNotEmpty(result.getRecords())) {
+            List<Long> typeList = result.getRecords().stream()
+                .map(ServiceWorkOrdersVo::getType)
+                .distinct()
+                .collect(Collectors.toList());
+
+            List<ServiceWorkOrdersTypeVo> typeVoList = typesMapper.selectVoByIds(typeList);
+            Map<Long, String> typeMap = typeVoList.stream()
+                .collect(Collectors.toMap(ServiceWorkOrdersTypeVo::getId, ServiceWorkOrdersTypeVo::getOrderTypeName, (a, b) -> a));
+            //收集处理人转化成list
+            List<Long> handlerIdList = result.getRecords().stream().map(ServiceWorkOrdersVo::getHandler)
+                .distinct()
+                .collect(Collectors.toList());
+            List<RemoteUserVo> remoteUserVos = remoteUserService.selectListByIds(handlerIdList);
+            // 转换并设置 typeName
+            mServiceWorkOrdersVos = result.getRecords().stream().map(vo -> {
+                MServiceWorkOrdersVo mVo = BeanUtil.copyProperties(vo, MServiceWorkOrdersVo.class);
+                dataProcessing(mVo, typeMap, remoteUserVos);
+                return mVo;
+            }).collect(Collectors.toList());
+        }
+        // 构建分页结果
+        Page<MServiceWorkOrdersVo> pageResult = new Page<>();
+        pageResult.setRecords(mServiceWorkOrdersVos);
+        pageResult.setTotal(result.getTotal());
+        pageResult.setCurrent(result.getCurrent());
+        pageResult.setSize(result.getSize());
+        return TableDataInfo.build(pageResult);
+    }
+
+    /**
+     * 处理数据
+     *
+     * @param mServiceWorkOrdersVo
+     */
+    private void dataProcessing(MServiceWorkOrdersVo mServiceWorkOrdersVo, Map<Long, String> typeMap, List<RemoteUserVo> remoteUserVos) {
+        mServiceWorkOrdersVo.setTypeName(typeMap.getOrDefault(mServiceWorkOrdersVo.getType(), null));
+        //通过处理人id查询处理人信息
+        RemoteUserVo remoteUserVo = remoteUserVos.stream().filter(user -> user.getUserId().equals(mServiceWorkOrdersVo.getHandler())).findFirst().orElse(null);
+        mServiceWorkOrdersVo.setHandlerPhone(remoteUserVo != null ? remoteUserVo.getPhonenumber() : null);
+        mServiceWorkOrdersVo.setHandlerText(remoteUserVo != null ? remoteUserVo.getNickName() : null);
+        //查询工单处理记录
+        List<ServiceWorkOrdersRecordVo> serviceWorkOrdersRecordVoList = workOrdersRecordMapper.selectVoList(new LambdaQueryWrapper<ServiceWorkOrdersRecord>().eq(ServiceWorkOrdersRecord::getOrderId, mServiceWorkOrdersVo.getId()));
+        if (CollUtil.isNotEmpty(serviceWorkOrdersRecordVoList)) {
+            List<MServiceWorkOrdersRecordVo> mServiceWorkOrdersRecordVos = BeanUtil.copyToList(serviceWorkOrdersRecordVoList, MServiceWorkOrdersRecordVo.class);
+            mServiceWorkOrdersRecordVos.stream().forEach(workOrdersRecordVo -> {
+                workOrdersRecordVo.setHandlerName(Objects.nonNull(remoteUserVo) ? remoteUserVo.getNickName() : null);
+            });
+            mServiceWorkOrdersVo.setRecordVoList(mServiceWorkOrdersRecordVos);
+        }
     }
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersTypeServiceImpl.java

@@ -3,6 +3,7 @@ package org.dromara.property.service.impl;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -18,6 +19,8 @@ import org.dromara.property.domain.bo.ServiceWorkOrdersTypeBo;
 import org.dromara.property.domain.vo.ServiceWorkOrdersTypeVo;
 import org.dromara.property.mapper.ServiceWorkOrdersTypeMapper;
 import org.dromara.property.service.IServiceWorkOrdersTypeService;
+import org.dromara.system.api.RemoteDeptService;
+import org.dromara.system.api.domain.vo.RemoteDeptVo;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -39,6 +42,8 @@ public class ServiceWorkOrdersTypeServiceImpl implements IServiceWorkOrdersTypeS
 
     private final ServiceWorkOrdersTypeMapper baseMapper;
 
+    @DubboReference
+    private RemoteDeptService remoteDeptService;
     /**
      * 查询【工单类型】
      *
@@ -47,7 +52,11 @@ public class ServiceWorkOrdersTypeServiceImpl implements IServiceWorkOrdersTypeS
      */
     @Override
     public ServiceWorkOrdersTypeVo queryById(Long id) {
-        return baseMapper.selectVoById(id);
+        ServiceWorkOrdersTypeVo serviceWorkOrdersTypeVo=  baseMapper.selectVoById(id);
+        Long deptId = serviceWorkOrdersTypeVo.getDeptId();
+        RemoteDeptVo remoteDeptVo = remoteDeptService.selectDeptVoById(deptId);
+        serviceWorkOrdersTypeVo.setDeptName(remoteDeptVo.getDeptName());
+        return serviceWorkOrdersTypeVo;
     }
 
     /**
@@ -61,6 +70,11 @@ public class ServiceWorkOrdersTypeServiceImpl implements IServiceWorkOrdersTypeS
     public TableDataInfo<ServiceWorkOrdersTypeVo> queryPageList(ServiceWorkOrdersTypeBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<ServiceWorkOrdersType> lqw = buildQueryWrapper(bo);
         Page<ServiceWorkOrdersTypeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        result.getRecords().stream().forEach(vo -> {
+            Long deptId = vo.getDeptId();
+            RemoteDeptVo remoteDeptVo = remoteDeptService.selectDeptVoById(deptId);
+            vo.setDeptName(remoteDeptVo.getDeptName());
+        });
         return TableDataInfo.build(result);
     }
 
@@ -73,7 +87,13 @@ public class ServiceWorkOrdersTypeServiceImpl implements IServiceWorkOrdersTypeS
     @Override
     public List<ServiceWorkOrdersTypeVo> queryList(ServiceWorkOrdersTypeBo bo) {
         LambdaQueryWrapper<ServiceWorkOrdersType> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        List<ServiceWorkOrdersTypeVo>  serviceWorkOrdersTypeVoList= baseMapper.selectVoList(lqw);
+        serviceWorkOrdersTypeVoList.stream().forEach(vo -> {
+            Long deptId = vo.getDeptId();
+            RemoteDeptVo remoteDeptVo = remoteDeptService.selectDeptVoById(deptId);
+            vo.setDeptName(remoteDeptVo.getDeptName());
+        });
+        return serviceWorkOrdersTypeVoList;
     }
 
     private LambdaQueryWrapper<ServiceWorkOrdersType> buildQueryWrapper(ServiceWorkOrdersTypeBo bo) {

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/SuppliersServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.ServiceWorkOrders;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.SuppliersBo;
 import org.dromara.property.domain.vo.SuppliersVo;
@@ -73,7 +74,8 @@ public class SuppliersServiceImpl implements ISuppliersService {
     private LambdaQueryWrapper<Suppliers> buildQueryWrapper(SuppliersBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<Suppliers> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(Suppliers::getId);
+        lqw.orderByDesc(Suppliers::getCreateTime)
+            .orderByDesc(Suppliers::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getSuppliersName()), Suppliers::getSuppliersName, bo.getSuppliersName());
         lqw.eq(StringUtils.isNotBlank(bo.getPhone()), Suppliers::getPhone, bo.getPhone());
         lqw.eq(StringUtils.isNotBlank(bo.getLocation()), Suppliers::getLocation, bo.getLocation());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbAreaGroupServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.Suppliers;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.TbAreaGroupBo;
 import org.dromara.property.domain.vo.TbAreaGroupVo;
@@ -73,7 +74,8 @@ public class TbAreaGroupServiceImpl implements ITbAreaGroupService {
     private LambdaQueryWrapper<TbAreaGroup> buildQueryWrapper(TbAreaGroupBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<TbAreaGroup> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(TbAreaGroup::getId);
+        lqw.orderByDesc(TbAreaGroup::getCreateTime)
+            .orderByDesc(TbAreaGroup::getUpdateTime);
         lqw.eq(bo.getAreaGroupId() != null, TbAreaGroup::getAreaGroupId, bo.getAreaGroupId());
         lqw.like(StringUtils.isNotBlank(bo.getAreaGroupName()), TbAreaGroup::getAreaGroupName, bo.getAreaGroupName());
         return lqw;

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbBuildingServiceImpl.java

@@ -10,6 +10,7 @@ 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.TbAreaGroup;
 import org.dromara.property.domain.TbBuilding;
 import org.dromara.property.domain.bo.TbBuildingBo;
 import org.dromara.property.domain.vo.TbBuildingVo;
@@ -77,7 +78,8 @@ public class TbBuildingServiceImpl implements ITbBuildingService {
     private LambdaQueryWrapper<TbBuilding> buildQueryWrapper(TbBuildingBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<TbBuilding> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(TbBuilding::getId);
+        lqw.orderByDesc(TbBuilding::getCreateTime)
+            .orderByDesc(TbBuilding::getUpdateTime);
         lqw.eq(bo.getCommunityId() != null, TbBuilding::getCommunityId, bo.getCommunityId());
         lqw.like(StringUtils.isNotBlank(bo.getBuildingName()), TbBuilding::getBuildingName, bo.getBuildingName());
         lqw.eq(bo.getFloorCount() != null, TbBuilding::getFloorCount, bo.getFloorCount());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCeremonialServeServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.TbCeremonialserveRoombooking;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.TbCeremonialServeBo;
 import org.dromara.property.domain.vo.TbCeremonialServeVo;
@@ -73,7 +74,8 @@ public class TbCeremonialServeServiceImpl implements ITbCeremonialServeService {
     private LambdaQueryWrapper<TbCeremonialServe> buildQueryWrapper(TbCeremonialServeBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<TbCeremonialServe> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(TbCeremonialServe::getId);
+        lqw.orderByDesc(TbCeremonialServe::getCreateTime)
+            .orderByDesc(TbCeremonialServe::getUpdateTime);
         lqw.eq(bo.getClassificationId() != null, TbCeremonialServe::getClassificationId, bo.getClassificationId());
         lqw.eq(bo.getRoomBookId() != null, TbCeremonialServe::getRoomBookId, bo.getRoomBookId());
         lqw.eq(bo.getServeNum() != null, TbCeremonialServe::getServeNum, bo.getServeNum());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCeremonialserveRoombookingServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.TbBuilding;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.TbCeremonialserveRoombookingBo;
 import org.dromara.property.domain.vo.TbCeremonialserveRoombookingVo;
@@ -73,7 +74,8 @@ public class TbCeremonialserveRoombookingServiceImpl implements ITbCeremonialser
     private LambdaQueryWrapper<TbCeremonialserveRoombooking> buildQueryWrapper(TbCeremonialserveRoombookingBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<TbCeremonialserveRoombooking> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(TbCeremonialserveRoombooking::getId);
+        lqw.orderByDesc(TbCeremonialserveRoombooking::getCreateTime)
+            .orderByDesc(TbCeremonialserveRoombooking::getUpdateTime);
         lqw.eq(bo.getCeremonialServeId() != null, TbCeremonialserveRoombooking::getCeremonialServeId, bo.getCeremonialServeId());
         lqw.eq(bo.getRoomBookingId() != null, TbCeremonialserveRoombooking::getRoomBookingId, bo.getRoomBookingId());
         lqw.eq(bo.getTotalPrice() != null, TbCeremonialserveRoombooking::getTotalPrice, bo.getTotalPrice());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCommunityServiceImpl.java

@@ -12,6 +12,7 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.TreeUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.property.domain.TbCeremonialServe;
 import org.dromara.property.domain.TbCommunity;
 import org.dromara.property.domain.bo.TbCommunityBo;
 import org.dromara.property.domain.vo.*;
@@ -170,7 +171,8 @@ public class TbCommunityServiceImpl implements ITbCommunityService {
     private LambdaQueryWrapper<TbCommunity> buildQueryWrapper(TbCommunityBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<TbCommunity> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(TbCommunity::getId);
+        lqw.orderByDesc(TbCommunity::getCreateTime)
+            .orderByDesc(TbCommunity::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getCommunityName()), TbCommunity::getCommunityName, bo.getCommunityName());
         lqw.eq(bo.getCommunityType() != null, TbCommunity::getCommunityType, bo.getCommunityType());
         lqw.eq(StringUtils.isNotBlank(bo.getProvince()), TbCommunity::getProvince, bo.getProvince());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbConferenceServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.TbCommunity;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.TbConferenceBo;
 import org.dromara.property.domain.vo.TbConferenceVo;
@@ -73,7 +74,8 @@ public class TbConferenceServiceImpl implements ITbConferenceService {
     private LambdaQueryWrapper<TbConference> buildQueryWrapper(TbConferenceBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<TbConference> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(TbConference::getId);
+        lqw.orderByDesc(TbConference::getCreateTime)
+            .orderByDesc(TbConference::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getRoomName()), TbConference::getRoomName, bo.getRoomName());
         lqw.eq(bo.getRoomNo() != null, TbConference::getRoomNo, bo.getRoomNo());
         lqw.eq(StringUtils.isNotBlank(bo.getRoomLocation()), TbConference::getRoomLocation, bo.getRoomLocation());

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbE8ConfigServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.TbConference;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.TbE8ConfigBo;
 import org.dromara.property.domain.vo.TbE8ConfigVo;
@@ -73,7 +74,8 @@ public class TbE8ConfigServiceImpl implements ITbE8ConfigService {
     private LambdaQueryWrapper<TbE8Config> buildQueryWrapper(TbE8ConfigBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<TbE8Config> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(TbE8Config::getId);
+        lqw.orderByDesc(TbE8Config::getCreateTime)
+            .orderByDesc(TbE8Config::getUpdateTime);
         lqw.like(StringUtils.isNotBlank(bo.getE8Name()), TbE8Config::getE8Name, bo.getE8Name());
         lqw.eq(StringUtils.isNotBlank(bo.getE8ServerUrl()), TbE8Config::getE8ServerUrl, bo.getE8ServerUrl());
         lqw.eq(StringUtils.isNotBlank(bo.getE8Secret()), TbE8Config::getE8Secret, bo.getE8Secret());