From 20a7735a6831064c9d5bea12c50f63729f2db2fc Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期六, 06 一月 2024 15:36:11 +0800
Subject: [PATCH] mdc更新
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
index 36a2173..31fb7bc 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
@@ -1,6 +1,5 @@
package org.jeecg.modules.mdc.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -11,7 +10,6 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcEquipment;
@@ -67,13 +65,13 @@
@AutoLog(value = "璁惧琛�-鍒嗛〉鍒楄〃鏌ヨ")
@ApiOperation(value = "璁惧琛�-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧琛�-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
- public Result<IPage<MdcEquipment>> queryPageList(MdcEquipment mdcEquipment,
+ public Result<IPage<MdcEquipment>> queryPageList(MdcEquipmentVo mdcEquipment,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<MdcEquipment> queryWrapper = QueryGenerator.initQueryWrapper(mdcEquipment, req.getParameterMap());
+ //QueryWrapper<MdcEquipment> queryWrapper = QueryGenerator.initQueryWrapper(mdcEquipment, req.getParameterMap());
Page<MdcEquipment> page = new Page<MdcEquipment>(pageNo, pageSize);
- IPage<MdcEquipment> pageList = mdcEquipmentService.page(page, queryWrapper);
+ IPage<MdcEquipment> pageList = mdcEquipmentService.pageList(page, mdcEquipment, req);
//鎵归噺鏌ヨ璁惧鐨勬墍灞為儴闂ㄥ拰浜х嚎
//step.1 鍏堟嬁鍒板叏閮ㄧ殑 equipmentIds
@@ -453,4 +451,20 @@
MdcEquipment mdcEquipment = mdcEquipmentService.getEquipmentByPid(pid, userId);
return Result.OK(mdcEquipment);
}
+
+ /**
+ * 鏍规嵁閮ㄩ棬灞傜骇鏌ヨ鍗曚釜璁惧
+ *
+ * @param pid
+ * @return
+ */
+ @AutoLog(value = "璁惧琛�-鏍规嵁閮ㄩ棬灞傜骇鏌ヨ鍗曚釜璁惧")
+ @ApiOperation(value = "璁惧琛�-鏍规嵁閮ㄩ棬灞傜骇鏌ヨ鍗曚釜璁惧", notes = "璁惧琛�-鏍规嵁閮ㄩ棬灞傜骇鏌ヨ鍗曚釜璁惧")
+ @GetMapping("/getEquipmentByDepPid")
+ public Result<MdcEquipment> getEquipmentByDepPid(@RequestParam(name = "pid", required = false) String pid) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ MdcEquipment mdcEquipment = mdcEquipmentService.getEquipmentByDepPid(pid, userId);
+ return Result.OK(mdcEquipment);
+ }
}
--
Gitblit v1.9.3