From ecc26b7331cf87605e0a5d14ad645b5fe7a3c8ae Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期五, 26 十一月 2021 08:48:58 +0800
Subject: [PATCH] 违章记录
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 6 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..4e8a104 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
@@ -8,12 +8,10 @@
import cn.exrick.xboot.core.entity.User;
import cn.exrick.xboot.core.service.UserService;
import cn.exrick.xboot.your.entity.Area;
+import cn.exrick.xboot.your.entity.AreaSection;
import cn.exrick.xboot.your.entity.OrderDetail;
import cn.exrick.xboot.your.entity.OrderTask;
-import cn.exrick.xboot.your.service.IAreaService;
-import cn.exrick.xboot.your.service.ICustomerService;
-import cn.exrick.xboot.your.service.IOrderDetailService;
-import cn.exrick.xboot.your.service.IOrderTaskService;
+import cn.exrick.xboot.your.service.*;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -58,6 +56,9 @@
@Autowired
private UserService userService;
+ @Autowired
+ private IAreaSectionService iAreaSectionService;
+
@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
@ApiOperation(value = "閫氳繃id鑾峰彇")
public Result<OrderTask> get(@PathVariable String id) {
@@ -80,13 +81,20 @@
String format = DateUtil.format(new Date(), "yyyy-MM-dd");
wrapper2.eq("area_id",area.getId());
wrapper2.eq("send_date",format);
- int count = iOrderTaskService.count(wrapper2);
+ List<OrderTask> list = iOrderTaskService.list(wrapper2);
int sum = iOrderTaskService.sum(area.getId(),format);
Map<String,Object> map = new HashMap<String,Object>();
- map.put("count",count);
+ map.put("count",list.size());
map.put("sum",sum);
+ map.put("name","");
+ if(list.size()>0){
+ String areaSectionId = list.get(0).getAreaSectionId();
+ AreaSection a = iAreaSectionService.getById(areaSectionId);
+ map.put("name",a.getName());
+ list.clear();
+ }
return new ResultUtil<Object>().setData(map);
}
@@ -205,6 +213,41 @@
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,String customerReceiveId) {
+ if(status==1){
+ if(StrUtil.isEmpty(customerReceiveId)){
+ return ResultUtil.error("姝ｅ父绛炬敹锛屾帴璐т汉id蹇呭～");
+ }
+ }
+ OrderTask orderTask = iOrderTaskService.getById(orderId);
+ orderTask.setStatus(status);
+ orderTask.setUserId(securityUtil.getCurrUser().getId());
+ if(StrUtil.isNotEmpty(customerReceiveId)){
+ orderTask.setCustomerReceiveId(customerReceiveId);
+ }
+
+ 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