出库查询

src/main/java/com/dk/mdm/mapper/ivt/OutboundMapper.xml

@@ -131,6 +131,15 @@
                 or tms.staff_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
                 )
             </if>
+            <if test="orgName != null and orgName != ''">
+                AND tmo.org_name LIKE concat('%',my_ex.likequery(#{orgName}),'%')
+            </if>
+            <if test="supName != null and supName != ''">
+                AND tmp.sup_name LIKE concat('%',my_ex.likequery(#{supName}),'%')
+            </if>
+            <if test="staffName != null and staffName != ''">
+                AND tms.staff_name LIKE concat('%',my_ex.likequery(#{staffName}),'%')
+            </if>
             <if test="fromId != null and fromId != ''">
                 AND t.from_id = #{fromId}
             </if>
@@ -281,7 +290,7 @@
                  LEFT JOIN sys.t_data_kind tdktype   ON tdktype.kind_code = t.out_type
                  left join dkic_b.t_mst_dictionary_data tmd on tmd.data_id = t.out_reason
         <include refid="Condition"/>
-        order by t.op_create_time desc
+        order by t.make_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
         </if>

src/main/java/com/dk/mdm/model/query/ivt/OutboundQuery.java

@@ -243,6 +243,14 @@ public class OutboundQuery extends PageInfo<OutboundQuery> {
 
     @ApiModelProperty(value = "客户名称")
     private String cusName;
+    @ApiModelProperty(value = "业务部门")
+    private String orgName;
+
+    @ApiModelProperty(value = "供应商")
+    private String supName;
+
+    @ApiModelProperty(value = "业务员")
+    private String staffName;
 
     @ApiModelProperty(value = "部门List")
     private List<String> orgIdList;