From 4d542200ffc5757be75bb3868155a6d62eab88a5 Mon Sep 17 00:00:00 2001 From: cuijian <cuijian@xalxzn.com> Date: 星期一, 26 五月 2025 16:31:46 +0800 Subject: [PATCH] 工具入库 --- lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InStoreDetailController.java | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InStoreDetailController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InStoreDetailController.java index 7a7f587..1a80548 100644 --- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InStoreDetailController.java +++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InStoreDetailController.java @@ -13,6 +13,7 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.tms.entity.InStoreDetail; +import org.jeecg.modules.tms.entity.ToolsClassify; import org.jeecg.modules.tms.service.IInStoreDetailService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -56,19 +57,17 @@ * @param inStoreDetail * @param pageNo * @param pageSize - * @param req + * @param query * @return */ //@AutoLog(value = "鍏ュ簱鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ") @ApiOperation(value="鍏ュ簱鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ", notes="鍏ュ簱鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ") @GetMapping(value = "/list") - public Result<IPage<InStoreDetail>> queryPageList(InStoreDetail inStoreDetail, + public Result<?> findPageList(InStoreDetail inStoreDetail, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper<InStoreDetail> queryWrapper = QueryGenerator.initQueryWrapper(inStoreDetail, req.getParameterMap()); - Page<InStoreDetail> page = new Page<InStoreDetail>(pageNo, pageSize); - IPage<InStoreDetail> pageList = inStoreDetailService.page(page, queryWrapper); + @RequestParam Map<String, String> query) { + IPage<Map<String, Object>> pageList = inStoreDetailService.findPageList(pageNo, pageSize, query); return Result.OK(pageList); } -- Gitblit v1.9.3