新增：项目类型模块

src/main/java/com/gxwebsoft/booking/entity/Item.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -30,6 +32,9 @@ public class Item implements Serializable {
     @ApiModelProperty(value = "项目类型")
     private String name;
 
+    @ApiModelProperty(value = "项目图标")
+    private String image;
+
     @ApiModelProperty(value = "项目备注")
     private String comments;
 
@@ -43,6 +48,6 @@ public class Item implements Serializable {
     private Integer tenantId;
 
     @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
+    private Date createTime;
 
 }

src/main/java/com/gxwebsoft/booking/mapper/xml/ItemMapper.xml

@@ -28,6 +28,12 @@
             <if test="param.createTimeEnd != null">
                 AND a.create_time &lt;= #{param.createTimeEnd}
             </if>
+            <if test="param.ids != null">
+              AND a.id IN
+              <foreach collection="param.ids" item="item" separator="," open="(" close=")">
+                #{item}
+              </foreach>
+            </if>
             <if test="param.keywords != null">
                 AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
                 )

src/main/java/com/gxwebsoft/booking/param/ItemParam.java

@@ -1,6 +1,9 @@
 package com.gxwebsoft.booking.param;
 
 import java.math.BigDecimal;
+import java.util.Set;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.gxwebsoft.common.core.annotation.QueryField;
 import com.gxwebsoft.common.core.annotation.QueryType;
 import com.gxwebsoft.common.core.web.BaseParam;
@@ -41,4 +44,8 @@ public class ItemParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer sortNumber;
 
+    @ApiModelProperty(value = "项目ID集合")
+    @TableField(exist = false)
+    private Set<Integer> ids;
+
 }

src/main/java/com/gxwebsoft/cms/mapper/xml/AdMapper.xml

@@ -40,6 +40,12 @@
             <if test="param.createTimeEnd != null">
                 AND a.create_time &lt;= #{param.createTimeEnd}
             </if>
+            <if test="param.keywords != null">
+              AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
+                OR a.ad_id = #{param.keywords}
+                OR a.path LIKE CONCAT('%', #{param.keywords}, '%')
+              )
+            </if>
         </where>
     </sql>
 

src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantMapper.xml

@@ -29,7 +29,7 @@
                 AND a.shop_type LIKE CONCAT('%', #{param.shopType}, '%')
             </if>
             <if test="param.itemType != null">
-              AND a.item_type = #{param.merchantId}
+              AND a.item_type LIKE CONCAT('%', #{param.itemType}, '%')
             </if>
             <if test="param.category != null">
                 AND a.category LIKE CONCAT('%', #{param.category}, '%')