Commit dc918e8e372c320acf1b0929d8a180506abcfc4a
Merge branch 'master_cj_zq' into master_sample_order
Showing
1 changed file
with
4 additions
and
0 deletions
| @@ -196,6 +196,10 @@ | @@ -196,6 +196,10 @@ | ||
| 196 | <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''"> | 196 | <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''"> |
| 197 | AND cu.name LIKE CONCAT('%', #{vo.orderingUnitName},'%') | 197 | AND cu.name LIKE CONCAT('%', #{vo.orderingUnitName},'%') |
| 198 | </if> | 198 | </if> |
| 199 | + <if test="vo.searchKey != null and vo.searchKey != ''"> | ||
| 200 | + AND (cu.name LIKE CONCAT('%', #{vo.searchKey},'%') | ||
| 201 | + or tb.order_no LIKE CONCAT('%', #{vo.searchKey},'%')) | ||
| 202 | + </if> | ||
| 199 | <if test="vo.orderDateStart != null"> | 203 | <if test="vo.orderDateStart != null"> |
| 200 | AND tb.order_date >= #{vo.orderDateStart} | 204 | AND tb.order_date >= #{vo.orderDateStart} |
| 201 | </if> | 205 | </if> |