From f9c42e6879387bdad34e714d7a91add2bb182934 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期一, 10 七月 2023 11:23:53 +0800
Subject: [PATCH] 扭矩配置导入导出分页列表接口bug修复
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java
index bd70b6f..7981de8 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.mdc.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,7 +14,6 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcTorqueConfig;
import org.jeecg.modules.mdc.service.IMdcTorqueConfigService;
-import org.jeecg.modules.mdc.vo.MdcTorqueConfigVo;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -54,17 +54,17 @@
/**
* 鎵煩閰嶇疆绠＄悊-鏂板
*
- * @param torqueVo
+ * @param mdcTorqueConfig
* @return
*/
@AutoLog(value = "鎵煩閰嶇疆绠＄悊-鏂板")
@ApiOperation(value = "鎵煩閰嶇疆绠＄悊-鏂板", notes = "鎵煩閰嶇疆绠＄悊-鏂板")
@PostMapping("/addMdcTorqueConfig")
- public Result addMdcTorqueConfig(@RequestBody MdcTorqueConfigVo torqueVo) {
- if (StringUtils.isBlank(torqueVo.getEquipmentIds())) {
+ public Result addMdcTorqueConfig(@RequestBody MdcTorqueConfig mdcTorqueConfig) {
+ if (StringUtils.isBlank(mdcTorqueConfig.getEquipmentIds())) {
return Result.error("鏈�夋嫨璁惧锛岃鎺掓煡");
}
- boolean result = mdcTorqueConfigService.addTorque(torqueVo);
+ boolean result = mdcTorqueConfigService.addTorque(mdcTorqueConfig);
if (!result) {
return Result.error("鏃堕棿娈垫暟鎹凡瀛樺湪锛岃鎺掓煡");
}
@@ -125,7 +125,9 @@
@ApiOperation(value = "鎵煩閰嶇疆绠＄悊-瀵煎嚭", notes = "鎵煩閰嶇疆绠＄悊-瀵煎嚭")
@RequestMapping("/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MdcTorqueConfig mdcTorqueConfig) {
- return super.exportXls(request, mdcTorqueConfig, MdcTorqueConfig.class, "鎵煩閰嶇疆绠＄悊瀵煎嚭");
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ return this.mdcTorqueConfigService.exportXls(userId, mdcTorqueConfig);
}
/**
--
Gitblit v1.9.3