From 6f81429892b6e751056ba250a19a6ecf746fa729 Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期二, 09 十一月 2021 10:17:20 +0800
Subject: [PATCH] 违章记录
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java | 3 +
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java | 64 +++++++++++++++++++++++++++++++
xboot-core/src/main/java/cn/exrick/xboot/core/common/utils/PageUtil.java | 2
3 files changed, 67 insertions(+), 2 deletions(-)
diff --git a/xboot-core/src/main/java/cn/exrick/xboot/core/common/utils/PageUtil.java b/xboot-core/src/main/java/cn/exrick/xboot/core/common/utils/PageUtil.java
index 933fb90..29adf34 100644
--- a/xboot-core/src/main/java/cn/exrick/xboot/core/common/utils/PageUtil.java
+++ b/xboot-core/src/main/java/cn/exrick/xboot/core/common/utils/PageUtil.java
@@ -178,7 +178,7 @@
param = param.toLowerCase();
// 鍒ゆ柇鏄惁鍖呭惈闈炴硶瀛楃
for (String keyword : KEYWORDS) {
- if (param.contains(keyword)) {
+ if (param.equals(keyword)) {
throw new XbootException(param + "鍖呭惈闈炴硶瀛楃");
}
}
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..5fef915 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,6 +5,8 @@
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.User;
+import cn.exrick.xboot.core.service.UserService;
import cn.exrick.xboot.your.entity.Area;
import cn.exrick.xboot.your.entity.OrderDetail;
import cn.exrick.xboot.your.entity.OrderTask;
@@ -52,6 +54,9 @@
@Autowired
private SecurityUtil securityUtil;
+
+ @Autowired
+ private UserService userService;
@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
@ApiOperation(value = "閫氳繃id鑾峰彇")
@@ -125,7 +130,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 +148,63 @@
return new ResultUtil<OrderTask>().setData(orderTask);
}
+ @RequestMapping(value = "/getTodayOtherInfo", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇鍏跺畠淇℃伅")
+ public Result<Object> getTodayOtherInfo() {
+
+ QueryWrapper<Area> wrapper = new QueryWrapper<Area>();
+ wrapper.eq("user_id",securityUtil.getCurrUser().getId());
+ Area area = iAreaService.getOne(wrapper);
+ 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);
+ return new ResultUtil<Object>().setData(map);
+ }
+
@RequestMapping(value = "/getByPage", method = RequestMethod.GET)
@ApiOperation(value = "鍒嗛〉鑾峰彇")
public Result<IPage<OrderTask>> getByPage(PageVo page) {
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java
index cfb68f3..a344651 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java
@@ -55,6 +55,9 @@
@ApiModelProperty(value = "0:姝ｅ父 1:涓嶆椿璺冿紙榛樿=0锛�")
private int status;
+ @ApiModelProperty(value = "1锛氶渶瑕佸嫎楠岋紝2锛氬凡鍕橀獙")
+ private Integer kstatus;
+
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "涓婃閰嶉�佹棩鏈�")
--
Gitblit v1.9.1