From 45f273a2bdef5db34da34a1ac72ee26da5452c8d Mon Sep 17 00:00:00 2001
From: yb <1113799@qq.com>
Date: 星期四, 11 九月 2025 11:00:22 +0800
Subject: [PATCH] 倍率统计服务bug调整
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentMagnificationController.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentMagnificationController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentMagnificationController.java
index b1703bc..39b9f53 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentMagnificationController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentMagnificationController.java
@@ -10,15 +10,17 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcEquipmentMagnification;
+import org.jeecg.modules.mdc.entity.MdcProcessQuantity;
import org.jeecg.modules.mdc.service.IMdcEquipmentMagnificationService;
import org.jeecg.modules.mdc.vo.MdcEquipmentMagnificationVo;
+import org.jeecg.modules.mdc.vo.MdcMagnificationVo;
+import org.jeecg.modules.mdc.vo.MdcProcessQuantityVo;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
@Slf4j
@Api(tags = "鍊嶇巼缁熻")
@@ -48,4 +50,35 @@
IPage<MdcEquipmentMagnification> pageList = service.pageList(userId,magnificationVo,pageNo, pageSize, req);
return Result.OK(pageList);
}
+
+
+
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param magnificationVo
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, MdcEquipmentMagnificationVo magnificationVo) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ return service.exportXls(userId, magnificationVo);
+ }
+
+ /**
+ * 鍊嶇巼鎶ヨ〃
+ * @param magnificationVo
+ * @return
+ */
+ @AutoLog(value = "鍊嶇巼鎶ヨ〃")
+ @ApiOperation(value = "鍊嶇巼鎶ヨ〃", notes = "鍊嶇巼鎶ヨ〃")
+ @RequestMapping(value = "/beilvList")
+ public MdcMagnificationVo beilvList(MdcEquipmentMagnificationVo magnificationVo) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ MdcMagnificationVo vo = service.beilvsList(magnificationVo,userId);
+ return vo;
+ }
}
--
Gitblit v1.9.3