|
|
@@ -13,6 +13,7 @@ import lombok.SneakyThrows;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
+
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.io.OutputStream;
|
|
|
@@ -174,7 +175,11 @@ public class SupplyChainController extends BaseController {
|
|
|
@ApiParam("商品Id") @RequestParam(value = "itemId", required = false) String itemId,
|
|
|
@ApiParam("商品名称") @RequestParam(value = "itemTitle", required = false) String itemTitle,
|
|
|
@ApiParam("开始时间") @RequestParam(value = "orderStartDate", required = false) String orderStartDate,
|
|
|
- @ApiParam("结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate) {
|
|
|
+ @ApiParam("结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate,
|
|
|
+ @ApiParam("排序字段") @RequestParam(value = "fieId", required = false) String fieId,
|
|
|
+ @ApiParam("排序方式") @RequestParam(value = "sort", required = false) String sort
|
|
|
+
|
|
|
+ ) {
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
if (!Check.isNull(orderStartDate)) {
|
|
|
Long start = DateUtils.getStartLongTime(orderStartDate);
|
|
|
@@ -190,6 +195,10 @@ public class SupplyChainController extends BaseController {
|
|
|
if (!Check.isNull(itemTitle)) {
|
|
|
requestMap.put("itemTitle", itemTitle);
|
|
|
}
|
|
|
+
|
|
|
+ requestMap.put("fieId", fieId);
|
|
|
+ requestMap.put("sort", sort);
|
|
|
+
|
|
|
TableDataInfo dataInfo = new TableDataInfo();
|
|
|
if (Check.isNullMap(requestMap)) {
|
|
|
dataInfo.setCode(-1);
|
|
|
@@ -910,7 +919,9 @@ public class SupplyChainController extends BaseController {
|
|
|
@ApiOperation(value = "供应链管理员统计列表")
|
|
|
public TableDataInfo adminReportList(
|
|
|
@ApiParam("开始时间") @RequestParam(value = "orderStartDate", required = false) String orderStartDate,
|
|
|
- @ApiParam("结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate) {
|
|
|
+ @ApiParam("结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate,
|
|
|
+ @ApiParam("用户ID") @RequestParam(value = "userId", required = false) Long userId
|
|
|
+ ) {
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
if (!Check.isNull(orderStartDate)) {
|
|
|
Long start = DateUtils.getStartLongTime(orderStartDate);
|
|
|
@@ -920,6 +931,10 @@ public class SupplyChainController extends BaseController {
|
|
|
Long end = DateUtils.getEndLongTime(orderEndDate);
|
|
|
requestMap.put("end", end);
|
|
|
}
|
|
|
+ if (!Check.isNull(userId)) {
|
|
|
+ requestMap.put("userId", userId);
|
|
|
+ }
|
|
|
+
|
|
|
TableDataInfo dataInfo = new TableDataInfo();
|
|
|
if (Check.isNullMap(requestMap)) {
|
|
|
dataInfo.setCode(-1);
|
|
|
@@ -948,8 +963,8 @@ public class SupplyChainController extends BaseController {
|
|
|
@ApiParam("userId") @RequestParam(value = "userId", required = false) Long userId,
|
|
|
@ApiParam("开始时间") @RequestParam(value = "orderStartDate", required = false) String orderStartDate,
|
|
|
@ApiParam("结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate,
|
|
|
- @ApiParam("商品Id") @RequestParam(value = "itemId", required = false) String itemId,
|
|
|
- @ApiParam("商品名称") @RequestParam(value = "itemTitle", required = false) Long itemTitle) {
|
|
|
+ @ApiParam("商品Id") @RequestParam(value = "itemId", required = false) Long itemId,
|
|
|
+ @ApiParam("商品名称") @RequestParam(value = "itemTitle", required = false) String itemTitle) {
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
if (!Check.isNull(userId)) {
|
|
|
requestMap.put("userId", userId);
|