|
@@ -83,6 +83,7 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
|
|
|
public Page<ContractProductVo> getPage(ContractProductSelectDto dto) {
|
|
|
IWrapper<ContractProduct> wrapper = getWrapper();
|
|
|
wrapper.orderByDesc("t1", ContractProduct::getCreateTime);
|
|
|
+ wrapper.ne("t1",ContractProduct::getExpendQuantity,0);
|
|
|
wrapper.between("t2", Contract::getStatus, FlowStatusEnum.PASS.getKey(), FlowStatusEnum.CANCELLATION.getKey() - 1);
|
|
|
if(ObjectUtil.isNotEmpty(dto.getDataType())&&dto.getDataType()==0){//合同交接单
|
|
|
wrapper.ne("t1", ContractProduct::getExpendQuantity, BigDecimal.ZERO);
|