修改不能按条件查询的bug

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;
 
     /**
      * 联系电话
@@ -113,7 +113,7 @@ public class CleanOrder extends TenantEntity {
     /**
      * 是否退订（0：否，1：是）
      */
-    private int isUnbooking;
+    private Integer isUnbooking;
 
     /**
      * 更新人id

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

@@ -86,7 +86,7 @@ public class CleanBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**

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

@@ -114,12 +114,12 @@ public class CleanOrderBo extends BaseEntity {
     /**
      * 是否退订（0：否，1：是）
      */
-    private int isUnbooking;
+    private Integer isUnbooking;
 
     /**
      * 状态
      */
-    private int state;
+    private Integer state;
 
     @NotEmpty(message = "订单详情不能为空", groups = {AddGroup.class})
     private List<Clean> cleanList;

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

@@ -116,7 +116,7 @@ public class CleanOrderVo implements Serializable {
     /**
      * 是否退订（0：否，1：是）
      */
-    private int isUnbooking;
+    private Integer isUnbooking;
 
     /**
      * 联系电话

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

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

@@ -141,11 +141,12 @@ public class MeetServiceImpl implements IMeetService {
         LambdaQueryWrapper<Meet> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(Meet::getId);
         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());
-        lqw.eq(bo.getBaseService() != null, Meet::getBaseService, bo.getBaseService());
-        lqw.eq(bo.getBasePrice() != null, Meet::getBasePrice, bo.getBasePrice());
-        lqw.eq(bo.getAttach() != null, Meet::getAttach, bo.getAttach());
+//        lqw.eq(StringUtils.isNotBlank(bo.getLocation()), Meet::getLocation, bo.getLocation());
+//        lqw.eq(bo.getPersonNumber() != null, Meet::getPersonNumber, bo.getPersonNumber());
+//        lqw.eq(bo.getBaseService() != null, Meet::getBaseService, bo.getBaseService());
+//        lqw.eq(bo.getBasePrice() != null, Meet::getBasePrice, bo.getBasePrice());
+        lqw.eq(bo.getPrincipals() != null, Meet::getPrincipals, bo.getPrincipals());
+        lqw.eq(bo.getStatus() != null, Meet::getStatus, bo.getStatus());
         return lqw;
     }
 

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">-->