新增参数 修改排序

auc/src/main/java/cn/hobbystocks/auc/web/AuctionController.java

@@ -1,29 +1,23 @@
 package cn.hobbystocks.auc.web;
 
-import java.util.List;
-import java.util.Objects;
-
 import cn.hobbystocks.auc.common.constant.Constants;
 import cn.hobbystocks.auc.common.core.domain.AjaxResult;
 import cn.hobbystocks.auc.common.core.redis.RedisCache;
 import cn.hobbystocks.auc.common.user.UserInfo;
 import cn.hobbystocks.auc.common.user.UserUtils;
 import cn.hobbystocks.auc.common.utils.DateUtils;
+import cn.hobbystocks.auc.domain.Auction;
 import cn.hobbystocks.auc.dto.AuctionDTO;
 import cn.hobbystocks.auc.vo.AuctionVO;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import cn.hobbystocks.auc.domain.Auction;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * 拍卖会Controller

lot/src/main/java/cn/hobbystocks/auc/domain/Auction.java

@@ -89,4 +89,7 @@ public class Auction extends BaseEntity {
     //排序
     @ApiModelProperty("排序，值越大排名越靠前")
     private Integer sort;
+
+    @ApiModelProperty("是否查询有效得拍卖会")
+    private Boolean validAucFlag;
 }

lot/src/main/resources/mapper/AuctionMapper.xml

@@ -38,15 +38,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             auction
     </sql>
 
-    <select id="selectAuctionList" parameterType="cn.hobbystocks.auc.domain.Auction" resultMap="AuctionResult">
+    <select id="selectAuctionList" parameterType="cn.hobbystocks.auc.vo.AuctionVO" resultMap="AuctionResult">
         <include refid="selectAuctionVo"/>
         <where>
             <if test="auction.name != null  and auction.name != ''"> and name like concat('%', #{auction.name}, '%')</if>
             <if test="auction.pubStatus != null "> and pub_status = #{auction.pubStatus}</if>
             <if test="auction.endTime != null "> and end_time &gt;= #{auction.endTime}</if>
+            <if test="auction.validAucFlag != null and auction.validAucFlag == true"> and status in ('Waiting','Starting')</if>
             and del_flag &lt;&gt; 1
         </where>
-        order by sort desc,id desc
+        order by id desc
     </select>
 
     <select id="selectPubbedAndNoEndAuction" resultMap="AuctionResult">