Skip to content

Y
yichengstreet-be
Commit 2a2916c9 authored by lixuan's avatar lixuan
Browse files
Options

feat: 新需求

parent f2d32c55
Pipeline #146872 failed with stages
      in 0 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 62 additions and 0 deletions
      ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/HouseResourcePageQuery.java
      View file @ 2a2916c9
      ......@@ -4,8 +4,10 @@ import com.ruoyi.common.core.page.PageDomain;
      import io.swagger.models.auth.In;
      import lombok.Data;
      import lombok.EqualsAndHashCode;
      import org.springframework.format.annotation.DateTimeFormat;
      import java.math.BigDecimal;
      import java.util.Date;
      import java.util.List;
      @EqualsAndHashCode(callSuper = true)
      ......@@ -104,6 +106,18 @@ public class HouseResourcePageQuery extends PageDomain {
      private String nature;
      @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
      private Date createTimeStart;
      @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
      private Date createTimeEnd;
      @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
      private Date updateTimeStart;
      @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
      private Date updateTimeEnd;
      private List<AiQuery> aiQueries;
      @Data
      ......
      ruoyi-system/src/main/resources/mapper/house/HouseResourceMapper.xml
      View file @ 2a2916c9
      ......@@ -243,6 +243,18 @@
      #{item}
      </foreach>
      </if>
      <if test="query.createTimeStart != null">
      AND t1.create_time <![CDATA[ >= ]]> #{query.createTimeStart}
      </if>
      <if test="query.createTimeEnd != null">
      AND t1.create_time <![CDATA[ <= ]]> #{query.createTimeEnd}
      </if>
      <if test="query.updateTimeStart != null">
      AND t1.update_time <![CDATA[ >= ]]> #{query.updateTimeStart}
      </if>
      <if test="query.updateTimeEnd != null">
      AND t1.update_time <![CDATA[ <= ]]> #{query.updateTimeEnd}
      </if>
      <if test="query.aiQueries != null and query.aiQueries.size() > 0">
      and (
      <foreach collection="query.aiQueries" item="ai" separator=" or ">
      ......@@ -411,6 +423,18 @@
      #{item}
      </foreach>
      </if>
      <if test="query.createTimeStart != null">
      AND t1.create_time <![CDATA[ >= ]]> #{query.createTimeStart}
      </if>
      <if test="query.createTimeEnd != null">
      AND t1.create_time <![CDATA[ <= ]]> #{query.createTimeEnd}
      </if>
      <if test="query.updateTimeStart != null">
      AND t1.update_time <![CDATA[ >= ]]> #{query.updateTimeStart}
      </if>
      <if test="query.updateTimeEnd != null">
      AND t1.update_time <![CDATA[ <= ]]> #{query.updateTimeEnd}
      </if>
      <if test="query.aiQueries != null and query.aiQueries.size() > 0">
      and (
      <foreach collection="query.aiQueries" item="ai" separator=" or ">
      ......@@ -576,6 +600,18 @@
      #{item}
      </foreach>
      </if>
      <if test="query.createTimeStart != null">
      AND t1.create_time <![CDATA[ >= ]]> #{query.createTimeStart}
      </if>
      <if test="query.createTimeEnd != null">
      AND t1.create_time <![CDATA[ <= ]]> #{query.createTimeEnd}
      </if>
      <if test="query.updateTimeStart != null">
      AND t1.update_time <![CDATA[ >= ]]> #{query.updateTimeStart}
      </if>
      <if test="query.updateTimeEnd != null">
      AND t1.update_time <![CDATA[ <= ]]> #{query.updateTimeEnd}
      </if>
      <if test="query.aiQueries != null and query.aiQueries.size() > 0">
      and (
      <foreach collection="query.aiQueries" item="ai" separator=" or ">
      ......@@ -764,6 +800,18 @@
      #{item}
      </foreach>
      </if>
      <if test="query.createTimeStart != null">
      AND t1.create_time <![CDATA[ >= ]]> #{query.createTimeStart}
      </if>
      <if test="query.createTimeEnd != null">
      AND t1.create_time <![CDATA[ <= ]]> #{query.createTimeEnd}
      </if>
      <if test="query.updateTimeStart != null">
      AND t1.update_time <![CDATA[ >= ]]> #{query.updateTimeStart}
      </if>
      <if test="query.updateTimeEnd != null">
      AND t1.update_time <![CDATA[ <= ]]> #{query.updateTimeEnd}
      </if>
      </where>
      GROUP BY t1.id, t4.id
      <trim prefix="having" prefixOverrides="and">
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment