diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/materialinventory/vo/MaterialInventoryPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/materialinventory/vo/MaterialInventoryPageReqVO.java index 88b1fb0..40cc3d6 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/materialinventory/vo/MaterialInventoryPageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/materialinventory/vo/MaterialInventoryPageReqVO.java @@ -71,4 +71,6 @@ public class MaterialInventoryPageReqVO extends PageParam { @Schema(description = "部门ID", example = "11349") private Long deptId; -} \ No newline at end of file + @Schema(description = "出库查询", example = "0") + private Integer outInventoryQuery; +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/materialinventory/MaterialInventoryMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/materialinventory/MaterialInventoryMapper.java index bc6e60b..d60136f 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/materialinventory/MaterialInventoryMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/materialinventory/MaterialInventoryMapper.java @@ -18,27 +18,34 @@ import com.zteits.urbanops.module.garden.controller.admin.materialinventory.vo.* public interface MaterialInventoryMapper extends BaseMapperX { default PageResult selectPage(MaterialInventoryPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MaterialInventoryDO::getMaterialId, reqVO.getMaterialId()) - .likeIfPresent(MaterialInventoryDO::getMaterialName, reqVO.getMaterialName()) - .eqIfPresent(MaterialInventoryDO::getMaterialTypeId, reqVO.getMaterialTypeId()) - .likeIfPresent(MaterialInventoryDO::getMaterialTypeName, reqVO.getMaterialTypeName()) - .eqIfPresent(MaterialInventoryDO::getTypeId, reqVO.getTypeId()) - .likeIfPresent(MaterialInventoryDO::getTypeName, reqVO.getTypeName()) - .eqIfPresent(MaterialInventoryDO::getTypeDetailId, reqVO.getTypeDetailId()) - .likeIfPresent(MaterialInventoryDO::getTypeDetailName, reqVO.getTypeDetailName()) - .eqIfPresent(MaterialInventoryDO::getSpecifications, reqVO.getSpecifications()) - .eqIfPresent(MaterialInventoryDO::getBelongCompanyId, reqVO.getBelongCompanyId()) - .likeIfPresent(MaterialInventoryDO::getBelongCompanyName, reqVO.getBelongCompanyName()) - .eqIfPresent(MaterialInventoryDO::getUnitId, reqVO.getUnitId()) - .likeIfPresent(MaterialInventoryDO::getUnitName, reqVO.getUnitName()) - .eqIfPresent(MaterialInventoryDO::getCurrentNum, reqVO.getCurrentNum()) - .eqIfPresent(MaterialInventoryDO::getOutTotalNum, reqVO.getOutTotalNum()) - .eqIfPresent(MaterialInventoryDO::getInventoryTotalNum, reqVO.getInventoryTotalNum()) - .betweenIfPresent(MaterialInventoryDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(MaterialInventoryDO::getInventoryAlermNum, reqVO.getInventoryAlermNum()) - .eqIfPresent(MaterialInventoryDO::getDeptId, reqVO.getDeptId()) - .orderByDesc(MaterialInventoryDO::getMaterialId)); + + LambdaQueryWrapperX queryWrapper = new LambdaQueryWrapperX() + .eqIfPresent(MaterialInventoryDO::getMaterialId, reqVO.getMaterialId()) + .likeIfPresent(MaterialInventoryDO::getMaterialName, reqVO.getMaterialName()) + .eqIfPresent(MaterialInventoryDO::getMaterialTypeId, reqVO.getMaterialTypeId()) + .likeIfPresent(MaterialInventoryDO::getMaterialTypeName, reqVO.getMaterialTypeName()) + .eqIfPresent(MaterialInventoryDO::getTypeId, reqVO.getTypeId()) + .likeIfPresent(MaterialInventoryDO::getTypeName, reqVO.getTypeName()) + .eqIfPresent(MaterialInventoryDO::getTypeDetailId, reqVO.getTypeDetailId()) + .likeIfPresent(MaterialInventoryDO::getTypeDetailName, reqVO.getTypeDetailName()) + .eqIfPresent(MaterialInventoryDO::getSpecifications, reqVO.getSpecifications()) + .eqIfPresent(MaterialInventoryDO::getBelongCompanyId, reqVO.getBelongCompanyId()) + .likeIfPresent(MaterialInventoryDO::getBelongCompanyName, reqVO.getBelongCompanyName()) + .eqIfPresent(MaterialInventoryDO::getUnitId, reqVO.getUnitId()) + .likeIfPresent(MaterialInventoryDO::getUnitName, reqVO.getUnitName()) + .eqIfPresent(MaterialInventoryDO::getCurrentNum, reqVO.getCurrentNum()) + .eqIfPresent(MaterialInventoryDO::getOutTotalNum, reqVO.getOutTotalNum()) + .eqIfPresent(MaterialInventoryDO::getInventoryTotalNum, reqVO.getInventoryTotalNum()) + .betweenIfPresent(MaterialInventoryDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(MaterialInventoryDO::getInventoryAlermNum, reqVO.getInventoryAlermNum()) + .eqIfPresent(MaterialInventoryDO::getDeptId, reqVO.getDeptId()); + //库存大于0 + if (reqVO.getOutInventoryQuery() != null && 0 == reqVO.getOutInventoryQuery()) { + queryWrapper.gt(MaterialInventoryDO::getCurrentNum, 0); + } + queryWrapper.orderByDesc(MaterialInventoryDO::getMaterialId); + + return selectPage(reqVO,queryWrapper); } }