From 76e9e8e05cbe7dafeba51a235386f20ebf986e25 Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期一, 27 十二月 2021 11:54:35 +0800
Subject: [PATCH] 违章记录
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 160 insertions(+), 19 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 b2e05eb..09fc5c3 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,13 +5,12 @@
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.your.entity.Area;
-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.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.*;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -53,6 +52,21 @@
@Autowired
private SecurityUtil securityUtil;
+ @Autowired
+ private UserService userService;
+
+ @Autowired
+ private IAreaSectionService iAreaSectionService;
+
+ @Autowired
+ private ICarService iCarService;
+
+ @Autowired
+ private DepartmentService departmentService;
+
+ @Autowired
+ private IEventLogService iEventLogService;
+
@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
@ApiOperation(value = "閫氳繃id鑾峰彇")
public Result<OrderTask> get(@PathVariable String id) {
@@ -61,12 +75,27 @@
return new ResultUtil<OrderTask>().setData(orderTask);
}
+ public Area getArea(String userId){
+ QueryWrapper<Area> wrapper = new QueryWrapper<Area>();
+ wrapper.eq("user_id",userId);
+ Area area = iAreaService.getOne(wrapper);
+ if(area==null){
+ QueryWrapper<Car> carQueryWrapper = new QueryWrapper<Car>();
+ carQueryWrapper.eq("user_id",userId);
+ Car one = iCarService.getOne(carQueryWrapper);
+
+ QueryWrapper<Area> wrapper3 = new QueryWrapper<Area>();
+ wrapper3.eq("user_id",one.getFollowUserId());
+ area = iAreaService.getOne(wrapper3);
+ return area;
+ }
+ return area;
+ }
+
@RequestMapping(value = "/getByUserId", method = RequestMethod.GET)
@ApiOperation(value = "鑾峰彇浠婃棩浠诲姟缁熻淇℃伅")
public Result<Object> getAll() {
- QueryWrapper<Area> wrapper = new QueryWrapper<Area>();
- wrapper.eq("user_id",securityUtil.getCurrUser().getId());
- Area area = iAreaService.getOne(wrapper);
+ Area area = getArea(securityUtil.getCurrUser().getId());
if(area==null){
return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾鐗囧尯閰嶉�佸憳");
}
@@ -75,22 +104,29 @@
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){
+ OrderTask orderTask = list.get(0);
+ String areaSectionId = orderTask.getAreaSectionId();
+ AreaSection a = iAreaSectionService.getById(areaSectionId);
+ Area area2 = iAreaService.getById(orderTask.getAreaId());
+ map.put("name",area2.getName()+a.getName());
+ list.clear();
+ }
return new ResultUtil<Object>().setData(map);
}
@RequestMapping(value = "/getTodayOrder", method = RequestMethod.GET)
@ApiOperation(value = "鑾峰彇浠婃棩浠诲姟璇︽儏")
public Result<List<OrderTask>> getTodayOrder() {
- QueryWrapper<Area> wrapper = new QueryWrapper<Area>();
- wrapper.eq("user_id",securityUtil.getCurrUser().getId());
- Area area = iAreaService.getOne(wrapper);
+ Area area = getArea(securityUtil.getCurrUser().getId());
if(area==null){
return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾鐗囧尯閰嶉�佸憳");
}
@@ -114,9 +150,7 @@
return ResultUtil.error("姝ゅ晢鎴峰凡閰嶉��");
}
}else{
- QueryWrapper<Area> wrapper = new QueryWrapper<Area>();
- wrapper.eq("user_id",securityUtil.getCurrUser().getId());
- Area area = iAreaService.getOne(wrapper);
+ Area area = getArea(securityUtil.getCurrUser().getId());
if(area==null){
return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾鐗囧尯閰嶉�佸憳");
}
@@ -125,7 +159,7 @@
String format = DateUtil.format(new Date(), "yyyy-MM-dd");
wrapper2.eq("area_id",area.getId());
wrapper2.eq("send_date",format);
- wrapper2.ne("status",0);
+ wrapper2.eq("status",0);
wrapper2.orderByAsc("seq");
List<OrderTask> list = iOrderTaskService.list(wrapper2);
if(list.size()>0){
@@ -143,6 +177,113 @@
return new ResultUtil<OrderTask>().setData(orderTask);
}
+ @RequestMapping(value = "/getTodayOtherInfo", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇鍏跺畠淇℃伅")
+ public Result<Object> getTodayOtherInfo() {
+
+ Area area = getArea(securityUtil.getCurrUser().getId());
+ if(area==null){
+ return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾鐗囧尯閰嶉�佸憳");
+ }
+
+ QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
+ String format = DateUtil.format(new Date(), "yyyy-MM-dd");
+ wrapper2.eq("area_id",area.getId());
+ wrapper2.eq("send_date",format);
+ wrapper2.ne("status",0);
+ wrapper2.orderByAsc("seq");
+ int count = iOrderTaskService.count(wrapper2);
+
+
+ QueryWrapper<OrderTask> wrapper4 = new QueryWrapper<OrderTask>();
+ wrapper4.eq("area_id",area.getId());
+ wrapper4.eq("send_date",format);
+ int count2 = iOrderTaskService.count(wrapper4);
+
+
+ Map<String,Object> map = new HashMap<>();
+ map.put("num",count+"/"+count2);
+
+ QueryWrapper<OrderTask> wrapper5 = new QueryWrapper<OrderTask>();
+ wrapper5.ne("status",0);
+ wrapper5.eq("send_date",format);
+
+ PageVo page = new PageVo();
+ page.setSort("updateTime");
+ page.setOrder("desc");
+ page.setPageSize(1);
+ page.setPageNumber(0);
+ IPage<OrderTask> data = iOrderTaskService.page(PageUtil.initMpPage(page), wrapper5);
+ String content = "";
+ if(data.getRecords().size()>0){
+ String userId = data.getRecords().get(0).getUserId();
+ User user = userService.get(userId);
+
+ QueryWrapper<OrderTask> wrapper6 = new QueryWrapper<OrderTask>();
+ wrapper6.eq("user_id",userId);
+ wrapper6.eq("send_date",format);
+ wrapper6.ne("status",0);
+ int count6 = iOrderTaskService.count(wrapper6);
+ if(count6>0){
+ content+=user.getNickname()+"宸查厤閫�"+count6+"鍗�";
+ }
+ }
+ map.put("content",content);
+
+ map.put("lng","");
+ map.put("lat","");
+ String deptId = securityUtil.getCurrUser().getDepartmentId();
+ if(StrUtil.isNotEmpty(deptId)){
+ Department department = departmentService.get(deptId);
+ map.put("lng",department.getLng());
+ map.put("lat",department.getLat());
+ }
+ 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,int time) {
+ if(status==1){
+ if(StrUtil.isEmpty(customerReceiveId)){
+ return ResultUtil.error("姝ｅ父绛炬敹锛屾帴璐т汉id蹇呭～");
+ }
+ }
+ OrderTask orderTask = iOrderTaskService.getById(orderId);
+ orderTask.setStatus(status);
+ orderTask.setUserId(securityUtil.getCurrUser().getId());
+ orderTask.setTime(time);
+ if(StrUtil.isNotEmpty(customerReceiveId)){
+ orderTask.setCustomerReceiveId(customerReceiveId);
+ }
+
+ if(!StrUtil.isEmpty(content)){
+ orderTask.setRemarks(content);
+ }else{
+ if(status==2){
+ return ResultUtil.error("璇峰～鍐欏紓甯哥鏀跺師鍥�");
+ }
+ }
+ iOrderTaskService.saveOrUpdate(orderTask);
+
+ Car car = iCarService.getById(orderTask.getCarId());
+ EventLog eventLog = new EventLog();
+ eventLog.setCarNo(car.getCarNo());
+ eventLog.setRefId(orderId);
+ eventLog.setType(6);//6:閰嶉�佸畬鎴�
+ iEventLogService.saveOrUpdate(eventLog);
+ return ResultUtil.success("娣诲姞鎴愬姛");
+ }
+
@RequestMapping(value = "/getByPage", method = RequestMethod.GET)
@ApiOperation(value = "鍒嗛〉鑾峰彇")
public Result<IPage<OrderTask>> getByPage(PageVo page) {
--
Gitblit v1.9.1