oa二期内容更新,库存方面ui优化：添加针对项目的直接添加出库效果

ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseController.java

@@ -53,6 +53,17 @@ public class SysOaWarehouseController extends BaseController {
         return iSysOaWarehouseService.queryPageList(bo, pageQuery);
     }
 
+
+    /**
+     * 通过一个name查询多个字段
+     */
+    @SaCheckPermission("oa:oaWarehouse:list")
+    @GetMapping("/listByMultiQuery")
+    public TableDataInfo<SysOaWarehouseVo> listByMultiQuery(SysOaWarehouseBo bo, PageQuery pageQuery) {
+        return iSysOaWarehouseService.listByMultiQuery(bo, pageQuery);
+    }
+
+
     /**
      * 导出仓库管理列表
      */

ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseService.java

@@ -46,4 +46,9 @@ public interface ISysOaWarehouseService {
      * 校验并批量删除仓库管理信息
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据一个name查询多个字段
+     */
+    TableDataInfo<SysOaWarehouseVo> listByMultiQuery(SysOaWarehouseBo bo, PageQuery pageQuery);
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseServiceImpl.java

@@ -40,7 +40,7 @@ public class SysOaWarehouseServiceImpl implements ISysOaWarehouseService {
      * 查询仓库管理
      */
     @Override
-    public SysOaWarehouseVo queryById(Long id){
+    public SysOaWarehouseVo queryById(Long id) {
         return baseMapper.selectVoById(id);
     }
 
@@ -63,6 +63,16 @@ public class SysOaWarehouseServiceImpl implements ISysOaWarehouseService {
         return baseMapper.selectVoList(lqw);
     }
 
+    @Override
+    public TableDataInfo<SysOaWarehouseVo> listByMultiQuery(SysOaWarehouseBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysOaWarehouse> lqw = buildQueryWrapper(bo);
+        lqw.like(StringUtils.isNotBlank(bo.getName()), SysOaWarehouse::getName, bo.getName()).or()
+                .like(StringUtils.isNotBlank(bo.getName()), SysOaWarehouse::getBrand, bo.getName()).or()
+                .like(StringUtils.isNotBlank(bo.getName()), SysOaWarehouse::getModel, bo.getName());
+        Page<SysOaWarehouseVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
     private LambdaQueryWrapper<SysOaWarehouse> buildQueryWrapper(SysOaWarehouseBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<SysOaWarehouse> lqw = Wrappers.lambdaQuery();
@@ -89,10 +99,9 @@ public class SysOaWarehouseServiceImpl implements ISysOaWarehouseService {
         SysOaWarehouse select = baseMapper.selectOne(lqw);
         // 2、 无则直接新增项目 有则直接增加库存数量
         boolean flag;
-        if(select == null ) {
+        if (select == null) {
             flag = baseMapper.insert(add) > 0;
-        }
-        else {
+        } else {
             select.setInventory(select.getInventory() + bo.getInventory());
             flag = baseMapper.updateById(select) > 0;
         }
@@ -115,7 +124,7 @@ public class SysOaWarehouseServiceImpl implements ISysOaWarehouseService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(SysOaWarehouse entity){
+    private void validEntityBeforeSave(SysOaWarehouse entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -124,10 +133,12 @@ public class SysOaWarehouseServiceImpl implements ISysOaWarehouseService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
 
-        return baseMapper.deleteBatchIds(ids)>0;
+        return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+
 }