朱园亮 / xingyun-erp · Commits

Commit 8b4352f3d508d98c77ce74abd441d34f66c31402

Authored by 房远帅
1 parent 40c888c5

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

Inline Side-by-side
Showing 2 changed files with 12 additions and 0 deletions
@@ -29,12 +29,18 @@ public class QueryRecapitalizeVo extends PageVo implements BaseVo, Serializable @@ -29,12 +29,18 @@ public class QueryRecapitalizeVo extends PageVo implements BaseVo, Serializable
29 @ApiModelProperty("订货单位ID") 29 @ApiModelProperty("订货单位ID")
30 private String orderingUnit; 30 private String orderingUnit;
31 31
  32 + @ApiModelProperty("订货单位名称")
  33 + private String orderingUnitName;
  34 +
32 /** 35 /**
33 * 办事处ID 36 * 办事处ID
34 */ 37 */
35 @ApiModelProperty("办事处ID") 38 @ApiModelProperty("办事处ID")
36 private String deptId; 39 private String deptId;
37 40
  41 + @ApiModelProperty("办事处名称")
  42 + private String deptName;
  43 +
38 /** 44 /**
39 * 厂别 45 * 厂别
40 */ 46 */
@@ -54,9 +54,15 @@ @@ -54,9 +54,15 @@
54 <if test="vo.orderingUnit != null and vo.orderingUnit != ''"> 54 <if test="vo.orderingUnit != null and vo.orderingUnit != ''">
55 AND tb.ordering_unit = #{vo.orderingUnit} 55 AND tb.ordering_unit = #{vo.orderingUnit}
56 </if> 56 </if>
  57 + <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''">
  58 + AND cu.name LIKE CONCAT('%', #{vo.orderingUnitName}, '%')
  59 + </if>
57 <if test="vo.deptId != null and vo.deptId != ''"> 60 <if test="vo.deptId != null and vo.deptId != ''">
58 AND tb.dept_id = #{vo.deptId} 61 AND tb.dept_id = #{vo.deptId}
59 </if> 62 </if>
  63 + <if test="vo.deptName != null and vo.deptName != ''">
  64 + AND d.name LIKE CONCAT('%', #{vo.deptName}, '%')
  65 + </if>
60 <if test="vo.factoryType != null and vo.factoryType != ''"> 66 <if test="vo.factoryType != null and vo.factoryType != ''">
61 AND tb.factory_type = #{vo.factoryType} 67 AND tb.factory_type = #{vo.factoryType}
62 </if> 68 </if>