From 9c1d7ce35cc8c7dc81e0b259fb3b52211aa2f1bf Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期三, 09 二月 2022 13:55:11 +0800
Subject: [PATCH] bug
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
index 09fc5c3..5ed99cf 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
@@ -252,16 +252,21 @@
@RequestMapping(value = "/signFor", method = RequestMethod.POST)
@ApiOperation(value = "绛炬敹")
- public Object signFor(String orderId,int status,String content,String customerReceiveId,int time) {
+ public Object signFor(String orderId,int status,String content,String customerReceiveId,int time,String carId) {
if(status==1){
if(StrUtil.isEmpty(customerReceiveId)){
return ResultUtil.error("姝ｅ父绛炬敹锛屾帴璐т汉id蹇呭～");
}
}
+
+ if(StrUtil.isEmpty(carId)){
+ return ResultUtil.error("杞﹁締id涓嶈兘涓虹┖");
+ }
OrderTask orderTask = iOrderTaskService.getById(orderId);
orderTask.setStatus(status);
orderTask.setUserId(securityUtil.getCurrUser().getId());
orderTask.setTime(time);
+ orderTask.setCarId(carId);
if(StrUtil.isNotEmpty(customerReceiveId)){
orderTask.setCustomerReceiveId(customerReceiveId);
}
@@ -288,7 +293,7 @@
@ApiOperation(value = "鍒嗛〉鑾峰彇")
public Result<IPage<OrderTask>> getByPage(PageVo page) {
- IPage<OrderTask> data = iOrderTaskService.page(PageUtil.initMpPage(page));
+ IPage<OrderTask> data = iOrderTaskService.page2(PageUtil.initMpPage(page));
return new ResultUtil<IPage<OrderTask>>().setData(data);
}
--
Gitblit v1.9.1