From ae32c3a7d77e2ed114555623c70e3fbd1d6aba59 Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期四, 10 三月 2022 08:47:45 +0800
Subject: [PATCH] 违章记录
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java | 105 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 77 insertions(+), 28 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 09fc5c3..47dd585 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
@@ -75,33 +75,62 @@
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);
+// 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);
+// if(one==null){
+// return null;
+// }
+// if(StrUtil.isEmpty(one.getFollowUserId())){
+// return null;
+// }
+//
+// QueryWrapper<Area> wrapper3 = new QueryWrapper<Area>();
+// wrapper3.eq("user_id",one.getFollowUserId());
+// area = iAreaService.getOne(wrapper3);
+// return area;
+// }
+// return area;
+// }
- QueryWrapper<Area> wrapper3 = new QueryWrapper<Area>();
- wrapper3.eq("user_id",one.getFollowUserId());
- area = iAreaService.getOne(wrapper3);
+
+ private String getFormatDate(String sendTime){
+ if(StrUtil.isNotEmpty(sendTime)){
+ return sendTime;
+ }else{
+ return DateUtil.format(new Date(), "yyyy-MM-dd");
+ }
+ }
+
+ public Area getArea(String userId){
+ QueryWrapper<Car> carQueryWrapper = new QueryWrapper<Car>();
+ carQueryWrapper.eq("user_id",userId).or().eq("follow_user_id",userId);
+ Car one = iCarService.getOne(carQueryWrapper);
+ if(one==null){
+ return null;
+ }else{
+ QueryWrapper<Area> wrapper = new QueryWrapper<Area>();
+ wrapper.eq("car_id",one.getId());
+ Area area = iAreaService.getOne(wrapper);
return area;
}
- return area;
}
@RequestMapping(value = "/getByUserId", method = RequestMethod.GET)
@ApiOperation(value = "鑾峰彇浠婃棩浠诲姟缁熻淇℃伅")
- public Result<Object> getAll() {
+ public Result<Object> getAll(String sendTime) {
Area area = getArea(securityUtil.getCurrUser().getId());
if(area==null){
- return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾鐗囧尯閰嶉�佸憳");
+ return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾璇ヨ溅杈�");
}
QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
- String format = DateUtil.format(new Date(), "yyyy-MM-dd");
+ String format = getFormatDate(sendTime);
wrapper2.eq("area_id",area.getId());
wrapper2.eq("send_date",format);
List<OrderTask> list = iOrderTaskService.list(wrapper2);
@@ -124,25 +153,25 @@
}
@RequestMapping(value = "/getTodayOrder", method = RequestMethod.GET)
- @ApiOperation(value = "鑾峰彇浠婃棩浠诲姟璇︽儏")
- public Result<List<OrderTask>> getTodayOrder() {
+ @ApiOperation(value = "鑾峰彇浠婃棩閰嶉�佷换鍔¤鎯呭垪琛�")
+ public Result<List<OrderTask>> getTodayOrder(String sendTime) {
Area area = getArea(securityUtil.getCurrUser().getId());
if(area==null){
- return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾鐗囧尯閰嶉�佸憳");
+ return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾璇ヨ溅杈�");
}
QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
- String format = DateUtil.format(new Date(), "yyyy-MM-dd");
+ String format = getFormatDate(sendTime);
wrapper2.eq("a.area_id",area.getId());
wrapper2.eq("a.send_date",format);
- wrapper2.orderByAsc("a.seq");
+ wrapper2.orderByAsc("a.seq").orderByAsc("a.status");
List<OrderTask> list = iOrderTaskService.list2(wrapper2);
return new ResultUtil<List<OrderTask>>().setData(list);
}
@RequestMapping(value = "/getTodayOrderDetail", method = RequestMethod.GET)
@ApiOperation(value = "鑾峰彇褰撳墠閰嶉�佸晢鎴疯鎯�")
- public Result<OrderTask> getTodayOrderDetail(String orderId) {
+ public Result<OrderTask> getTodayOrderDetail(String orderId,String sendTime) {
OrderTask orderTask = new OrderTask();
if(!StrUtil.isEmpty(orderId)){
orderTask = iOrderTaskService.getById(orderId);
@@ -152,11 +181,11 @@
}else{
Area area = getArea(securityUtil.getCurrUser().getId());
if(area==null){
- return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾鐗囧尯閰嶉�佸憳");
+ return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾璇ヨ溅杈�");
}
QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
- String format = DateUtil.format(new Date(), "yyyy-MM-dd");
+ String format = getFormatDate(sendTime);
wrapper2.eq("area_id",area.getId());
wrapper2.eq("send_date",format);
wrapper2.eq("status",0);
@@ -179,15 +208,15 @@
@RequestMapping(value = "/getTodayOtherInfo", method = RequestMethod.GET)
@ApiOperation(value = "鑾峰彇鍏跺畠淇℃伅")
- public Result<Object> getTodayOtherInfo() {
+ public Result<Object> getTodayOtherInfo(String sendTime) {
Area area = getArea(securityUtil.getCurrUser().getId());
if(area==null){
- return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾鐗囧尯閰嶉�佸憳");
+ return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾璇ヨ溅杈�");
}
QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
- String format = DateUtil.format(new Date(), "yyyy-MM-dd");
+ String format = getFormatDate(sendTime);
wrapper2.eq("area_id",area.getId());
wrapper2.eq("send_date",format);
wrapper2.ne("status",0);
@@ -252,16 +281,21 @@
@RequestMapping(value = "/signFor", method = RequestMethod.POST)
@ApiOperation(value = "绛炬敹")
- public Object signFor(String orderId,int status,String content,String customerReceiveId,int time) {
+ public Object signFor(String orderId,int status,String content,String customerReceiveId,int time,String carId) {
if(status==1){
if(StrUtil.isEmpty(customerReceiveId)){
return ResultUtil.error("姝ｅ父绛炬敹锛屾帴璐т汉id蹇呭～");
}
}
+
+ if(StrUtil.isEmpty(carId)){
+ return ResultUtil.error("杞﹁締id涓嶈兘涓虹┖");
+ }
OrderTask orderTask = iOrderTaskService.getById(orderId);
orderTask.setStatus(status);
orderTask.setUserId(securityUtil.getCurrUser().getId());
orderTask.setTime(time);
+ orderTask.setCarId(carId);
if(StrUtil.isNotEmpty(customerReceiveId)){
orderTask.setCustomerReceiveId(customerReceiveId);
}
@@ -284,11 +318,26 @@
return ResultUtil.success("娣诲姞鎴愬姛");
}
+ @RequestMapping(value = "/getTaKan", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇韪忓嫎鍟嗘埛")
+ public Result<List<Customer>> getTaKan() {
+ Area area = getArea(securityUtil.getCurrUser().getId());
+ if(area==null){
+ return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾璇ヨ溅杈�");
+ }
+
+ QueryWrapper<Customer> wrapper2 = new QueryWrapper<Customer>();
+ wrapper2.eq("area_id",area.getId());
+ wrapper2.eq("kstatus",0);
+ List<Customer> list = iCustomerService.list(wrapper2);
+ return new ResultUtil<List<Customer>>().setData(list);
+ }
+
@RequestMapping(value = "/getByPage", method = RequestMethod.GET)
@ApiOperation(value = "鍒嗛〉鑾峰彇")
public Result<IPage<OrderTask>> getByPage(PageVo page) {
- IPage<OrderTask> data = iOrderTaskService.page(PageUtil.initMpPage(page));
+ IPage<OrderTask> data = iOrderTaskService.page2(PageUtil.initMpPage(page));
return new ResultUtil<IPage<OrderTask>>().setData(data);
}
--
Gitblit v1.9.1