Showing
3 changed files
with
17 additions
and
0 deletions
| @@ -580,6 +580,11 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde | @@ -580,6 +580,11 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde | ||
| 580 | Assert.greaterThanZero(pageSize); | 580 | Assert.greaterThanZero(pageSize); |
| 581 | vo.setFreeze(true); | 581 | vo.setFreeze(true); |
| 582 | PageHelperUtil.startPage(pageIndex, pageSize); | 582 | PageHelperUtil.startPage(pageIndex, pageSize); |
| 583 | + List<String> includeStatus = new ArrayList<>(); | ||
| 584 | + includeStatus.add("ISSUED"); | ||
| 585 | + includeStatus.add("WAIT"); | ||
| 586 | + includeStatus.add("TRANSIT"); | ||
| 587 | + vo.setIncludeStatus(includeStatus); | ||
| 583 | List<PurchaseOrderInfo> datas = getBaseMapper().query(vo); | 588 | List<PurchaseOrderInfo> datas = getBaseMapper().query(vo); |
| 584 | if (CollectionUtils.isNotEmpty(datas)) { | 589 | if (CollectionUtils.isNotEmpty(datas)) { |
| 585 | List<String> ids = datas.stream() | 590 | List<String> ids = datas.stream() |
| @@ -129,4 +129,10 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ | @@ -129,4 +129,10 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ | ||
| 129 | */ | 129 | */ |
| 130 | @ApiModelProperty("排除主键集合") | 130 | @ApiModelProperty("排除主键集合") |
| 131 | private List<String> excludeIds; | 131 | private List<String> excludeIds; |
| 132 | + | ||
| 133 | + /** | ||
| 134 | + * 状态集合 | ||
| 135 | + */ | ||
| 136 | + @ApiModelProperty("状态集合") | ||
| 137 | + private List<String> includeStatus; | ||
| 132 | } | 138 | } |
| @@ -176,6 +176,12 @@ | @@ -176,6 +176,12 @@ | ||
| 176 | #{id} | 176 | #{id} |
| 177 | </foreach> | 177 | </foreach> |
| 178 | </if> | 178 | </if> |
| 179 | + <if test="vo.includeStatus != null and !vo.includeStatus.isEmpty()"> | ||
| 180 | + AND tb.status IN | ||
| 181 | + <foreach collection="vo.includeStatus" item="status" open="(" separator="," close=")"> | ||
| 182 | + #{status} | ||
| 183 | + </foreach> | ||
| 184 | + </if> | ||
| 179 | </where> | 185 | </where> |
| 180 | ORDER BY tb.update_time DESC | 186 | ORDER BY tb.update_time DESC |
| 181 | </select> | 187 | </select> |