From 72ba09f4055bcaadca22530929408a3fcd74ceee Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期三, 08 十二月 2021 14:35:13 +0800
Subject: [PATCH] 违章记录
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java | 19 +++++++++++++++++--
1 files changed, 17 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 5b18749..09a0843 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
@@ -5,7 +5,9 @@
import cn.exrick.xboot.core.common.utils.SecurityUtil;
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
+import cn.exrick.xboot.core.entity.Department;
import cn.exrick.xboot.core.entity.User;
+import cn.exrick.xboot.core.service.DepartmentService;
import cn.exrick.xboot.core.service.UserService;
import cn.exrick.xboot.your.entity.*;
import cn.exrick.xboot.your.service.*;
@@ -59,6 +61,9 @@
@Autowired
private ICarService iCarService;
+ @Autowired
+ private DepartmentService departmentService;
+
@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
@ApiOperation(value = "閫氳繃id鑾峰彇")
public Result<OrderTask> get(@PathVariable String id) {
@@ -105,11 +110,21 @@
map.put("sum",sum);
map.put("name","");
if(list.size()>0){
- String areaSectionId = list.get(0).getAreaSectionId();
+ OrderTask orderTask = list.get(0);
+ String areaSectionId = orderTask.getAreaSectionId();
AreaSection a = iAreaSectionService.getById(areaSectionId);
- map.put("name",a.getName());
+ Area area2 = iAreaService.getById(orderTask.getAreaId());
+ map.put("name",area2.getName()+a.getName());
list.clear();
}
+ map.put("lng","");
+ map.put("lat","");
+ List<String> deparmentIds = securityUtil.getDeparmentIds();
+ if(deparmentIds.size()>0){
+ Department department = departmentService.get(deparmentIds.get(0));
+ map.put("lng",department.getLng());
+ map.put("lat",department.getLat());
+ }
return new ResultUtil<Object>().setData(map);
}
--
Gitblit v1.9.1