From a41b28d983f46f90a41ff7d2aa47179541c1be99 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 05 六月 2023 17:59:13 +0800
Subject: [PATCH] 修改
---
src/main/java/com/boying/controller/OrderRecordController.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/boying/controller/OrderRecordController.java b/src/main/java/com/boying/controller/OrderRecordController.java
index 90c6d2d..b20267f 100644
--- a/src/main/java/com/boying/controller/OrderRecordController.java
+++ b/src/main/java/com/boying/controller/OrderRecordController.java
@@ -13,6 +13,7 @@
import com.boying.service.OutParkService;
import com.boying.service.ParkService;
import com.boying.service.UserService;
+import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -29,7 +30,7 @@
import java.util.stream.Collectors;
@RestController
-@RequestMapping("orderrecord")
+@RequestMapping("ffzf/orderrecord")
@RequiredArgsConstructor
public class OrderRecordController {
@@ -38,6 +39,37 @@
private final ParkService parkService;
private final UserService userService;
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param page 鍒嗛〉瀵硅薄
+ * @param orderRecord 璁㈠崟琛�
+ * @return
+ */
+ @ApiOperation(value = "鍒嗛〉鏌ヨ", notes = "鍒嗛〉鏌ヨ")
+ @PostMapping("/findPage" )
+ public R getOrderRecordPage(Page page, OrderRecord orderRecord) {
+ QueryWrapper<OrderRecord> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(OrderRecord::getType,orderRecord.getType())
+ .eq(OrderRecord::getStatus,1)
+ .eq(StringUtils.isNotBlank(orderRecord.getCarNo()),OrderRecord::getCarNo,orderRecord.getCarNo())
+ .isNotNull(OrderRecord::getPayCode)
+ .orderByDesc(OrderRecord::getCreateTime);
+ Page page1 = orderRecordService.page(page, wrapper);
+ List<OrderRecord> records = page1.getRecords();
+ for (OrderRecord record : records) {
+ if(record.getImgInId() != null){
+ record.setImgInPath("/ffzf/fileinfo/showImgById/"+record.getImgInId());
+ }
+ if(record.getImgOutId() != null){
+ record.setImgOutPath("/ffzf/fileinfo/showImgById/"+record.getImgOutId());
+ }
+ }
+ page1.setRecords(records);
+ return R.ok(page1);
+ }
+
+
@PostMapping("/getByCarNo")
public Object getByCarNo(Page page,String carNo,String month,String phone) {
List<OrderRecordVo> recordVos = new ArrayList<>();
--
Gitblit v1.9.1