楚江ERP:账期-回笼资金筛选

@@ -29,12 +29,18 @@ public class QueryRecapitalizeVo extends PageVo implements BaseVo, Serializable
     @ApiModelProperty("订货单位ID")
     private String orderingUnit;
 
+    @ApiModelProperty("订货单位名称")
+    private String orderingUnitName;
+
     /**
      * 办事处ID
      */
     @ApiModelProperty("办事处ID")
     private String deptId;
 
+    @ApiModelProperty("办事处名称")
+    private String deptName;
+
     /**
      * 厂别
      */

@@ -54,9 +54,15 @@
             <if test="vo.orderingUnit != null and vo.orderingUnit != ''">
                 AND tb.ordering_unit = #{vo.orderingUnit}
             </if>
+            <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''">
+                AND cu.name LIKE CONCAT('%', #{vo.orderingUnitName}, '%')
+            </if>
             <if test="vo.deptId != null and vo.deptId != ''">
                 AND tb.dept_id = #{vo.deptId}
             </if>
+            <if test="vo.deptName != null and vo.deptName != ''">
+                AND d.name LIKE CONCAT('%', #{vo.deptName}, '%')
+            </if>
             <if test="vo.factoryType != null and vo.factoryType != ''">
                 AND tb.factory_type = #{vo.factoryType}
             </if>