From 79627e2640e38dd65bc6ed7af54980cc43fc0483 Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期三, 17 十一月 2021 11:28:27 +0800
Subject: [PATCH] 修改
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java | 20 ++++++++++++++------
1 files changed, 14 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 74d6508..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);
}
--
Gitblit v1.9.1