From be8fe4d76888ade70dfc3e42c3100a18ed4a8e23 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Fri, 6 May 2022 10:15:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E6=8A=A5?= =?UTF-8?q?=E6=96=87=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xhpc/activity/controller/OrderLogController.java | 3 --- .../com/xhpc/activity/service/impl/OrderLogServiceImpl.java | 4 ++-- .../service/impl/XhpcClearingCheckoutServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/OrderLogController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/OrderLogController.java index 94c52f85..5e19c4a5 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/OrderLogController.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/OrderLogController.java @@ -45,7 +45,6 @@ public class OrderLogController extends BaseController { params.put("phone", phone); params.put("startTime", startTime); params.put("endTime", endTime); - params.put("operatorId", SecurityUtils.getUserId()); params.put("number", number); params.put("tenantId", loginUser.getTenantId()); return getDataTable(orderLogService.getOrderPage(params)); @@ -65,9 +64,7 @@ public class OrderLogController extends BaseController { @RequestParam(required = false) String tenantId, @RequestParam(required = false) Integer number, @RequestParam(required = false) String serialNumber) throws Exception { - Map params = new HashMap<>(); - params.put("operatorId", SecurityUtils.getUserId()); params.put("number", number); params.put("serialNumber", serialNumber); params.put("tenantId", tenantId); diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/OrderLogServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/OrderLogServiceImpl.java index ff6dbfff..41fd7097 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/OrderLogServiceImpl.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/OrderLogServiceImpl.java @@ -2,8 +2,8 @@ package com.xhpc.activity.service.impl; import cn.hutool.core.io.IoUtil; +import cn.hutool.poi.excel.BigExcelWriter; import cn.hutool.poi.excel.ExcelUtil; -import cn.hutool.poi.excel.ExcelWriter; import com.xhpc.activity.mapper.XhpcDeviceMessageMapper; import com.xhpc.activity.mapper.XhpcHistoryOrderMapper; import com.xhpc.activity.service.OrderLogService; @@ -42,7 +42,7 @@ public class OrderLogServiceImpl implements OrderLogService { public void export(HttpServletResponse response, Map params) throws Exception{ List> list = deviceMessageMapper.getOrderMessageByParams(params); - ExcelWriter writer = ExcelUtil.getWriter(true); + BigExcelWriter writer = ExcelUtil.getBigWriter("temp_" + System.currentTimeMillis() + ".xlsx"); writer.addHeaderAlias("serialNumber", "订单号"); writer.addHeaderAlias("sourceName", "订单来源"); writer.addHeaderAlias("chargingDegree", "充电电量"); diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingCheckoutServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingCheckoutServiceImpl.java index a5cfda9f..9183c49f 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingCheckoutServiceImpl.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingCheckoutServiceImpl.java @@ -296,7 +296,7 @@ public class XhpcClearingCheckoutServiceImpl extends BaseService implements Xhpc String tenantId = loginUser.getTenantId(); //桩的统计、该时段金额 List> list = new ArrayList<>(); - if (userId != UserTypeUtil.USER_ID) { + if (!userId.equals(UserTypeUtil.USER_ID)) { Map landUser = historyOrderMapper.getLandUser(logUserId); if (landUser != null) { if (landUser.get("userType") != null) {