From 8c02e4ce71ca6e8ca9e6680b88f973e835e06645 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期五, 04 十一月 2022 08:45:13 +0800
Subject: [PATCH] 增加功能
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java | 171 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 98 insertions(+), 73 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 32ac2fd..9d2c8e4 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
@@ -13,6 +13,7 @@
import cn.exrick.xboot.your.service.*;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
+import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
@@ -22,6 +23,9 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.transaction.annotation.Transactional;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -102,23 +106,23 @@
// }
- private String getFormatDate(String sendTime){
- if(StrUtil.isNotEmpty(sendTime)){
+ private String getFormatDate(String sendTime) {
+ if (StrUtil.isNotEmpty(sendTime)) {
return sendTime;
- }else{
+ } else {
return DateUtil.format(new Date(), "yyyy-MM-dd");
}
}
- public Area getArea(String userId){
+ public Area getArea(String userId) {
QueryWrapper<Car> carQueryWrapper = new QueryWrapper<Car>();
- carQueryWrapper.eq("user_id",userId).or().eq("follow_user_id",userId);
+ carQueryWrapper.eq("user_id", userId).or().eq("follow_user_id", userId);
Car one = iCarService.getOne(carQueryWrapper);
- if(one==null){
+ if (one == null) {
return null;
- }else{
+ } else {
QueryWrapper<Area> wrapper = new QueryWrapper<Area>();
- wrapper.eq("car_id",one.getId());
+ wrapper.eq("car_id", one.getId());
Area area = iAreaService.getOne(wrapper);
return area;
}
@@ -128,28 +132,28 @@
@ApiOperation(value = "鑾峰彇浠婃棩浠诲姟缁熻淇℃伅")
public Result<Object> getAll(String sendTime) {
Area area = getArea(securityUtil.getCurrUser().getId());
- if(area==null){
+ if (area == null) {
return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾璇ヨ溅杈�");
}
QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
String format = getFormatDate(sendTime);
- wrapper2.eq("area_id",area.getId());
- wrapper2.eq("send_date",format);
+ wrapper2.eq("area_id", area.getId());
+ wrapper2.eq("send_date", format);
List<OrderTask> list = iOrderTaskService.list(wrapper2);
- int sum = iOrderTaskService.sum(area.getId(),format);
+ int sum = iOrderTaskService.sum(area.getId(), format);
- Map<String,Object> map = new HashMap<String,Object>();
- map.put("count",list.size());
- map.put("sum",sum);
- map.put("name","");
- if(list.size()>0){
+ Map<String, Object> map = new HashMap<String, Object>();
+ 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());
+ map.put("name", area2.getName() + a.getName());
list.clear();
}
return new ResultUtil<Object>().setData(map);
@@ -159,7 +163,7 @@
@ApiOperation(value = "鑾峰彇浠婃棩閰嶉�佷换鍔¤鎯呭垪琛�")
public Result<List<OrderTask>> getTodayOrder(String sendTime) {
Area area = getArea(securityUtil.getCurrUser().getId());
- if(area==null){
+ if (area == null) {
return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾璇ヨ溅杈�");
}
@@ -169,11 +173,11 @@
// wrapper2.eq("a.send_date",format);
// wrapper2.orderByAsc("a.seq").orderByAsc("a.status");
//List<OrderTask> list = iOrderTaskService.list2(wrapper2);
- wrapper2.eq("area_id",area.getId());
- wrapper2.eq("send_date",format);
+ wrapper2.eq("area_id", area.getId());
+ wrapper2.eq("send_date", format);
wrapper2.orderByAsc("seq").orderByAsc("status");
List<OrderTask> list = iOrderTaskService.list(wrapper2);
- for(OrderTask obj:list){
+ for (OrderTask obj : list) {
obj.setCode(obj.getLinker());
}
return new ResultUtil<List<OrderTask>>().setData(list);
@@ -181,24 +185,24 @@
@RequestMapping(value = "/getTodayOrderDetail", method = RequestMethod.GET)
@ApiOperation(value = "鑾峰彇褰撳墠閰嶉�佸晢鎴疯鎯�")
- public Result<OrderTask> getTodayOrderDetail(String orderId,String sendTime) {
+ public Result<OrderTask> getTodayOrderDetail(String orderId, String sendTime) {
OrderTask orderTask = new OrderTask();
- if(!StrUtil.isEmpty(orderId)){
+ if (!StrUtil.isEmpty(orderId)) {
orderTask = iOrderTaskService.getById(orderId);
- if(orderTask.getStatus()!=0){
+ if (orderTask.getStatus() != 0) {
return ResultUtil.error("姝ゅ晢鎴峰凡閰嶉��");
}
- }else{
+ } else {
Area area = getArea(securityUtil.getCurrUser().getId());
- if(area==null){
+ if (area == null) {
return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾璇ヨ溅杈�");
}
QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
String format = getFormatDate(sendTime);
- wrapper2.eq("area_id",area.getId());
- wrapper2.eq("send_date",format);
- wrapper2.eq("status",0);
+ wrapper2.eq("area_id", area.getId());
+ wrapper2.eq("send_date", format);
+ wrapper2.eq("status", 0);
//wrapper2.orderByAsc("seq");
PageVo page = new PageVo();
@@ -206,18 +210,18 @@
page.setOrder("asc");
page.setPageSize(1);
page.setPageNumber(0);
- List<OrderTask> list = iOrderTaskService.page(PageUtil.initMpPage(page),wrapper2).getRecords();
+ List<OrderTask> list = iOrderTaskService.page(PageUtil.initMpPage(page), wrapper2).getRecords();
//List<OrderTask> list = iOrderTaskService.list(wrapper2);
- if(list.size()>0){
+ if (list.size() > 0) {
orderTask = list.get(0);
- }else{
+ } 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());
+ wrapper3.eq("order_id", orderTask.getId());
orderTask.setOrderDetails(iOrderDetailService.list(wrapper3));
return new ResultUtil<OrderTask>().setData(orderTask);
@@ -228,31 +232,31 @@
public Result<Object> getTodayOtherInfo(String sendTime) {
Area area = getArea(securityUtil.getCurrUser().getId());
- if(area==null){
+ if (area == null) {
return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾璇ヨ溅杈�");
}
QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
String format = getFormatDate(sendTime);
- wrapper2.eq("area_id",area.getId());
- wrapper2.eq("send_date",format);
- wrapper2.ne("status",0);
+ 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);
+ 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);
+ 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);
+ wrapper5.ne("status", 0);
+ wrapper5.eq("send_date", format);
PageVo page = new PageVo();
page.setSort("updateTime");
@@ -261,35 +265,35 @@
page.setPageNumber(0);
IPage<OrderTask> data = iOrderTaskService.page(PageUtil.initMpPage(page), wrapper5);
String content = "";
- if(data.getRecords().size()>0){
+ 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);
+ 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+"鍗�";
+ if (count6 > 0) {
+ content += user.getNickname() + "宸查厤閫�" + count6 + "鍗�";
}
}
- map.put("content",content);
+ map.put("content", content);
- map.put("lng","");
- map.put("lat","");
+ map.put("lng", "");
+ map.put("lat", "");
String deptId = securityUtil.getCurrUser().getDepartmentId();
- if(StrUtil.isNotEmpty(deptId)){
+ if (StrUtil.isNotEmpty(deptId)) {
Department department = departmentService.get(deptId);
- map.put("lng",department.getLng());
- map.put("lat",department.getLat());
+ 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) {
+ public Object saveOrUpdate(String orderId, String imgUrl) {
OrderTask orderTask = iOrderTaskService.getById(orderId);
orderTask.setImg(imgUrl);
iOrderTaskService.saveOrUpdate(orderTask);
@@ -298,14 +302,14 @@
@RequestMapping(value = "/signFor", method = RequestMethod.POST)
@ApiOperation(value = "绛炬敹")
- public Object signFor(String orderId,int status,String content,String customerReceiveId,int time,String carId) {
- if(status==1){
- if(StrUtil.isEmpty(customerReceiveId)){
+ 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)){
+ if (StrUtil.isEmpty(carId)) {
return ResultUtil.error("杞﹁締id涓嶈兘涓虹┖");
}
OrderTask orderTask = iOrderTaskService.getById(orderId);
@@ -313,14 +317,14 @@
orderTask.setUserId(securityUtil.getCurrUser().getId());
orderTask.setTime(time);
orderTask.setCarId(carId);
- if(StrUtil.isNotEmpty(customerReceiveId)){
+ if (StrUtil.isNotEmpty(customerReceiveId)) {
orderTask.setCustomerReceiveId(customerReceiveId);
}
- if(!StrUtil.isEmpty(content)){
+ if (!StrUtil.isEmpty(content)) {
orderTask.setRemarks(content);
- }else{
- if(status==2){
+ } else {
+ if (status == 2) {
return ResultUtil.error("璇峰～鍐欏紓甯哥鏀跺師鍥�");
}
}
@@ -337,13 +341,13 @@
return ResultUtil.success("娣诲姞鎴愬姛");
}
- private void saveLog(){
+ private void saveLog() {
QueryWrapper<OrderLog> wp = new QueryWrapper<>();
- wp.eq("type",2);
+ wp.eq("type", 2);
OrderLog one = iOrderLogService.getOne(wp);
- if(one!=null){
- one.setNum(one.getNum()+1);
- }else{
+ if (one != null) {
+ one.setNum(one.getNum() + 1);
+ } else {
one = new OrderLog();
one.setNum(1);
one.setType(2);
@@ -355,13 +359,13 @@
@ApiOperation(value = "鑾峰彇韪忓嫎鍟嗘埛")
public Result<List<Customer>> getTaKan() {
Area area = getArea(securityUtil.getCurrUser().getId());
- if(area==null){
+ if (area == null) {
return ResultUtil.error("璇疯仈绯荤鐞嗗憳缁戝畾璇ヨ溅杈�");
}
QueryWrapper<Customer> wrapper2 = new QueryWrapper<Customer>();
- wrapper2.eq("area_id",area.getId());
- wrapper2.eq("kstatus",0);
+ wrapper2.eq("area_id", area.getId());
+ wrapper2.eq("kstatus", 0);
List<Customer> list = iCustomerService.list(wrapper2);
return new ResultUtil<List<Customer>>().setData(list);
}
@@ -393,4 +397,25 @@
}
return ResultUtil.success("鎵归噺閫氳繃id鍒犻櫎鏁版嵁鎴愬姛");
}
+
+ @GetMapping("/outExcel")// 瀵煎嚭鐨勪笉鏄腑闂磋〃
+ @ApiOperation(value = "瀵煎嚭绛炬敹缁熻淇℃伅琛�", notes = "瀵煎嚭绛炬敹缁熻淇℃伅琛�")
+ public void export1(OrderStatusCount orderStatusCount, HttpServletResponse response) throws IOException {
+ List<OrderStatusCount> orderStatus = this.iOrderTaskService.countStatus(orderStatusCount);
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ String fileName = URLEncoder.encode("绛炬敹鏁伴噺缁熻鎶ヨ〃", "UTF-8");
+ String fileName2 = new String(fileName.getBytes("UTF-8"), "ISO8859-1");
+// response.setHeader("Content-dispostion", "attachment;filename="+fileName+".xls");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName2 + ".xlsx");
+ EasyExcel.write(response.getOutputStream(), OrderStatusCount.class).
+ sheet(0).doWrite(orderStatus);
+ }
+
+ @GetMapping(value = "/count")
+ public Result<List<OrderStatusCount>> getAll(OrderStatusCount orderStatusCount) {
+ List<OrderStatusCount> data = this.iOrderTaskService.countStatus(orderStatusCount);
+ ;
+ return new ResultUtil<List<OrderStatusCount>>().setData(data);
+ }
}
--
Gitblit v1.9.1