From 63c9ec27a1f717cff8b36ad7db23d56e41dfae8f Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 22 七月 2025 20:01:56 +0800
Subject: [PATCH] art: 技术状态鉴定申请-Bug修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java | 35 +++++------------------------------
1 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
index c0ff072..958f9fc 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
@@ -305,31 +305,6 @@
}
/**
- * 瀵煎嚭excel
- *
- * @param request
- * @param eamInspectionOrder
- */
- //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, EamInspectionOrder eamInspectionOrder) {
- return super.exportXls(request, eamInspectionOrder, EamInspectionOrder.class, "鐐规宸ュ崟");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- //@RequiresPermissions("鐐规宸ュ崟:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, EamInspectionOrder.class);
- }
-
- /**
* 瀵煎嚭鑾峰彇鍩烘湰淇℃伅
* @param equipmentCode 缁熶竴缂栫爜
* @param inspectionDate 鏃ユ湡
@@ -337,7 +312,7 @@
*/
@GetMapping("/exportInsOrderBaseInfo")
public JSONObject exportInspectionOrderBaseInfo(@RequestParam(name = "equipmentCode", required = true) String equipmentCode,
- @RequestParam(name = "inspectionDate", required = true) String inspectionDate) {
+ @RequestParam(name = "inspectionDate", required = false) String inspectionDate) {
return eamInspectionOrderService.exportInspectionOrderBaseInfo(equipmentCode, inspectionDate);
}
@@ -349,7 +324,7 @@
*/
@GetMapping("/exportInsOrderDetailList")
public JSONObject exportInspectionOrderDetailList(@RequestParam(name = "equipmentCode", required = true) String equipmentCode,
- @RequestParam(name = "inspectionDate", required = true) String inspectionDate) {
+ @RequestParam(name = "inspectionDate", required = false) String inspectionDate) {
return eamInspectionOrderService.exportInspectionOrderDetailList(equipmentCode, inspectionDate);
}
@@ -361,7 +336,7 @@
*/
@GetMapping("/exportInsOrderDetailUserList")
public JSONObject exportInspectionOrderDetailUserList(@RequestParam(name = "equipmentCode", required = true) String equipmentCode,
- @RequestParam(name = "inspectionDate", required = true) String inspectionDate) {
+ @RequestParam(name = "inspectionDate", required = false) String inspectionDate) {
return eamInspectionOrderService.exportInspectionOrderDetailUserList(equipmentCode, inspectionDate);
}
@@ -373,7 +348,7 @@
*/
@GetMapping("/exportWeekInsDetailList")
public JSONObject exportWeekInsDetailList(@RequestParam(name = "equipmentCode", required = true) String equipmentCode,
- @RequestParam(name = "inspectionDate", required = true) String inspectionDate) {
+ @RequestParam(name = "inspectionDate", required = false) String inspectionDate) {
return eamInspectionOrderService.exportWeekInsDetailList(equipmentCode, inspectionDate);
}
@@ -385,7 +360,7 @@
*/
@GetMapping("/exportWeekInsOrderDetailUserList")
public JSONObject exportInspectionOrder(@RequestParam(name = "equipmentCode", required = true) String equipmentCode,
- @RequestParam(name = "inspectionDate", required = true) String inspectionDate) {
+ @RequestParam(name = "inspectionDate", required = false) String inspectionDate) {
return eamInspectionOrderService.exportWeekInsOrderDetailUserList(equipmentCode, inspectionDate);
}
--
Gitblit v1.9.3