From 1beae8d9af071142774690f8eddadab81c425f22 Mon Sep 17 00:00:00 2001
From: dy <2389062315@qq.com>
Date: Fri, 11 Jul 2025 11:15:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E8=83=BD=E6=8C=89?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/property/domain/CleanOrder.java   |  2 +-
 .../property/domain/bo/CleanOrderBo.java      |  2 +-
 .../service/impl/CleanOrderServiceImpl.java   |  7 ++++--
 .../mapper/Property/CleanOrderMapper.xml      | 25 +++++++++++++------
 4 files changed, 25 insertions(+), 11 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 dafd652..88a2afa 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
@@ -98,7 +98,7 @@ public class CleanOrder extends TenantEntity {
     /**
      * 状态
      */
-    private int state;
+    private Integer state;
 
     /**
      * 联系电话
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 c6a1e3c..a7f43f2 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
@@ -119,7 +119,7 @@ public class CleanOrderBo extends BaseEntity {
     /**
      * 状态
      */
-    private int state;
+    private Integer state;
 
     @NotEmpty(message = "订单详情不能为空", groups = {AddGroup.class})
     private List<Clean> cleanList;
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 4c530be..37cad52 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
@@ -102,7 +102,8 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
     public TableDataInfo<CleanOrderVo> queryPageList(CleanOrderBo bo, PageQuery pageQuery) {
         // 构造条件查询器，返回的是一个集合
         LambdaQueryWrapper<CleanOrder> lqw = buildQueryWrapper(bo);
-        Page<CleanOrderVo> result = baseMapper.selectForPage(pageQuery.build(), lqw);
+        Page<CleanOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw,CleanOrderVo.class);
+//        Page<CleanOrderVo> result = baseMapper.selectForPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -133,10 +134,12 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
         lqw.eq(bo.getStarTime() != null, CleanOrder::getStarTime, bo.getStarTime());
         lqw.eq(bo.getEndTime() != null, CleanOrder::getEndTime, bo.getEndTime());
         lqw.eq(bo.getUnitId() != null, CleanOrder::getUnitId, bo.getUnitId());
-//        lqw.eq(StringUtils.isNotBlank(bo.getUnit()), CleanOrder::getState, bo.getState());
+        lqw.eq(bo.getState() != null, CleanOrder::getState, bo.getState());
 //        lqw.eq(StringUtils.isNotBlank(bo.getUnit()), CleanOrder::getUnit, bo.getUnit());
         lqw.eq(StringUtils.isNotBlank(bo.getPersion()), CleanOrder::getPersion, bo.getPersion());
         lqw.eq(StringUtils.isNotBlank(bo.getPhone()), CleanOrder::getPhone, bo.getPhone());
+        //将lqw中的所有条件都封装到一个params对象中集合中
+
 
         return lqw;
     }
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 248b7fa..e4951ff 100644
--- a/ruoyi-modules/Property/src/main/resources/mapper/Property/CleanOrderMapper.xml
+++ b/ruoyi-modules/Property/src/main/resources/mapper/Property/CleanOrderMapper.xml
@@ -6,14 +6,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectForPage" resultType="org.dromara.property.domain.vo.CleanOrderVo">
         SELECT
-            co.*,
-            c.*,
-            cr.areas,
-            cr.sum_price
+        co.*,
+        c.*,
+        cr.areas,
+        cr.sum_price
         FROM
-            clean_order co
-                LEFT JOIN clean c ON co.clean_id = c.id
-                LEFT JOIN clean_relation cr ON c.id = cr.clean_id;
+        clean_order co
+        LEFT JOIN clean c ON co.clean_id = c.id
+        LEFT JOIN clean_relation cr ON c.id = cr.clean_id
+<!--        <where>-->
+<!--            <if test="payState != null and payState!= ''">-->
+<!--                co.pay_state = #{payState}-->
+<!--            </if>-->
+<!--            <if test="persion != null and persion!= ''">-->
+<!--                co.persion = #{persion}-->
+<!--            </if>-->
+<!--            <if test="state != null and state!= ''">-->
+<!--                co.state = #{state}-->
+<!--            </if>-->
+<!--        </where>-->
     </select>
 <!--    <select id="selectforDetail" resultType="org.dromara.property.domain.vo.CleanOrderVo"-->
 <!--            parameterType="java.lang.Long">-->