BJ_FS / urbanops

Commit a46fcc67ea5b60d7eb88253a2d1393b8348ea082

Authored by 王富生
2 parents eff3afe9 938abb1a

Merge remote-tracking branch 'origin/master'

Inline Side-by-side
Showing 2 changed files with 31 additions and 22 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/materialinventory/vo/MaterialInventoryPageReqVO.java
  View file @a46fcc6
@@ -71,4 +71,6 @@ public class MaterialInventoryPageReqVO extends PageParam { @@ -71,4 +71,6 @@ public class MaterialInventoryPageReqVO extends PageParam {
71 @Schema(description = "部门ID", example = "11349") 71 @Schema(description = "部门ID", example = "11349")
72 private Long deptId; 72 private Long deptId;
73 73
74 -}  
75 \ No newline at end of file 74 \ No newline at end of file
  75 + @Schema(description = "出库查询", example = "0")
  76 + private Integer outInventoryQuery;
  77 +}
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/materialinventory/MaterialInventoryMapper.java
  View file @a46fcc6
@@ -18,27 +18,34 @@ import com.zteits.urbanops.module.garden.controller.admin.materialinventory.vo.* @@ -18,27 +18,34 @@ import com.zteits.urbanops.module.garden.controller.admin.materialinventory.vo.*
18 public interface MaterialInventoryMapper extends BaseMapperX<MaterialInventoryDO> { 18 public interface MaterialInventoryMapper extends BaseMapperX<MaterialInventoryDO> {
19 19
20 default PageResult<MaterialInventoryDO> selectPage(MaterialInventoryPageReqVO reqVO) { 20 default PageResult<MaterialInventoryDO> selectPage(MaterialInventoryPageReqVO reqVO) {
21 - return selectPage(reqVO, new LambdaQueryWrapperX<MaterialInventoryDO>()  
22 - .eqIfPresent(MaterialInventoryDO::getMaterialId, reqVO.getMaterialId())  
23 - .likeIfPresent(MaterialInventoryDO::getMaterialName, reqVO.getMaterialName())  
24 - .eqIfPresent(MaterialInventoryDO::getMaterialTypeId, reqVO.getMaterialTypeId())  
25 - .likeIfPresent(MaterialInventoryDO::getMaterialTypeName, reqVO.getMaterialTypeName())  
26 - .eqIfPresent(MaterialInventoryDO::getTypeId, reqVO.getTypeId())  
27 - .likeIfPresent(MaterialInventoryDO::getTypeName, reqVO.getTypeName())  
28 - .eqIfPresent(MaterialInventoryDO::getTypeDetailId, reqVO.getTypeDetailId())  
29 - .likeIfPresent(MaterialInventoryDO::getTypeDetailName, reqVO.getTypeDetailName())  
30 - .eqIfPresent(MaterialInventoryDO::getSpecifications, reqVO.getSpecifications())  
31 - .eqIfPresent(MaterialInventoryDO::getBelongCompanyId, reqVO.getBelongCompanyId())  
32 - .likeIfPresent(MaterialInventoryDO::getBelongCompanyName, reqVO.getBelongCompanyName())  
33 - .eqIfPresent(MaterialInventoryDO::getUnitId, reqVO.getUnitId())  
34 - .likeIfPresent(MaterialInventoryDO::getUnitName, reqVO.getUnitName())  
35 - .eqIfPresent(MaterialInventoryDO::getCurrentNum, reqVO.getCurrentNum())  
36 - .eqIfPresent(MaterialInventoryDO::getOutTotalNum, reqVO.getOutTotalNum())  
37 - .eqIfPresent(MaterialInventoryDO::getInventoryTotalNum, reqVO.getInventoryTotalNum())  
38 - .betweenIfPresent(MaterialInventoryDO::getCreateTime, reqVO.getCreateTime())  
39 - .eqIfPresent(MaterialInventoryDO::getInventoryAlermNum, reqVO.getInventoryAlermNum())  
40 - .eqIfPresent(MaterialInventoryDO::getDeptId, reqVO.getDeptId())  
41 - .orderByDesc(MaterialInventoryDO::getMaterialId)); 21 +
  22 + LambdaQueryWrapperX<MaterialInventoryDO> queryWrapper = new LambdaQueryWrapperX<MaterialInventoryDO>()
  23 + .eqIfPresent(MaterialInventoryDO::getMaterialId, reqVO.getMaterialId())
  24 + .likeIfPresent(MaterialInventoryDO::getMaterialName, reqVO.getMaterialName())
  25 + .eqIfPresent(MaterialInventoryDO::getMaterialTypeId, reqVO.getMaterialTypeId())
  26 + .likeIfPresent(MaterialInventoryDO::getMaterialTypeName, reqVO.getMaterialTypeName())
  27 + .eqIfPresent(MaterialInventoryDO::getTypeId, reqVO.getTypeId())
  28 + .likeIfPresent(MaterialInventoryDO::getTypeName, reqVO.getTypeName())
  29 + .eqIfPresent(MaterialInventoryDO::getTypeDetailId, reqVO.getTypeDetailId())
  30 + .likeIfPresent(MaterialInventoryDO::getTypeDetailName, reqVO.getTypeDetailName())
  31 + .eqIfPresent(MaterialInventoryDO::getSpecifications, reqVO.getSpecifications())
  32 + .eqIfPresent(MaterialInventoryDO::getBelongCompanyId, reqVO.getBelongCompanyId())
  33 + .likeIfPresent(MaterialInventoryDO::getBelongCompanyName, reqVO.getBelongCompanyName())
  34 + .eqIfPresent(MaterialInventoryDO::getUnitId, reqVO.getUnitId())
  35 + .likeIfPresent(MaterialInventoryDO::getUnitName, reqVO.getUnitName())
  36 + .eqIfPresent(MaterialInventoryDO::getCurrentNum, reqVO.getCurrentNum())
  37 + .eqIfPresent(MaterialInventoryDO::getOutTotalNum, reqVO.getOutTotalNum())
  38 + .eqIfPresent(MaterialInventoryDO::getInventoryTotalNum, reqVO.getInventoryTotalNum())
  39 + .betweenIfPresent(MaterialInventoryDO::getCreateTime, reqVO.getCreateTime())
  40 + .eqIfPresent(MaterialInventoryDO::getInventoryAlermNum, reqVO.getInventoryAlermNum())
  41 + .eqIfPresent(MaterialInventoryDO::getDeptId, reqVO.getDeptId());
  42 + //库存大于0
  43 + if (reqVO.getOutInventoryQuery() != null && 0 == reqVO.getOutInventoryQuery()) {
  44 + queryWrapper.gt(MaterialInventoryDO::getCurrentNum, 0);
  45 + }
  46 + queryWrapper.orderByDesc(MaterialInventoryDO::getMaterialId);
  47 +
  48 + return selectPage(reqVO,queryWrapper);
42 } 49 }
43 50
44 } 51 }