From 0b64efc97ee0594a84f28d23c847f738d68eae6d Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期一, 17 七月 2023 17:09:55 +0800
Subject: [PATCH] 加工数量
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcProcessQuantityController.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcProcessQuantityController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcProcessQuantityController.java
index 2735266..1bd0fbe 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcProcessQuantityController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcProcessQuantityController.java
@@ -9,13 +9,17 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.mdc.dto.MdcProcessQuantityDto;
import org.jeecg.modules.mdc.entity.MdcProcessQuantity;
+import org.jeecg.modules.mdc.entity.MdcStandardProcessDuration;
import org.jeecg.modules.mdc.service.IMdcProcessQuantityService;
@@ -55,9 +59,10 @@
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<MdcProcessQuantity> queryWrapper = QueryGenerator.initQueryWrapper(mdcProcessQuantity, req.getParameterMap());
- Page<MdcProcessQuantity> page = new Page<MdcProcessQuantity>(pageNo, pageSize);
- IPage<MdcProcessQuantity> pageList = mdcProcessQuantityService.page(page, queryWrapper);
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ Page<MdcProcessQuantityDto> page = new Page<MdcProcessQuantityDto>(pageNo, pageSize);
+ IPage<MdcProcessQuantityDto> pageList = mdcProcessQuantityService.pageList(userId, page, mdcProcessQuantity, req);
return Result.OK(pageList);
}
@@ -127,8 +132,8 @@
@ApiOperation(value = "鍔犲伐鏁伴噺琛�-閫氳繃id鏌ヨ", notes = "鍔犲伐鏁伴噺琛�-閫氳繃id鏌ヨ")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
- MdcProcessQuantity mdcProcessQuantity = mdcProcessQuantityService.getById(id);
- return Result.OK(mdcProcessQuantity);
+ MdcProcessQuantityDto dto = mdcProcessQuantityService.findById(id);
+ return Result.OK(dto);
}
/**
@@ -139,7 +144,9 @@
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MdcProcessQuantity mdcProcessQuantity) {
- return super.exportXls(request, mdcProcessQuantity, MdcProcessQuantity.class, "鍔犲伐鏁伴噺琛�");
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ return mdcProcessQuantityService.exportXls(userId, mdcProcessQuantity);
}
/**
--
Gitblit v1.9.3