于继渤 1 năm trước cách đây
mục cha
commit
63619a918f

+ 5 - 0
src/main/java/com/dk/mdm/mapper/mac/RecPayMapper.xml

@@ -310,6 +310,10 @@
         <if test="staffIds != null and staffIds.size() > 0">
             AND t.staff_id  =any(#{staffIdList, typeHandler=UuidListTypeHandler})
         </if>
+        <if test="makeStaffIds != null and makeStaffIds.size() > 0">
+            AND t.make_staff  =any(#{makeStaffIds, typeHandler=UuidListTypeHandler})
+        </if>
+
         <if test="createtimeStart != null and createtimeEnd != null">
             AND t.op_create_time &gt;= #{createtimeStart}::timestamp with time zone
             AND t.op_create_time &lt; #{createtimeEnd}::timestamp with time zone + interval '1 day'
@@ -823,6 +827,7 @@
             or tmsp.sup_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmo.org_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tms.staff_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+            or t.rp_no LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             )
         </if>
         order by t.op_create_time desc

+ 3 - 0
src/main/java/com/dk/mdm/model/query/mac/RecPayQuery.java

@@ -258,6 +258,9 @@ public class RecPayQuery extends PageInfo<RecPayQuery> implements Serializable {
     @ApiModelProperty(value = "业务员List")
     private List<String> staffIdList;
 
+    @ApiModelProperty(value = "业务员List")
+    private List<String> makeStaffIds;
+
 
     @ApiModelProperty(value = "制单时间开始")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")