From 4a20ec11dbb2a2fb4d410bd0c3adb92c11691437 Mon Sep 17 00:00:00 2001
From: dy <2389062315@qq.com>
Date: Thu, 3 Jul 2025 12:04:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E6=B4=81=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/dromara/property/domain/CleanOrder.java | 2 +-
 .../java/org/dromara/property/domain/bo/CleanOrderBo.java     | 2 +-
 .../java/org/dromara/property/domain/vo/CleanOrderVo.java     | 4 +++-
 .../dromara/property/service/impl/CleanOrderServiceImpl.java  | 2 +-
 .../src/main/resources/mapper/Property/CleanOrderMapper.xml   | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java
index 8f54eea..c8a5b19 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CleanOrder.java
@@ -35,7 +35,7 @@ public class CleanOrder extends TenantEntity {
     /**
      * 位置
      */
-    private String location;
+    private Long location;
 
     /**
      * 面积
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java
index c6bc09e..62ff1f1 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java
@@ -38,7 +38,7 @@ public class CleanOrderBo extends BaseEntity {
      * 位置
      */
 //    @NotBlank(message = "位置不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String location;
+    private Long location;
 
     /**
      * 面积
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java
index 1f87f84..a70ce94 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java
@@ -43,7 +43,7 @@ public class CleanOrderVo implements Serializable {
      * 位置
      */
     @ExcelProperty(value = "位置")
-    private String location;
+    private Long location;
 
     /**
      * 面积
@@ -126,5 +126,7 @@ public class CleanOrderVo implements Serializable {
 
     private List<Clean> cleanList;
 
+    private String unitName;
+
 
 }
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java
index 9f3f517..9e97f3e 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java
@@ -110,7 +110,7 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<CleanOrder> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(CleanOrder::getId);
-        lqw.eq(StringUtils.isNotBlank(bo.getLocation()), CleanOrder::getLocation, bo.getLocation());
+//        lqw.eq(StringUtils.isNotBlank(bo.getLocation()), CleanOrder::getLocation, bo.getLocation());
 //        lqw.eq(StringUtils.isNotBlank(bo.getArea()), CleanOrder::getArea, bo.getArea());
 
 //        lqw.eq(bo.getCleanIds() != null, CleanOrder::getCleanId, bo.getCleanIds());
diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/CleanOrderMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/CleanOrderMapper.xml
index 8c976d4..5778bde 100644
--- a/ruoyi-modules/Property/src/main/resources/mapper/Property/CleanOrderMapper.xml
+++ b/ruoyi-modules/Property/src/main/resources/mapper/Property/CleanOrderMapper.xml
@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             co.*,
             c.*,
-            ru.name name,ru.id unitId
+            ru.name unitName,ru.id unitId
         FROM
             clean_order co
                 LEFT JOIN clean c ON co.clean_id = c.id