From 2cf47388b765be947805a51ece7608b27e47650b Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 22 十二月 2023 17:02:21 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java
index 40fdec2..03ca4f0 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java
@@ -56,11 +56,13 @@
@ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
@ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
@ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = "code", value = "缂栧彿", dataType = Constant.QT.STRING, format = "code^LK"),
- @ApiImplicitParam(name = "softwareidentity", value = "椤圭洰鏍囪瘑", dataType = Constant.QT.STRING, format = "softwareIdentity^LK"),
- @ApiImplicitParam(name = "softwarename", value = "椤圭洰鍚嶇О", dataType = Constant.QT.STRING, format = "softwareName^LK")})
+ @ApiImplicitParam(name = "code", value = "缂栧彿", dataType = Constant.QT.STRING, format = "a.code^LK"),
+ @ApiImplicitParam(name = "softwareIdentity", value = "椤圭洰鏍囪瘑", dataType = Constant.QT.STRING, format = "p.software_identity^LK"),
+ @ApiImplicitParam(name = "softwareName", value = "椤圭洰鍚嶇О", dataType = Constant.QT.STRING, format = "p.software_name^LK"),
+ @ApiImplicitParam(name = "pageCode", value = "閰嶇疆椤规爣璇�", dataType = Constant.QT.STRING, format = "a.page_code^LK")})
public PageResult<TestCheckOrder> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
- return PageResult.ok(testCheckOrderService.page(queryFilter));
+ List<TestCheckOrder> testCheckOrder = testCheckOrderService.page(queryFilter);
+ return PageResult.ok(testCheckOrder);
}
@GetMapping("getDto")
@@ -107,10 +109,10 @@
return Result.ok();
}
- /*@GetMapping("exportCheckOrder")
- @ApiOperation("鎵撳嵃娴嬭瘯鐜寤虹珛纭琛�")
- @LogOperation("鎵撳嵃娴嬭瘯鐜寤虹珛纭琛�")
- public void exportEnviron(Long id, HttpServletRequest request, HttpServletResponse response) {
- environService.exportEnviron(id, request, response);
- }*/
+ @GetMapping("exportCheckOrder")
+ @ApiOperation("鎵撳嵃妫�鏌ュ崟")
+ @LogOperation("鎵撳嵃妫�鏌ュ崟")
+ public void exportCheckOrder(Long id, String pageCode, HttpServletRequest request, HttpServletResponse response) {
+ testCheckOrderService.exportCheckOrder(id,pageCode, request, response);
+ }
}
--
Gitblit v1.9.1