收付款单

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

@@ -80,6 +80,16 @@
             <if test="rpNo != null and rpNo != ''">
                 AND t.rp_no LIKE concat('%',my_ex.likequery(#{rpNo}),'%')
             </if>
+            <if test="searchText !=null and searchText != ''">
+                AND (
+                t.rp_no   LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+                or tmc.cus_phone LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+                or tmc.cus_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+                or tmo.org_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+                or tmp.sup_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+                or tms.staff_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+                )
+            </if>
             <if test="rpType != null and rpType != ''">
                 AND t.rp_type = #{rpType}
             </if>
@@ -143,11 +153,11 @@
             <if test="cusName != null and cusName != ''">
                 AND tmc.cus_name LIKE concat('%',my_ex.likequery(#{cusName}),'%')
             </if>
-            <if test="orgIdList != null and orgIdList.size() > 0">
-                AND t.org_id  =any(#{orgIdList, typeHandler=uuidListTypeHandler})
+            <if test="orgIds != null and orgIds.size() > 0">
+                AND t.org_id  =any(#{orgIds, typeHandler=UuidListTypeHandler})
             </if>
-            <if test="staffIdList != null and staffIdList.size() > 0">
-                AND t.staff_id  =any(#{staffIdList, typeHandler=uuidListTypeHandler})
+            <if test="staffIds != null and staffIds.size() > 0">
+                AND t.staff_id  =any(#{staffIds, typeHandler=UuidListTypeHandler})
             </if>
             <if test="makeTimeStart != null and makeTimeEnd != null">
                 AND t.make_time &gt;= #{makeTimeStart}::timestamp with time zone
@@ -221,7 +231,12 @@
         count(1)
         FROM dkic_b.t_mac_rec_pay as t
          LEFT JOIN dkic_b.t_mst_customer tmc
-                   ON tmc.cus_id = t.object_id and t.rp_type = '收付款类型-收款'
+                   ON tmc.cus_id = t.object_id
+        Left join dkic_b.t_mst_supplier tmp on tmp.sup_id = t.object_id
+        left join sys.t_data_kind as tdk1 on tdk1.kind_code = t.rp_type
+        left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
+        left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id
+        left join dkic_b.t_mst_staff as makestaff on makestaff.staff_id = t.make_staff
         <include refid="Condition"/>
     </select>
 

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

@@ -6,9 +6,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.JsonTypeHandler;
-import com.dk.common.infrastructure.handler.TimestampTypeHandler;
-import com.dk.common.infrastructure.handler.UuidTypeHandler;
+import com.dk.common.infrastructure.handler.*;
 import com.dk.common.model.pojo.PageInfo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -23,6 +21,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  *  收付款单
@@ -92,6 +91,20 @@ public class RecPayQuery extends PageInfo<RecPayQuery> implements Serializable {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String staffId;
 
+    /**
+     * 员工ID
+     */
+    @ApiModelProperty(value = "员工ID")
+    @TableField(typeHandler = UuidListTypeHandler.class)
+    private List<String> staffIds;
+
+    /**
+     * @desc   : 组织部门list
+     */
+    @ApiModelProperty(value = "组织部门list")
+    @TableField(typeHandler = UuidListTypeHandler.class)
+    private List<String> orgIds;
+
 
     /**
      * 收款金额
@@ -125,6 +138,12 @@ public class RecPayQuery extends PageInfo<RecPayQuery> implements Serializable {
 
 
     /**
+     * 小程序的查询条件
+     */
+    @ApiModelProperty(value = "小程序的查询条件")
+    private String searchText;
+
+    /**
      * 收付款日期 (账务日期)
      */
     @Excel(name = "收付款日期 (账务日期)")
@@ -133,6 +152,16 @@ public class RecPayQuery extends PageInfo<RecPayQuery> implements Serializable {
     @TableField(typeHandler = TimestampTypeHandler.class)
     private LocalDate accDate;
 
+    @ApiModelProperty(value = "制单时间开始")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDate makeTimeStart;
+
+    @ApiModelProperty(value = "制单时间结束")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDate makeTimeEnd;
+
 
     /**
      * 备注