From fe2b2e037a91fbc22bd887174d37c7dd229333d3 Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期二, 09 十一月 2021 15:02:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 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 5fef915..11ed8e9 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
@@ -205,6 +205,33 @@
return new ResultUtil<Object>().setData(map);
}
+ @RequestMapping(value = "/addImg", method = RequestMethod.POST)
+ @ApiOperation(value = "涓婁紶闂ㄥご鐓�")
+ public Object saveOrUpdate(String orderId,String imgUrl) {
+ OrderTask orderTask = iOrderTaskService.getById(orderId);
+ orderTask.setImg(imgUrl);
+ iOrderTaskService.saveOrUpdate(orderTask);
+ return ResultUtil.success("娣诲姞鎴愬姛");
+ }
+
+ @RequestMapping(value = "/signFor", method = RequestMethod.POST)
+ @ApiOperation(value = "绛炬敹")
+ public Object signFor(String orderId,int status,String content) {
+ OrderTask orderTask = iOrderTaskService.getById(orderId);
+ orderTask.setStatus(status);
+ orderTask.setUserId(securityUtil.getCurrUser().getId());
+
+ if(!StrUtil.isEmpty(content)){
+ orderTask.setRemarks(content);
+ }else{
+ if(status==2){
+ return ResultUtil.error("璇峰～鍐欏紓甯哥鏀跺師鍥�");
+ }
+ }
+ iOrderTaskService.saveOrUpdate(orderTask);
+ return ResultUtil.success("娣诲姞鎴愬姛");
+ }
+
@RequestMapping(value = "/getByPage", method = RequestMethod.GET)
@ApiOperation(value = "鍒嗛〉鑾峰彇")
public Result<IPage<OrderTask>> getByPage(PageVo page) {
--
Gitblit v1.9.1