From e5d0fe8cfdc5e171badfa22bac00b0e2e81ee6e6 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 07 六月 2025 16:17:59 +0800
Subject: [PATCH] art: 设备管理-设备维修-维修流程审批接口修改
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/BaseToolsController.java | 81 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 81 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/BaseToolsController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/BaseToolsController.java
index 022303c..38db085 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/BaseToolsController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/BaseToolsController.java
@@ -82,6 +82,57 @@
return Result.OK(pageList);
}
+
+ /**
+ * 鏍规嵁鍒嗙被閫夋嫨宸ュ叿
+ *
+ * @param baseTools
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @ApiOperation(value="鏍规嵁鍒嗙被閫夋嫨宸ュ叿", notes="鏍规嵁鍒嗙被閫夋嫨宸ュ叿")
+ @GetMapping(value = "/queryToolByClassifyId")
+ public Result<?> queryToolByClassifyId(BaseTools baseTools,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ Map<String, String[]> parameterMap = req.getParameterMap();
+ String[] classifyIds = parameterMap.get("classifyId");
+ if (classifyIds != null && classifyIds.length > 0) {
+ if("1".equals(classifyIds[0])){
+ Page<ParaCommonToolVo> page = new Page<ParaCommonToolVo>(pageNo, pageSize);
+ IPage<ParaCommonToolVo> pageList = baseToolsService.paraCommonToolList(page, parameterMap);
+ return Result.OK(pageList);
+ }else if("2".equals(classifyIds[0])){
+ Page<ParaHolesToolsVo> page = new Page<ParaHolesToolsVo>(pageNo, pageSize);
+ IPage<ParaHolesToolsVo> pageList = baseToolsService.paraHolesToolsList(page, parameterMap);
+ return Result.OK(pageList);
+ }else if("3".equals(classifyIds[0])){
+ Page<ParaThreadingToolVo> page = new Page<ParaThreadingToolVo>(pageNo, pageSize);
+ IPage<ParaThreadingToolVo> pageList = baseToolsService.paraThreadingToolList(page, parameterMap);
+ return Result.OK(pageList);
+ }else if("4".equals(classifyIds[0])){
+ Page<ParaMillToolVo> page = new Page<ParaMillToolVo>(pageNo, pageSize);
+ IPage<ParaMillToolVo> pageList = baseToolsService.paraMillToolList(page, parameterMap);
+ return Result.OK(pageList);
+ }else if("5".equals(classifyIds[0])){
+ Page<ParaTurningToolsVo> page = new Page<ParaTurningToolsVo>(pageNo, pageSize);
+ IPage<ParaTurningToolsVo> pageList = baseToolsService.paraTurningToolsList(page, parameterMap);
+ return Result.OK(pageList);
+ }else if("6".equals(classifyIds[0])){
+ Page<ParaBladeVo> page = new Page<ParaBladeVo>(pageNo, pageSize);
+ IPage<ParaBladeVo> pageList = baseToolsService.paraBladeList(page, parameterMap);
+ return Result.OK(pageList);
+ }else {
+ return Result.error("璇烽�夋嫨宸ュ叿鍒嗙被");
+ }
+ }else {
+ return Result.error("璇烽�夋嫨宸ュ叿鍒嗙被");
+ }
+ }
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -493,5 +544,35 @@
return Result.OK("");
}
}
+ @GetMapping("/listWithLedgerAndConfig")
+ public Result<IPage<StocktakingPoundVo>> listWithLedgerAndConfig(
+ StocktakingPoundVo stocktakingPoundVo,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ // 浣跨敤 QueryGenerator 鏋勫缓 QueryWrapper
+ QueryWrapper<StocktakingPoundVo> queryWrapper = QueryGenerator.initQueryWrapper(stocktakingPoundVo, req.getParameterMap());
+
+ Page<StocktakingPoundVo> page = new Page<>(pageNo, pageSize);
+ IPage<StocktakingPoundVo> resultPage = baseToolsService.pageWithLedgerAndConfig(page, queryWrapper);
+ return Result.OK(resultPage);
+ }
+
+
+
+ @GetMapping("/listWithSharpedAndConfig")
+ public Result<IPage<SharpeeningVo>> listWithSharpedAndConfig(
+ SharpeeningVo sharpeeningVo,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+
+ // 浣跨敤 QueryGenerator 鏋勫缓 QueryWrapper
+ QueryWrapper<SharpeeningVo> queryWrapper = QueryGenerator.initQueryWrapper(sharpeeningVo, req.getParameterMap());
+
+ Page<SharpeeningVo> page = new Page<>(pageNo, pageSize);
+ IPage<SharpeeningVo> resultPage = baseToolsService.pageWithSharpedAndConfig(page, queryWrapper);
+ return Result.OK(resultPage);
+ }
}
--
Gitblit v1.9.3