tiyan

src/main/java/com/dk/mdm/mapper/mac/AccountItemMapper.xml

@@ -125,6 +125,10 @@
         <if test="makeTime != null">
             AND t.make_time = #{makeTime}
         </if>
+        <if test="makeTimeStart != null and makeTimeEnd != null">
+            AND t.make_time &gt;= #{makeTimeStart}::timestamp with time zone
+            AND t.make_time &lt; #{makeTimeEnd}::timestamp with time zone + interval '1 day'
+        </if>
         <if test="flgValid != null">
             AND t.flg_valid = #{flgValid}
         </if>
@@ -138,6 +142,12 @@
         <if test="orderId != null">
             AND tpo.from_id = #{orderId}::uuid
         </if>
+        <if test="outTypeList != null and outTypeList.size()>0">
+            AND tpo.out_type =any(#{outTypeList,typeHandler=StringListTypeHandler})
+        </if>
+        <if test="intoTypeList != null and intoTypeList.size()>0">
+            AND tpi.into_type =any(#{intoTypeList,typeHandler=StringListTypeHandler})
+        </if>
     </sql>
 
     <sql id="idsForeach">

src/main/java/com/dk/mdm/model/query/mac/AccountItemQuery.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.StringListTypeHandler;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
@@ -21,6 +22,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  *  账务明细
@@ -253,6 +255,23 @@ public class AccountItemQuery extends PageInfo<AccountItemQuery> implements Seri
     @ApiModelProperty(value = "订单Id")
     private String orderId;
 
+    @ApiModelProperty(value = "出库类型")
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> outTypeList;
+
+    /**
+     * 入库类型-传入多个
+     */
+    @ApiModelProperty(value = "入库类型")
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> intoTypeList;
+
+    /**
+     * 小程序的查询条件
+     */
+    @ApiModelProperty(value = "小程序的查询条件")
+    private String searchText;
+
     private static final long serialVersionUID = 1L;
 
 }