From 433ba5ddafd57d6ce6173a6ba7d2d97851c5a4c6 Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期一, 08 十一月 2021 15:24:36 +0800
Subject: [PATCH] 订单
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/DrivingRecordController.java | 24 +
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/UserStatistic.java | 75 +++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java | 41 ++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java | 30 ++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/UserStatisticMapper.java | 14 +
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IUserStatisticService.java | 14 +
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java | 108 +++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderDetail.java | 40 ++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderDetailMapper.java | 14 +
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/UserStatisticController.java | 89 ++++++
xboot-modules/xboot-your/src/main/resources/mapper/OrderDetailMapper.xml | 5
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java | 18 +
xboot-modules/xboot-your/src/main/resources/mapper/UserStatisticMapper.xml | 5
xboot-modules/xboot-your/src/main/resources/mapper/OrderTaskMapper.xml | 5
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java | 173 ++++++++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderDetailService.java | 14 +
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IUserStatisticServiceImpl.java | 26 +
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/DrivingRecord.java | 5
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderDetailServiceImpl.java | 26 +
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderDetailController.java | 77 +++++
20 files changed, 803 insertions(+), 0 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/DrivingRecordController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/DrivingRecordController.java
index d58b1e4..a25007c 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/DrivingRecordController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/DrivingRecordController.java
@@ -5,7 +5,9 @@
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
import cn.exrick.xboot.your.entity.DrivingRecord;
+import cn.exrick.xboot.your.entity.OrderTask;
import cn.exrick.xboot.your.service.IDrivingRecordService;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,6 +18,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.List;
/**
@@ -31,6 +34,27 @@
@Autowired
private IDrivingRecordService iDrivingRecordService;
+ @RequestMapping(value = "/orderConfirm", method = RequestMethod.POST)
+ @ApiOperation(value = "璁㈠崟纭")
+ public Result<DrivingRecord> orderConfirm(DrivingRecord record) {
+ if(StrUtil.isEmpty(record.getCarId())){
+ return ResultUtil.error("杞﹁締id涓嶈兘涓虹┖");
+ }
+
+ String format = DateUtil.format(new Date(), "yyyy-MM-dd");
+ QueryWrapper<DrivingRecord> wrapper = new QueryWrapper<>();
+ wrapper.eq("driving_date",format);
+ wrapper.eq("car_id",record.getCarId());
+ int count = iDrivingRecordService.count(wrapper);
+ if(count>0){
+ return ResultUtil.error("浠婃棩宸叉牳瀵癸紝璇峰嬁閲嶅鎻愪氦");
+ }
+
+ record.setDrivingDate(DateUtil.parse(format));
+ iDrivingRecordService.saveOrUpdate(record);
+ return ResultUtil.success("鎿嶄綔鎴愬姛");
+ }
+
@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
@ApiOperation(value = "閫氳繃id鑾峰彇")
public Result<DrivingRecord> get(@PathVariable String id) {
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderDetailController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderDetailController.java
new file mode 100644
index 0000000..a2ac584
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderDetailController.java
@@ -0,0 +1,77 @@
+package cn.exrick.xboot.your.controller;
+
+import cn.exrick.xboot.core.common.utils.PageUtil;
+import cn.exrick.xboot.core.common.utils.ResultUtil;
+import cn.exrick.xboot.core.common.vo.PageVo;
+import cn.exrick.xboot.core.common.vo.Result;
+import cn.exrick.xboot.your.entity.OrderDetail;
+import cn.exrick.xboot.your.service.IOrderDetailService;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @author whj
+ */
+@Slf4j
+@RestController
+@Api(tags = "璁㈠崟璇︽儏琛ㄧ鐞嗘帴鍙�")
+@RequestMapping("/xboot/orderDetail")
+@Transactional
+public class OrderDetailController {
+
+ @Autowired
+ private IOrderDetailService iOrderDetailService;
+
+ @RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
+ @ApiOperation(value = "閫氳繃id鑾峰彇")
+ public Result<OrderDetail> get(@PathVariable String id) {
+
+ OrderDetail orderDetail = iOrderDetailService.getById(id);
+ return new ResultUtil<OrderDetail>().setData(orderDetail);
+ }
+
+ @RequestMapping(value = "/getAll", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇鍏ㄩ儴鏁版嵁")
+ public Result<List<OrderDetail>> getAll() {
+
+ List<OrderDetail> list = iOrderDetailService.list();
+ return new ResultUtil<List<OrderDetail>>().setData(list);
+ }
+
+ @RequestMapping(value = "/getByPage", method = RequestMethod.GET)
+ @ApiOperation(value = "鍒嗛〉鑾峰彇")
+ public Result<IPage<OrderDetail>> getByPage(PageVo page) {
+
+ IPage<OrderDetail> data = iOrderDetailService.page(PageUtil.initMpPage(page));
+ return new ResultUtil<IPage<OrderDetail>>().setData(data);
+ }
+
+ @RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST)
+ @ApiOperation(value = "缂栬緫鎴栨洿鏂版暟鎹�")
+ public Result<OrderDetail> saveOrUpdate(OrderDetail orderDetail) {
+
+ if (iOrderDetailService.saveOrUpdate(orderDetail)) {
+ return new ResultUtil<OrderDetail>().setData(orderDetail);
+ }
+ return new ResultUtil<OrderDetail>().setErrorMsg("鎿嶄綔澶辫触");
+ }
+
+ @RequestMapping(value = "/delByIds", method = RequestMethod.POST)
+ @ApiOperation(value = "鎵归噺閫氳繃id鍒犻櫎")
+ public Result<Object> delAllByIds(@RequestParam String[] ids) {
+
+ for (String id : ids) {
+ iOrderDetailService.removeById(id);
+ }
+ return ResultUtil.success("鎵归噺閫氳繃id鍒犻櫎鏁版嵁鎴愬姛");
+ }
+}
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
new file mode 100644
index 0000000..b2e05eb
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
@@ -0,0 +1,173 @@
+package cn.exrick.xboot.your.controller;
+
+import cn.exrick.xboot.core.common.utils.PageUtil;
+import cn.exrick.xboot.core.common.utils.ResultUtil;
+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.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author whj
+ */
+@Slf4j
+@RestController
+@Api(tags = "璁㈠崟鎺ュ彛")
+@RequestMapping("/xboot/orderTask")
+@Transactional
+public class OrderTaskController {
+
+ @Autowired
+ private IOrderTaskService iOrderTaskService;
+
+ @Autowired
+ private IAreaService iAreaService;
+
+ @Autowired
+ private ICustomerService iCustomerService;
+
+ @Autowired
+ private IOrderDetailService iOrderDetailService;
+
+ @Autowired
+ private SecurityUtil securityUtil;
+
+ @RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
+ @ApiOperation(value = "閫氳繃id鑾峰彇")
+ public Result<OrderTask> get(@PathVariable String id) {
+
+ OrderTask orderTask = iOrderTaskService.getById(id);
+ return new ResultUtil<OrderTask>().setData(orderTask);
+ }
+
+ @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);
+ 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);
+ int count = iOrderTaskService.count(wrapper2);
+
+ int sum = iOrderTaskService.sum(area.getId(),format);
+
+ Map<String,Object> map = new HashMap<String,Object>();
+ map.put("count",count);
+ map.put("sum",sum);
+ 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);
+ if(area==null){
+ return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾鐗囧尯閰嶉�佸憳");
+ }
+
+ QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
+ String format = DateUtil.format(new Date(), "yyyy-MM-dd");
+ wrapper2.eq("a.area_id",area.getId());
+ wrapper2.eq("a.send_date",format);
+ wrapper2.orderByAsc("a.seq");
+ 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) {
+ OrderTask orderTask = new OrderTask();
+ if(!StrUtil.isEmpty(orderId)){
+ orderTask = iOrderTaskService.getById(orderId);
+ if(orderTask.getStatus()!=0){
+ return ResultUtil.error("姝ゅ晢鎴峰凡閰嶉��");
+ }
+ }else{
+ 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");
+ List<OrderTask> list = iOrderTaskService.list(wrapper2);
+ if(list.size()>0){
+ orderTask = list.get(0);
+ }else{
+ return new ResultUtil<OrderTask>().setData(null);
+ }
+ }
+
+ orderTask.setCustomer(iCustomerService.getById(orderTask.getCustomerId()));
+ QueryWrapper<OrderDetail> wrapper3 = new QueryWrapper<OrderDetail>();
+ wrapper3.eq("order_id",orderTask.getId());
+ orderTask.setOrderDetails(iOrderDetailService.list(wrapper3));
+
+ return new ResultUtil<OrderTask>().setData(orderTask);
+ }
+
+ @RequestMapping(value = "/getByPage", method = RequestMethod.GET)
+ @ApiOperation(value = "鍒嗛〉鑾峰彇")
+ public Result<IPage<OrderTask>> getByPage(PageVo page) {
+
+ IPage<OrderTask> data = iOrderTaskService.page(PageUtil.initMpPage(page));
+ return new ResultUtil<IPage<OrderTask>>().setData(data);
+ }
+
+ @RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST)
+ @ApiOperation(value = "缂栬緫鎴栨洿鏂版暟鎹�")
+ public Result<OrderTask> saveOrUpdate(OrderTask orderTask) {
+
+ if (iOrderTaskService.saveOrUpdate(orderTask)) {
+ return new ResultUtil<OrderTask>().setData(orderTask);
+ }
+ return new ResultUtil<OrderTask>().setErrorMsg("鎿嶄綔澶辫触");
+ }
+
+ @RequestMapping(value = "/delByIds", method = RequestMethod.POST)
+ @ApiOperation(value = "鎵归噺閫氳繃id鍒犻櫎")
+ public Result<Object> delAllByIds(@RequestParam String[] ids) {
+
+ for (String id : ids) {
+ iOrderTaskService.removeById(id);
+ }
+ return ResultUtil.success("鎵归噺閫氳繃id鍒犻櫎鏁版嵁鎴愬姛");
+ }
+}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/UserStatisticController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/UserStatisticController.java
new file mode 100644
index 0000000..c5a00b1
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/UserStatisticController.java
@@ -0,0 +1,89 @@
+package cn.exrick.xboot.your.controller;
+
+import cn.exrick.xboot.core.common.utils.PageUtil;
+import cn.exrick.xboot.core.common.utils.ResultUtil;
+import cn.exrick.xboot.core.common.vo.PageVo;
+import cn.exrick.xboot.core.common.vo.Result;
+import cn.exrick.xboot.your.entity.UserStatistic;
+import cn.exrick.xboot.your.service.IUserStatisticService;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @author whj
+ */
+@Slf4j
+@RestController
+@Api(tags = "鐢ㄦ埛缁熻琛ㄧ鐞嗘帴鍙�")
+@RequestMapping("/xboot/userStatistic")
+@Transactional
+public class UserStatisticController {
+
+ @Autowired
+ private IUserStatisticService iUserStatisticService;
+
+ @RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
+ @ApiOperation(value = "閫氳繃id鑾峰彇")
+ public Result<UserStatistic> get(@PathVariable String id) {
+
+ UserStatistic userStatistic = iUserStatisticService.getById(id);
+ return new ResultUtil<UserStatistic>().setData(userStatistic);
+ }
+
+ @RequestMapping(value = "/getByUserId", method = RequestMethod.GET)
+ @ApiOperation(value = "閫氳繃鐢ㄦ埛id鑾峰彇缁熻淇℃伅")
+ public Result<UserStatistic> getByUserId(String userId) {
+ QueryWrapper<UserStatistic> wrapper = new QueryWrapper<>();
+ wrapper.eq("user_id",userId);
+ UserStatistic userStatistic = iUserStatisticService.getOne(wrapper);
+ if(userStatistic==null){
+ return new ResultUtil<UserStatistic>().setData(new UserStatistic());
+ }
+ return new ResultUtil<UserStatistic>().setData(userStatistic);
+ }
+
+ @RequestMapping(value = "/getAll", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇鍏ㄩ儴鏁版嵁")
+ public Result<List<UserStatistic>> getAll() {
+
+ List<UserStatistic> list = iUserStatisticService.list();
+ return new ResultUtil<List<UserStatistic>>().setData(list);
+ }
+
+ @RequestMapping(value = "/getByPage", method = RequestMethod.GET)
+ @ApiOperation(value = "鍒嗛〉鑾峰彇")
+ public Result<IPage<UserStatistic>> getByPage(PageVo page) {
+
+ IPage<UserStatistic> data = iUserStatisticService.page(PageUtil.initMpPage(page));
+ return new ResultUtil<IPage<UserStatistic>>().setData(data);
+ }
+
+ @RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST)
+ @ApiOperation(value = "缂栬緫鎴栨洿鏂版暟鎹�")
+ public Result<UserStatistic> saveOrUpdate(UserStatistic userStatistic) {
+
+ if (iUserStatisticService.saveOrUpdate(userStatistic)) {
+ return new ResultUtil<UserStatistic>().setData(userStatistic);
+ }
+ return new ResultUtil<UserStatistic>().setErrorMsg("鎿嶄綔澶辫触");
+ }
+
+ @RequestMapping(value = "/delByIds", method = RequestMethod.POST)
+ @ApiOperation(value = "鎵归噺閫氳繃id鍒犻櫎")
+ public Result<Object> delAllByIds(@RequestParam String[] ids) {
+
+ for (String id : ids) {
+ iUserStatisticService.removeById(id);
+ }
+ return ResultUtil.success("鎵归噺閫氳繃id鍒犻櫎鏁版嵁鎴愬姛");
+ }
+}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/DrivingRecord.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/DrivingRecord.java
index 430fd7a..047051b 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/DrivingRecord.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/DrivingRecord.java
@@ -31,6 +31,11 @@
@ApiModelProperty(value = "杞﹁締id")
private String carId;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "琛岃溅鏃ユ湡")
+ private Date drivingDate;
+
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鍑鸿溅鏃堕棿")
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderDetail.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderDetail.java
new file mode 100644
index 0000000..f3fd58f
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderDetail.java
@@ -0,0 +1,40 @@
+package cn.exrick.xboot.your.entity;
+
+import cn.exrick.xboot.core.base.XbootBaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @author Exrick
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "t_order_detail")
+@TableName("t_order_detail")
+@ApiModel(value = "璁㈠崟璇︽儏琛�")
+public class OrderDetail extends XbootBaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "璁㈠崟id")
+ private String orderId;
+
+ @ApiModelProperty(value = "浜у搧鍚嶇О")
+ private String product;
+
+ @ApiModelProperty(value = "鏁伴噺")
+ private String num;
+
+}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java
new file mode 100644
index 0000000..f7c91c6
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java
@@ -0,0 +1,108 @@
+package cn.exrick.xboot.your.entity;
+
+import cn.exrick.xboot.core.base.XbootBaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Exrick
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "t_order_task")
+@TableName("t_order_task")
+@ApiModel(value = "璁㈠崟浠诲姟琛�")
+public class OrderTask extends XbootBaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "璁㈠崟鍙�")
+ private String code;
+
+ @ApiModelProperty(value = "瀹㈡埛id")
+ private String customerId;
+
+ @ApiModelProperty(value = "杞﹁締id")
+ private String carId;
+
+ @ApiModelProperty(value = "鐗囧尯id")
+ private String areaId;
+
+ @ApiModelProperty(value = "鍒嗘id")
+ private String areaSectionId;
+
+ @ApiModelProperty(value = "閰嶉�佷汉id")
+ private String userId;
+
+ @ApiModelProperty(value = "璁㈠崟椤哄簭")
+ private int seq;
+
+ @ApiModelProperty(value = "鍖呮暟")
+ private int num;
+
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "璁㈠崟鏃�")
+ private Date orderDate;
+
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "灏佸寘鏃�")
+ private Date endDate;
+
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "閰嶉�佹棩")
+ private Date sendDate;
+
+ @ApiModelProperty(value = "閫佽揪鐓х墖")
+ private String img;
+
+ @ApiModelProperty(value = "鏄惁杩涜瑁呰溅锛�0锛氬惁 1:鏄級")
+ private int isPut;
+
+ @ApiModelProperty(value = "鏄惁椹跺嚭鏈堝彴锛�0锛氬惁 1:鏄級")
+ private int isOut;
+
+ @ApiModelProperty(value = "0閰嶉�佷腑锛�1宸查�佽揪锛�2鏃犳硶閫佽揪锛�3寮傚父绛炬敹")
+ private int status;
+
+ @ApiModelProperty(value = "鏃犳硶閫佽揪鐨勫師鍥�")
+ private String remarks;
+
+ @ApiModelProperty(value = "鍟嗘埛璇勪环 1鏄� 2鏄� 3鏄� 4鏄� 5鏄�")
+ private int level;
+
+ @ApiModelProperty(value = "绛炬敹璇勪环")
+ private String evaluate;
+
+ @Transient
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍟嗘埛鍚嶇О")
+ private String customerName;
+
+ @Transient
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍟嗘埛")
+ private Customer customer;
+
+ @Transient
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璁㈠崟璇︽儏")
+ private List<OrderDetail> orderDetails;
+}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/UserStatistic.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/UserStatistic.java
new file mode 100644
index 0000000..f908b27
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/UserStatistic.java
@@ -0,0 +1,75 @@
+package cn.exrick.xboot.your.entity;
+
+import cn.exrick.xboot.core.base.XbootBaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @author Exrick
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "t_user_statistic")
+@TableName("t_user_statistic")
+@ApiModel(value = "鐢ㄦ埛缁熻琛�")
+public class UserStatistic extends XbootBaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "鐢ㄦ埛id")
+ private String userId;
+
+ @ApiModelProperty(value = "骞冲畨椹鹃┒")
+ private int safeDriving;
+
+ @ApiModelProperty(value = "鍑鸿溅娆℃暟")
+ private int outCar;
+
+ @ApiModelProperty(value = "椹鹃┒閲岀▼")
+ private int driving;
+
+ @ApiModelProperty(value = "鐤插姵椹鹃┒")
+ private int fatigueDriving;
+
+ @ApiModelProperty(value = "涓嶇郴瀹夊叏甯�")
+ private int noBelt;
+
+ @ApiModelProperty(value = "鎶界儫")
+ private int smoking;
+
+ @ApiModelProperty(value = "鎵撶數璇�")
+ private int phone;
+
+ @ApiModelProperty(value = "琚偣璧炴暟")
+ private int likes;
+
+ @ApiModelProperty(value = "閰嶉�佹鏁�")
+ private int sends;
+
+ @ApiModelProperty(value = "閫佽揪娆℃暟")
+ private int sends2;
+
+ @ApiModelProperty(value = "鏈嶅姟鍟嗘埛")
+ private int service;
+
+ @ApiModelProperty(value = "寮傚父寮�闂�")
+ private int abnormalOpen;
+
+ @ApiModelProperty(value = "鐐硅禐鐜�")
+ private int likesRate;
+
+
+
+}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderDetailMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderDetailMapper.java
new file mode 100644
index 0000000..6666f99
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderDetailMapper.java
@@ -0,0 +1,14 @@
+package cn.exrick.xboot.your.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.exrick.xboot.your.entity.OrderDetail;
+
+import java.util.List;
+
+/**
+ * 璁㈠崟璇︽儏琛ㄦ暟鎹鐞嗗眰
+ * @author whj
+ */
+public interface OrderDetailMapper extends BaseMapper<OrderDetail> {
+
+}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java
new file mode 100644
index 0000000..e8906e3
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java
@@ -0,0 +1,30 @@
+package cn.exrick.xboot.your.mapper;
+
+import cn.exrick.xboot.your.entity.AddOil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.exrick.xboot.your.entity.OrderTask;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.type.JdbcType;
+
+import java.util.List;
+
+/**
+ * 璁㈠崟琛ㄦ暟鎹鐞嗗眰
+ * @author whj
+ */
+public interface OrderTaskMapper extends BaseMapper<OrderTask> {
+
+ @Select("SELECT sum(num) FROM t_order_task where area_id=#{arg0} and DATE_FORMAT(send_date,'%Y-%m-%d')=#{arg1}")
+ Integer sum(String areaId, String format);
+
+ @Select("SELECT a.*,b.name as temp FROM t_order_task a LEFT JOIN t_customer b ON a.customer_id=b.id ${ew.customSqlSegment} ")
+ @Results({@Result(column="temp", property="customerName", jdbcType = JdbcType.VARCHAR)})
+ List<OrderTask> list2(@Param(Constants.WRAPPER) QueryWrapper<OrderTask> wrapper2);
+}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/UserStatisticMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/UserStatisticMapper.java
new file mode 100644
index 0000000..fff9587
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/UserStatisticMapper.java
@@ -0,0 +1,14 @@
+package cn.exrick.xboot.your.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.exrick.xboot.your.entity.UserStatistic;
+
+import java.util.List;
+
+/**
+ * 鐢ㄦ埛缁熻琛ㄦ暟鎹鐞嗗眰
+ * @author whj
+ */
+public interface UserStatisticMapper extends BaseMapper<UserStatistic> {
+
+}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderDetailService.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderDetailService.java
new file mode 100644
index 0000000..8a1863d
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderDetailService.java
@@ -0,0 +1,14 @@
+package cn.exrick.xboot.your.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.exrick.xboot.your.entity.OrderDetail;
+
+import java.util.List;
+
+/**
+ * 璁㈠崟璇︽儏琛ㄦ帴鍙�
+ * @author whj
+ */
+public interface IOrderDetailService extends IService<OrderDetail> {
+
+}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java
new file mode 100644
index 0000000..c13fea2
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java
@@ -0,0 +1,18 @@
+package cn.exrick.xboot.your.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.exrick.xboot.your.entity.OrderTask;
+
+import java.util.List;
+
+/**
+ * 璁㈠崟琛ㄦ帴鍙�
+ * @author whj
+ */
+public interface IOrderTaskService extends IService<OrderTask> {
+
+ int sum(String id, String format);
+
+ List<OrderTask> list2(QueryWrapper<OrderTask> wrapper2);
+}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IUserStatisticService.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IUserStatisticService.java
new file mode 100644
index 0000000..952a961
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IUserStatisticService.java
@@ -0,0 +1,14 @@
+package cn.exrick.xboot.your.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.exrick.xboot.your.entity.UserStatistic;
+
+import java.util.List;
+
+/**
+ * 鐢ㄦ埛缁熻琛ㄦ帴鍙�
+ * @author whj
+ */
+public interface IUserStatisticService extends IService<UserStatistic> {
+
+}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderDetailServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderDetailServiceImpl.java
new file mode 100644
index 0000000..78baed0
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderDetailServiceImpl.java
@@ -0,0 +1,26 @@
+package cn.exrick.xboot.your.serviceimpl;
+
+import cn.exrick.xboot.your.mapper.OrderDetailMapper;
+import cn.exrick.xboot.your.entity.OrderDetail;
+import cn.exrick.xboot.your.service.IOrderDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 璁㈠崟璇︽儏琛ㄦ帴鍙ｅ疄鐜�
+ * @author whj
+ */
+@Slf4j
+@Service
+@Transactional
+public class IOrderDetailServiceImpl extends ServiceImpl<OrderDetailMapper, OrderDetail> implements IOrderDetailService {
+
+ @Autowired
+ private OrderDetailMapper orderDetailMapper;
+}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java
new file mode 100644
index 0000000..3276289
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java
@@ -0,0 +1,41 @@
+package cn.exrick.xboot.your.serviceimpl;
+
+import cn.exrick.xboot.your.mapper.OrderTaskMapper;
+import cn.exrick.xboot.your.entity.OrderTask;
+import cn.exrick.xboot.your.service.IOrderTaskService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 璁㈠崟琛ㄦ帴鍙ｅ疄鐜�
+ * @author whj
+ */
+@Slf4j
+@Service
+@Transactional
+public class IOrderTaskServiceImpl extends ServiceImpl<OrderTaskMapper, OrderTask> implements IOrderTaskService {
+
+ @Autowired
+ private OrderTaskMapper orderTaskMapper;
+
+ @Override
+ public int sum(String areaId, String format) {
+ Integer sum = orderTaskMapper.sum(areaId,format);
+ if(sum==null){
+ return 0;
+ }
+ return sum;
+ }
+
+ @Override
+ public List<OrderTask> list2(QueryWrapper<OrderTask> wrapper2) {
+ return orderTaskMapper.list2(wrapper2);
+ }
+}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IUserStatisticServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IUserStatisticServiceImpl.java
new file mode 100644
index 0000000..6e6090f
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IUserStatisticServiceImpl.java
@@ -0,0 +1,26 @@
+package cn.exrick.xboot.your.serviceimpl;
+
+import cn.exrick.xboot.your.mapper.UserStatisticMapper;
+import cn.exrick.xboot.your.entity.UserStatistic;
+import cn.exrick.xboot.your.service.IUserStatisticService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 鐢ㄦ埛缁熻琛ㄦ帴鍙ｅ疄鐜�
+ * @author whj
+ */
+@Slf4j
+@Service
+@Transactional
+public class IUserStatisticServiceImpl extends ServiceImpl<UserStatisticMapper, UserStatistic> implements IUserStatisticService {
+
+ @Autowired
+ private UserStatisticMapper userStatisticMapper;
+}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/resources/mapper/OrderDetailMapper.xml b/xboot-modules/xboot-your/src/main/resources/mapper/OrderDetailMapper.xml
new file mode 100644
index 0000000..f786e54
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/resources/mapper/OrderDetailMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.exrick.xboot.your.mapper.OrderDetailMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/resources/mapper/OrderTaskMapper.xml b/xboot-modules/xboot-your/src/main/resources/mapper/OrderTaskMapper.xml
new file mode 100644
index 0000000..4f01f66
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/resources/mapper/OrderTaskMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.exrick.xboot.your.mapper.OrderTaskMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/resources/mapper/UserStatisticMapper.xml b/xboot-modules/xboot-your/src/main/resources/mapper/UserStatisticMapper.xml
new file mode 100644
index 0000000..1b04829
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/resources/mapper/UserStatisticMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.exrick.xboot.your.mapper.UserStatisticMapper">
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1