|
@@ -137,8 +137,13 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
|
|
|
wrapper.keyword(dto.getKeyword(), new SqlField("t2.name"), new SqlField("t1.`code`"));
|
|
|
}
|
|
|
|
|
|
- //不显示已变更数据
|
|
|
- wrapper.ne(EhsdPurchase::getStatus, FlowStatusEnum1.UPDATE.getKey());
|
|
|
+ //采购状态过滤
|
|
|
+ wrapper.eq(EhsdPurchase::getStatus, dto.getStatus());
|
|
|
+
|
|
|
+ if(FlowStatusEnum1.UPDATE.getKey() != dto.getStatus()) {
|
|
|
+ //不显示已变更数据
|
|
|
+ wrapper.ne(EhsdPurchase::getStatus, FlowStatusEnum1.UPDATE.getKey());
|
|
|
+ }
|
|
|
|
|
|
//不显示 在审批中 但是 有历史合同id的数据
|
|
|
wrapper.not(q -> q
|